From fd570624dc26ccf3c21a134250978379365c14bf Mon Sep 17 00:00:00 2001 From: Hanno Hecker Date: Mon, 29 Jul 2019 08:03:24 +0200 Subject: [PATCH 1/2] allow more optional config settings like the WORKER_PLUGIN_HTTP_OAUTH2_TOKENS. First one was requested, others added because we can :) Signed-off-by: Hanno Hecker --- cluster/manifests/zmon-worker/deployment.yaml | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/cluster/manifests/zmon-worker/deployment.yaml b/cluster/manifests/zmon-worker/deployment.yaml index 943b9796ce..f483860890 100644 --- a/cluster/manifests/zmon-worker/deployment.yaml +++ b/cluster/manifests/zmon-worker/deployment.yaml @@ -97,6 +97,37 @@ spec: name: zmon-worker-optional-config key: WORKER_PLUGIN_HTTP_OAUTH2_TOKENS optional: true + - name: WORKER_PLUGIN_REDIS_PASSWORD + valueFrom: + configMapKeyRef: + name: zmon-worker-optional-config + key: WORKER_PLUGIN_REDIS_PASSWORD + optional: true + - name: WORKER_PLUGIN_CASSANDRA_USER + valueFrom: + configMapKeyRef: + name: zmon-worker-optional-config + key: WORKER_PLUGIN_CASSANDRA_USER + optional: true + - name: WORKER_PLUGIN_CASSANDRA_PASS + valueFrom: + configMapKeyRef: + name: zmon-worker-optional-config + key: WORKER_PLUGIN_CASSANDRA_PASS + optional: true + - name: WORKER_PLUGIN_ELASTICSEARCH_URL + valueFrom: + configMapKeyRef: + name: zmon-worker-optional-config + key: WORKER_PLUGIN_ELASTICSEARCH_URL + optional: true + - name: WORKER_PLUGIN_KAIROSDB_URL + valueFrom: + configMapKeyRef: + name: zmon-worker-optional-config + key: WORKER_PLUGIN_KAIROSDB_URL + optional: true + - name: OAUTH2_ACCESS_TOKEN_URL value: https://token.services.auth.zalando.com/oauth2/access_token?realm=/services - name: CREDENTIALS_DIR From a632fe39ddd26283620da95f705ca4d4e508716d Mon Sep 17 00:00:00 2001 From: Hanno Hecker Date: Mon, 29 Jul 2019 13:24:15 +0200 Subject: [PATCH 2/2] update to use secretKeyRef for WORKER_PLUGIN_REDIS_PASSWORD and WORKER_PLUGIN_CASSANDRA_PASS Signed-off-by: Hanno Hecker --- cluster/manifests/zmon-worker/deployment.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cluster/manifests/zmon-worker/deployment.yaml b/cluster/manifests/zmon-worker/deployment.yaml index f483860890..651e1461e7 100644 --- a/cluster/manifests/zmon-worker/deployment.yaml +++ b/cluster/manifests/zmon-worker/deployment.yaml @@ -91,6 +91,7 @@ spec: secretKeyRef: name: zmon-worker key: sql-pass + - name: WORKER_PLUGIN_HTTP_OAUTH2_TOKENS valueFrom: configMapKeyRef: @@ -99,8 +100,8 @@ spec: optional: true - name: WORKER_PLUGIN_REDIS_PASSWORD valueFrom: - configMapKeyRef: - name: zmon-worker-optional-config + secretKeyRef: + name: zmon-worker-optional-secret key: WORKER_PLUGIN_REDIS_PASSWORD optional: true - name: WORKER_PLUGIN_CASSANDRA_USER @@ -111,8 +112,8 @@ spec: optional: true - name: WORKER_PLUGIN_CASSANDRA_PASS valueFrom: - configMapKeyRef: - name: zmon-worker-optional-config + secretKeyRef: + name: zmon-worker-optional-secret key: WORKER_PLUGIN_CASSANDRA_PASS optional: true - name: WORKER_PLUGIN_ELASTICSEARCH_URL