Merge branch 'release/1.1.2'

passbolt · Aug 14, 2024 · 6738313 · 6738313
2 parents 5dce270 + bdab26f
commit 6738313
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,10 +3,18 @@
 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/1.1.1...HEAD)
+## [Unreleased](https://github.com/passbolt/charts-passbolt/compare/1.1.2...HEAD)
+
+## [1.1.2] - 2024-08-14
+
+### Fixed
+
+- [#89](https://github.com/passbolt/charts-passbolt/issues/89) Installation stuck at "waiting on database connection"
 
 ## [1.1.1] - 2024-05-02
+
 ### Fixed
+
 - [#83](https://github.com/passbolt/charts-passbolt/issues/83) Database hostname and port should be quoted when using external databases
 
 ## [1.1.0] - 2024-04-26
@@ -146,7 +154,7 @@ This release includes breaking changes .Values.redisProxyResources now is .Value
 ### Added
 
 - [#18](https://github.com/passbolt/charts-passbolt/pull/18) Allow setting annotations on service
-- Passbolt v4 as default application deployment version. Please read: https://help.passbolt.com/releases/ce/get-up-stand-up
+- Passbolt v4 as default application deployment version. Please read: <https://help.passbolt.com/releases/ce/get-up-stand-up>
 
 ## [0.3.1] - 2023-05-10
 

diff --git a/Chart.yaml b/Chart.yaml
@@ -15,12 +15,12 @@ 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: 1.1.1
+version: 1.1.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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 4.7.0-1-ce
+appVersion: 4.9.1-1-ce
 dependencies:
   - name: passbolt-library
     version: 0.2.7

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: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.7.0-1-ce](https://img.shields.io/badge/AppVersion-4.7.0--1--ce-informational?style=flat-square)
+![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.9.1-1-ce](https://img.shields.io/badge/AppVersion-4.9.1--1--ce-informational?style=flat-square)
 
 Passbolt is an open source, security first password manager with strong focus on
 collaboration.

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -58,6 +58,7 @@ spec:
               password=${DATASOURCES_DEFAULT_PASSWORD}
               host=${DATASOURCES_DEFAULT_HOST}
               connect-timeout=2
+              ssl={{ .Values.app.database.ssl | default "off" }}
               EOF
               userhost="%"
               client="{{- include "passbolt.databaseClient" . }}"

diff --git a/tests/initContainer_ssl_test.yaml b/tests/initContainer_ssl_test.yaml
@@ -0,0 +1,21 @@
+---
+suite: deployment initContainer database client ssl
+release:
+  name: test
+tests:
+  - it: ssl shoudl be off by default
+    templates:
+      - deployment.yaml
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.initContainers[0].args[1]
+          pattern: "ssl=off"
+  - it: ssl shoudl be on when user enables it
+    set:
+      app.database.ssl: "on"
+    templates:
+      - deployment.yaml
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.initContainers[0].args[1]
+          pattern: "ssl=on"
diff --git a/tests/integration/fixtures/passbolt.sh b/tests/integration/fixtures/passbolt.sh
@@ -19,6 +19,8 @@ function registerPassboltUser {
 		--data-raw "{\"authenticationtoken\":{\"token\":\"${user_token}\"},\"gpgkey\":{\"armored_key\":\"$(awk '{printf "%s\\n", $0}' public-${email}.asc)\"}}" \
 		--compressed >/dev/null
 	_log User "$email" succesfully registered
+	# Fixes an issue on the CI, where user with this key isn't found.
+	sleep 10
 }
 
 function configurePassbolt {

diff --git a/values.yaml b/values.yaml
@@ -124,10 +124,14 @@ app:
     # -- Configure pasbolt deployment image pullPolicy
     pullPolicy: IfNotPresent
     # -- Overrides the image tag whose default is the chart appVersion.
-    tag: 4.6.2-1-ce
+    tag: 4.9.1-1-ce
   # Allowed options: mariadb, mysql or postgresql
   database:
     kind: mariadb
+    # -- Configure ssl on mariadb/mysql clients
+    # -- In case this is enabled, you will be responsible for creating and mounting the certificates and
+    # -- additional configutions on both the client and the server.
+    # ssl: off
   cache:
     # Use CACHE_CAKE_DEFAULT_* variables to configure the connection to redis instance
     # on the passboltEnv configuration section