Fix job-check-db-upgrade

`job-check-db-upgrade.yaml` Fix `volumes` & `volumeMounts` indentation Add `AQUA_PUBSUB_DBPASSWORD` env variable
aquasecurity · Jul 30, 2024 · d9ab889 · d9ab889
1 parent 9cdb0a9
commit d9ab889
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ This repository includes the following charts; they can be deployed separately:
 
 | Chart                               | Description                                                                                                                                                   | Latest Chart Version |
 |-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------|
-| [Server](server/)                   | Deploys the Console, Database, and Gateway components; optionally deploys Envoy component                                                                     | 2022.4.25            |
+| [Server](server/)                   | Deploys the Console, Database, and Gateway components; optionally deploys Envoy component                                                                     | 2022.4.26            |
 | [Enforcer](enforcer/)               | Deploys the Aqua Enforcer daemonset                                                                                                                           | 2022.4.21            |
 | [Scanner](scanner/)                 | Deploys the Aqua Scanner deployment                                                                                                                           | 2022.4.8             |
 | [KubeEnforcer](kube-enforcer/)      | Deploys Aqua KubeEnforcer                                                                                                                                     | 2022.4.46            |
@@ -84,7 +84,7 @@ aqua-helm/enforcer              2022.4.21       2022.4          A Helm chart for
 aqua-helm/kube-enforcer         2022.4.46       2022.4          A Helm chart for the Aqua KubeEnforcer Starboard
 aqua-helm/gateway               2022.4.14       2022.4          A Helm chart for the Aqua Gateway
 aqua-helm/scanner               2022.4.8        2022.4          A Helm chart for the Aqua Scanner CLI component
-aqua-helm/server                2022.4.25       2022.4          A Helm chart for the Aqua Console components
+aqua-helm/server                2022.4.26       2022.4          A Helm chart for the Aqua Console components
 aqua-helm/tenant-manager        2022.4.1        2022.4          A Helm chart for the Aqua Tenant Manager
 ```
 

diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 2022.4.26 (Jul 29th, 2024)
+* Fix 'volumes' & 'volumeMounts' indentation in job-check-db-upgrade job (SLK-83783)
+* Add AQUA_PUBSUB_DBPASSWORD env variable in job-check-db-upgrade job (SLK-84299)
+
 ## 2022.4.25 (Jul 26th, 2024)
 * Fix indentation and formatting for external DB - [#790](https://github.com/aquasecurity/aqua-helm/pull/790)
 

diff --git a/server/Chart.yaml b/server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "2022.4"
 description: A Helm chart for the Aqua Console components
 name: server
-version: "2022.4.25"
+version: "2022.4.26"
 dependencies:
   - name: gateway
     version: "2022.4.13"

diff --git a/server/templates/job-check-db-upgrade.yaml b/server/templates/job-check-db-upgrade.yaml
@@ -50,12 +50,26 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.global.db.passwordFromSecret.dbPasswordName }}
                   key: {{ .Values.global.db.passwordFromSecret.dbPasswordKey }}
+            - name: AQUA_PUBSUB_DBPASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.global.db.passwordFromSecret.dbPubsubPasswordName }}
+                  key: {{ .Values.global.db.passwordFromSecret.dbPubsubPasswordKey }}
         {{- else }}
             - name: SCALOCK_DBPASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ .Release.Name }}-database-password
                   key: db-password
+            - name: AQUA_PUBSUB_DBPASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Release.Name }}-database-password
+            {{- if .Values.global.db.external.pubsubPassword }}
+                  key: pubsub-password
+            {{- else }}
+                  key: db-password
+            {{- end }}
         {{- end }}
             - name: SCALOCK_AUDIT_DBPASSWORD
           {{- if .Values.global.db.passwordFromSecret.enabled }}
@@ -81,14 +95,14 @@ spec:
         {{- if .Values.global.db.externalDbCerts.enable }}
             - name: SSL_CERT_DIR
               value: /etc/ext_db_certs
-              volumeMounts:
-              - name: ext-db-cert
-                mountPath: /etc/ext_db_certs
-                readOnly: true
-              volumes:
-              - name: ext-db-cert
-                secret:
-                  secretName: {{ .Values.global.db.externalDbCerts.certSecretName }}
+          volumeMounts:
+          - name: ext-db-cert
+            mountPath: /etc/ext_db_certs
+            readOnly: true
+      volumes:
+      - name: ext-db-cert
+        secret:
+          secretName: {{ .Values.global.db.externalDbCerts.certSecretName }}
         {{- end }}
       imagePullSecrets:
       {{- if .Values.imageCredentials.create }}