From cd437bca2e438796304afede4a8fa08675cebd86 Mon Sep 17 00:00:00 2001 From: Pavel Suchman Date: Sat, 5 May 2018 13:58:55 +0300 Subject: [PATCH 1/3] Add gate force entry secret (#935) --- charts-external/spark/templates/spark.yaml | 3 +++ environments/staging/values.yaml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/charts-external/spark/templates/spark.yaml b/charts-external/spark/templates/spark.yaml index cd91a48..0cbfcd9 100644 --- a/charts-external/spark/templates/spark.yaml +++ b/charts-external/spark/templates/spark.yaml @@ -97,6 +97,9 @@ spec: {{ if .Values.drupalSecretName }} - {"name": "DRUPAL_PROFILE_API_PASSWORD", "valueFrom": {"secretKeyRef": {"name": {{ .Values.drupalSecretName | quote }}, "key": "DRUPAL_PROFILE_API_PASSWORD"}}} {{ end }} + {{ if .Values.gateSecretName }} + - {"name": "GATE_FORCE_ENTRY_PASSWORD", "valueFrom": {"secretKeyRef": {"name": {{ .Values.gateSecretName | quote }}, "key": "GATE_FORCE_ENTRY_PASSWORD"}}} + {{ end }} {{ if .Values.enableSecrets }} - name: SPARK_SECRET_TOKEN valueFrom: diff --git a/environments/staging/values.yaml b/environments/staging/values.yaml index 011dd72..b1f218f 100644 --- a/environments/staging/values.yaml +++ b/environments/staging/values.yaml @@ -93,6 +93,8 @@ spark: # Supplier contract files suppliersBucket: midburn-spark-supplier-files + # Gate force entry + gateSecretName: 123456 nginx: htpasswdSecretName: nginx-htpasswd From 1007b675993ea5733a6c4aac6fd40a368a644986 Mon Sep 17 00:00:00 2001 From: Ori Hoch Date: Sat, 5 May 2018 14:09:17 +0300 Subject: [PATCH 2/3] set gate secret name --- environments/staging/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/staging/values.yaml b/environments/staging/values.yaml index b1f218f..4dc8a0b 100644 --- a/environments/staging/values.yaml +++ b/environments/staging/values.yaml @@ -94,7 +94,7 @@ spark: # Supplier contract files suppliersBucket: midburn-spark-supplier-files # Gate force entry - gateSecretName: 123456 + gateSecretName: gate nginx: htpasswdSecretName: nginx-htpasswd From 3dd73b2788a0174ff601071d0c202718faac281a Mon Sep 17 00:00:00 2001 From: Ori Hoch Date: Sat, 5 May 2018 14:11:05 +0300 Subject: [PATCH 3/3] set gate secret name for production --- environments/production/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environments/production/values.yaml b/environments/production/values.yaml index 46947e7..95b1d0a 100644 --- a/environments/production/values.yaml +++ b/environments/production/values.yaml @@ -84,6 +84,8 @@ spark: # Supplier contract files suppliersBucket: midburn-spark-supplier-files-prod + # Gate force entry + gateSecretName: gate nginx: htpasswdSecretName: nginx-htpasswd