Corrected env name

ministryofjustice · Jan 30, 2025 · a971c39 · a971c39
1 parent 85b3fa8
commit a971c39
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/helm_deploy/hmpps-github-discovery/templates/_discovery_cron_job_envs.tpl b/helm_deploy/hmpps-github-discovery/templates/_discovery_cron_job_envs.tpl
@@ -1,17 +1,14 @@
 {{- define "discoveryCronJob.envs" -}}
-{{- if and .Values.discoveryCronJob (hasKey .Values.discoveryCronJob "namespace_secrets") -}}
+{{- if .discoveryCronJob.namespace_secrets -}}
 env:
-{{- range $namespace, $secrets := .Values.discoveryCronJob.namespace_secrets }}
-  {{- if eq $namespace "hmpps-github-discovery" }}
-    {{- range $key, $val := $secrets }}
-    - name: {{ $key }}
-      valueFrom:
-        secretKeyRef:
-          key: {{ trimSuffix "?" $val }}
-          name: {{ $namespace }}{{ if hasSuffix "?" $val }}
-          optional: true{{ end }}
-    {{- end }}
-  {{- end }}
-{{- end }}
+{{- range $secret, $envs := .discoveryCronJob.namespace_secrets }}
+  {{- range $key, $val := $envs }}
+  - name: {{ $key }}
+    valueFrom:
+      secretKeyRef:
+        key: {{ trimSuffix "?" $val }}
+        name: {{ $secret }}{{ if hasSuffix "?" $val }}
+        optional: true{{ end }}  {{- end }}
 {{- end }}
 {{- end -}}
+{{- end -}}
diff --git a/helm_deploy/hmpps-github-discovery/templates/discovery-cron-job.yaml b/helm_deploy/hmpps-github-discovery/templates/discovery-cron-job.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.postgresDatabaseRestore.enabled -}}
+{{- if .Values.discoveryCronJob.enabled -}}
 ---
 apiVersion: v1
 kind: ConfigMap