Fixed database passwort reference and some format style related aspects

aquasecurity · Apr 16, 2024 · 7b7a5d7 · 7b7a5d7
1 parent 38d7b44
commit 7b7a5d7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 22 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.23            |
+| [Server](server/)                   | Deploys the Console, Database, and Gateway components; optionally deploys Envoy component                                                                     | 2022.4.24            |
 | [Enforcer](enforcer/)               | Deploys the Aqua Enforcer daemonset                                                                                                                           | 2022.4.21            |
 | [Scanner](scanner/)                 | Deploys the Aqua Scanner deployment                                                                                                                           | 2022.4.6             |
 | [KubeEnforcer](kube-enforcer/)      | Deploys Aqua KubeEnforcer                                                                                                                                     | 2022.4.43            |

diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md
@@ -1,12 +1,15 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 2022.4.23 ( Dec 24th, 2023 )
+## 2022.4.24 (Apr 16th, 2024)
+* Fixed a bug in the database password value references, that linked to wrong, non exitend values
+* Fixed some typos and formatting style related aspects
+
+## 2022.4.23 (Dec 24th, 2023)
 * Add support for ArgoCD deployment - [#799](https://github.com/aquasecurity/aqua-helm/issues/799)
 * Immutable Secrets - Preventing changes to the data of an existing Secret (DB)
 
-
-## 2022.4.22 ( Dec 10th, 2023 )
+## 2022.4.22 (Dec 10th, 2023)
 * Fix indentation and formatting for external DB - [#790](https://github.com/aquasecurity/aqua-helm/issues/790) 
 * Fix envoy configuration
 
@@ -22,8 +25,10 @@ All notable changes to this project will be documented in this file.
 
 ## 2022.4.18 (Jun 30th, 2023)
 * Fix openshift scc
+
 ## 2022.4.17 (Jun 27th, 2023)
 * Add vault agent injection support for db secrets
+
 ## 2022.4.16 (May 28, 2023)
 * Add support for external web secret
 

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.23"
+version: "2022.4.24"
 dependencies:
   - name: gateway
     version: "2022.4.13"

diff --git a/server/README.md b/server/README.md
@@ -2,8 +2,7 @@
 
 # Aqua Security Server Helm Chart
 
-These are Helm charts for installation and maintenance of Aqua Container Security Platform: Console Server, Gateway,
-Database.
+These are Helm charts for installation and maintenance of Aqua Container Security Platform: Console Server, Gateway & Database.
 
 ## Contents
 

diff --git a/server/templates/db-deployment.yaml b/server/templates/db-deployment.yaml
@@ -51,8 +51,8 @@ spec:
         - name: POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ .Values.global.db.passwordFromSecret.global.dbPasswordName }}
-              key: {{ .Values.global.db.passwordFromSecret.global.dbPasswordKey }}
+              name: {{ .Values.global.db.passwordFromSecret.dbPasswordName }}
+              key: {{ .Values.global.db.passwordFromSecret.dbPasswordKey }}
         {{- else }}
         - name: POSTGRES_PASSWORD
           valueFrom:
@@ -87,8 +87,8 @@ spec:
         - name: POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ .Values.global.db.passwordFromSecret.global.dbPasswordName }}
-              key: {{ .Values.global.db.passwordFromSecret.global.dbPasswordKey }}
+              name: {{ .Values.global.db.passwordFromSecret.dbPasswordName }}
+              key: {{ .Values.global.db.passwordFromSecret.dbPasswordKey }}
         {{- else }}
         - name: POSTGRES_PASSWORD
           valueFrom:
@@ -190,8 +190,8 @@ spec:
         - name: POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ .Values.global.db.passwordFromSecret.global.dbAuditPasswordName }}
-              key: {{ .Values.global.db.passwordFromSecret.global.dbAuditPasswordKey }}
+              name: {{ .Values.global.db.passwordFromSecret.dbAuditPasswordName }}
+              key: {{ .Values.global.db.passwordFromSecret.dbAuditPasswordKey }}
         {{- else }}
         - name: POSTGRES_PASSWORD
           valueFrom:
@@ -226,8 +226,8 @@ spec:
         - name: POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ .Values.global.db.passwordFromSecret.global.dbAuditPasswordName }}
-              key: {{ .Values.global.db.passwordFromSecret.global.dbAuditPasswordKey }}
+              name: {{ .Values.global.db.passwordFromSecret.dbAuditPasswordName }}
+              key: {{ .Values.global.db.passwordFromSecret.dbAuditPasswordKey }}
         {{- else }}
         - name: POSTGRES_PASSWORD
           valueFrom:

diff --git a/server/values.yaml b/server/values.yaml
@@ -113,19 +113,19 @@ global:
       pubsubPassword: ""
 
     passwordFromSecret:
-      #Enable if loading passwords for db and audit-db from secret
+      # Enable if loading passwords for db and audit-db from secret
       enabled: false
-      #Specify the Password Secret name used for db password
+      # Specify the Password Secret name used for db password
       dbPasswordName: ""
-      #Specify the db password key name stored in the #dbPasswordName secret
+      # Specify the db password key name stored in the #dbPasswordName secret
       dbPasswordKey: ""
-      #Specify the Password Secret name used for audit db password
+      # Specify the Password Secret name used for audit db password
       dbAuditPasswordName: ""
-      #Specify the audit db password key name stored in the #dbAuditPasswordName secret
+      # Specify the audit db password key name stored in the #dbAuditPasswordName secret
       dbAuditPasswordKey: ""
-      #Specify the Password Secret name used for pubsub db password
+      # Specify the Password Secret name used for pubsub db password
       dbPubsubPasswordName: ""
-      #Specify the pubsub db password key name stored in the #PubsubPasswordName secret
+      # Specify the pubsub db password key name stored in the #PubsubPasswordName secret
       dbPubsubPasswordKey: ""
 
     ssl: false