Merge pull request #75 from SoftwareAG/dev-msr-thr

Correct Job template in APIGW
SoftwareAG · Apr 26, 2024 · b9edac1 · b9edac1
2 parents 2a48750 + 9a6607b
commit b9edac1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/apigateway/examples/house-keeping-job/values-purge-transaction-events-job.yaml b/apigateway/examples/house-keeping-job/values-purge-transaction-events-job.yaml
@@ -18,12 +18,16 @@ jobs:
     tag: latest
   imagePullPolicy: IfNotPresent
   restartPolicy: Never
+  envFrom:
+    - secretRef:
+        ## -- set secret name '<release>-apigateway-admin-password'
+        name: apigw-apigateway-admin-password
   # -- Schedule job every day ...
   schedule: "0 1 * * *"
   command: ["/bin/sh"] 
   args:
     - -c
     - >-
         echo "Purge Transaction Events in [${DEPLOYMENT}]" ... &&
-        curl -X DELETE -s -u "Administrator:${ADMINISTRATOR_PASSWORD}" "${DEPLOYMENT}:5555/rest/apigateway/apitransactions?eventType=ALL&objectType=Analytics&from=&until=&olderThan=7d" &&
-        curl -X GET    -s -u "Administrator:${ADMINISTRATOR_PASSWORD}" "${DEPLOYMENT}:5555/rest/apigateway/apitransactions/jobs"
+        curl -X DELETE -s -u "Administrator:${password}" "${DEPLOYMENT}:5555/rest/apigateway/apitransactions?eventType=ALL&objectType=Analytics&from=&until=&olderThan=7d" &&
+        curl -X GET    -s -u "Administrator:${password}" "${DEPLOYMENT}:5555/rest/apigateway/apitransactions/jobs"
diff --git a/apigateway/helm/templates/job.yaml b/apigateway/helm/templates/job.yaml
@@ -19,8 +19,6 @@
 
 {{- $fullName := include "common.names.fullname" . -}}
 {{- $labels   := include "common.labels.standard" . -}}
-{{- $adminsecretName  := include "apigateway.adminsecretName" . -}}
-{{- $adminsecretKey   := include "apigateway.adminsecretKey" . -}}
 {{- $imagePullSecrets := .Values.imagePullSecrets -}}
 {{- $extraLabels      := .Values.extraLabels      -}}
 {{- $context := . }}
@@ -83,12 +81,6 @@ spec:
             env:
 {{ tpl (toYaml . ) $context | indent 12 }}
             {{- end }}
-            envFrom:
-            - name: ADMINISTRATOR_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ $adminsecretName }}
-                  key: {{ $adminsecretKey }}
             {{- with $job.envFrom }}
             envFrom:
 {{ toYaml . | indent 12 }}
@@ -173,12 +165,6 @@ spec:
         env:
 {{ tpl (toYaml . ) $context | indent 8 }}
         {{- end }}
-        envFrom:
-        - name: ADMINISTRATOR_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "apigateway.adminsecretName" . }}
-              key: {{ include "apigateway.adminsecretKey" . }}
         {{- with $job.envFrom }}
         envFrom:
 {{ toYaml . | indent 8 }}