Merge branch 'release/0.7.2'

passbolt · Jan 23, 2024 · f962041 · f962041
2 parents bbc6310 + c22d819
commit f962041
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased](https://github.com/passbolt/charts-passbolt/compare/0.7.0...HEAD)
+## [Unreleased](https://github.com/passbolt/charts-passbolt/compare/0.7.2...HEAD)
+
+## [0.7.2] - 2024-01-23
+
+### Fixed
+
+- Passbolt postgresql secret not using DEFAULT_DATASOURCES_PORT and DEFAULT_DATASOURCES_HOST correctly when calculating DEFAULT_DATASOURCES_URL
 
 ## [0.7.1] - 2024-01-09
 

diff --git a/Chart.yaml b/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.7.1
+version: 0.7.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
     <img src="./.assets/helm_passbolt.png" alt="passbolt sails kubernetes" width="500"/>
 </h3>
 
-![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.2-1-ce](https://img.shields.io/badge/AppVersion-4.4.2--1--ce-informational?style=flat-square)
+![Version: 0.7.2](https://img.shields.io/badge/Version-0.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.2-1-ce](https://img.shields.io/badge/AppVersion-4.4.2--1--ce-informational?style=flat-square)
 
 Passbolt is an open source, security first password manager with strong focus on
 collaboration.

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,9 +1,4 @@
-Announcing the immediate availability of passbolt's official helm chart 0.7.1.
+Announcing the immediate availability of passbolt's official helm chart 0.7.2.
 
-This release contains support for providing external secrets for JWT keys
-as well as automatic support to download kubectl binaries based on host
-cpu architecture.
-
-Thanks to all the community members involved in this release!
-
-@Kuruyia @ook
+This is a minor change release that fixes a bug when generating the postgresql
+credentials secret.
diff --git a/templates/secret-env.yaml b/templates/secret-env.yaml
@@ -22,7 +22,7 @@ data:
     {{- $password := .Values.passboltEnv.secret.DATASOURCES_DEFAULT_PASSWORD }}
     {{- $database := .Values.passboltEnv.secret.DATASOURCES_DEFAULT_DATABASE }}
     {{- $schema := ( default "passbolt" .Values.passboltEnv.secret.DATASOURCES_DEFAULT_SCHEMA ) }}
-    {{- $host := ( default (printf "%s-postgresql" .Release.Name ) .Values.passboltEnv.secret.DATASOURCES_DEFAULT_HOST ) }}
-    {{- $port := ( default "5432" .Values.passboltEnv.secret.DATASOURCES_DEFAULT_PORT ) }}
+    {{- $host := ( include "passbolt.databaseServiceName" . ) | replace "\"" "" }}
+    {{- $port := ( default "5432" .Values.passboltEnv.plain.DATASOURCES_DEFAULT_PORT ) }}
     DATASOURCES_DEFAULT_URL: {{ printf "postgres://%s:%s@%s:%s/%s?schema=%s" $username $password $host $port $database $schema | toString | b64enc }}
 {{- end -}}
diff --git a/tests/secret_env_postgresql_support_test.yaml b/tests/secret_env_postgresql_support_test.yaml
@@ -16,7 +16,8 @@ tests:
     asserts:
       - equal:
           path: data.DATASOURCES_DEFAULT_URL
-          value: "cG9zdGdyZXM6Ly9wYXNzYm9sdFVzZXJuYW1lOnBhc3NAdGVzdC1wb3N0Z3Jlc3FsOjU0MzIvcGFzc2JvbHREYXRhYmFzZT9zY2hlbWE9cGFzc2JvbHQ="
+          value: "postgres://passboltUsername:pass@test-postgresql:5432/passboltDatabase?schema=passbolt"
+          decodeBase64: true
   - it: should contain the DATASOURCES_DEFAULT_URL with given schema
     templates:
       - secret-env.yaml
@@ -31,4 +32,24 @@ tests:
     asserts:
       - equal:
           path: data.DATASOURCES_DEFAULT_URL
-          value: "cG9zdGdyZXM6Ly9wYXNzYm9sdFVzZXJuYW1lOnBhc3NAdGVzdC1wb3N0Z3Jlc3FsOjU0MzIvcGFzc2JvbHREYXRhYmFzZT9zY2hlbWE9cGFzc2JvbHRTY2hlbWE="
+          value: "postgres://passboltUsername:pass@test-postgresql:5432/passboltDatabase?schema=passboltSchema"
+          decodeBase64: true
+
+  - it: should contain the DATASOURCES_DEFAULT_URL with given schema, host and port
+    templates:
+      - secret-env.yaml
+    set:
+      app.database.kind: "postgresql"
+      mariadbDependencyEnabled: false
+      postgresqlDependencyEnabled: true
+      passboltEnv.secret.DATASOURCES_DEFAULT_PASSWORD: pass
+      passboltEnv.secret.DATASOURCES_DEFAULT_DATABASE: passboltDatabase
+      passboltEnv.secret.DATASOURCES_DEFAULT_USERNAME: passboltUsername
+      passboltEnv.secret.DATASOURCES_DEFAULT_SCHEMA: passboltSchema
+      passboltEnv.plain.DATASOURCES_DEFAULT_HOST: passboltHost
+      passboltEnv.plain.DATASOURCES_DEFAULT_PORT: "1234"
+    asserts:
+      - equal:
+          path: data.DATASOURCES_DEFAULT_URL
+          value: "postgres://passboltUsername:pass@passboltHost:1234/passboltDatabase?schema=passboltSchema"
+          decodeBase64: true