Merge pull request #114 from entur/mig-fix-slack

fix: slack secret
entur · Jan 30, 2024 · 35c9df8 · 35c9df8
2 parents 20f3625 + 6e9327d
commit 35c9df8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/helm/kakka/templates/cronjob-tiamat-export-status.yaml b/helm/kakka/templates/cronjob-tiamat-export-status.yaml
@@ -30,11 +30,9 @@ spec:
                   value: 03_Oslo_latest,11_Rogaland_latest,15_More og Romsdal_latest,18_Nordland_latest,30_Viken_latest,34_Innlandet_latest,38_Vestfold_Telemark_latest,42_Agder_latest,46_Vestland_latest,50_Trondelag_latest,54_Troms_Finnmark_latest,CurrentAndFuture_latest,Current_latest,Full_latest,RailStations_latest
                 - name: WARNING_DAYS
                   value: "1"
-                - name: SLACK_URL
-                  valueFrom:
-                    secretKeyRef:
-                      key: slack-url
-                      name: {{ .Values.configMap.slackSecret }}
+              envFrom:
+                - secretRef:
+                    name: ror-slack
               image: {{ .Values.cronjobTiamatExportStatus.image.repo }}
               imagePullPolicy: IfNotPresent
               name: tiamat-export-status-job

diff --git a/helm/kakka/templates/deployment.yaml b/helm/kakka/templates/deployment.yaml
@@ -61,6 +61,8 @@ spec:
           envFrom:
             - secretRef:
                 name: ror-kakka-secrets
+            - secretRef:
+                name: ror-slack
           image: {{.Values.image.identifier }}
           imagePullPolicy: {{.Values.image.imagePullPolicy }}
           livenessProbe:

diff --git a/helm/kakka/values.yaml b/helm/kakka/values.yaml
@@ -51,4 +51,5 @@ secrets:
   ror-kakka-secrets:
     - SPRING_DATASOURCE_PASSWORD
     - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_KAKKA_CLIENT_SECRET
+  ror-slack:
     - SLACK_URL