Merge branch 'master' into feature/minor-improvments-of-ingress

README.md

@@ -10,8 +10,8 @@ This helm chart installs the [passbolt container](https://github.com/passbolt/pa
 
 For more parameters you should have a look at ...
 - the [values.yaml](values.yaml) file of this helm chart
-- the [values.yaml](https://github.com/helm/charts/blob/master/stable/mariadb/values.yaml) file of the mariadb helm chart, when enabled
-- the [enviroment variables](https://github.com/passbolt/passbolt_docker/tree/master) of the passbold docker image.
+- the [values.yaml](https://github.com/bitnami/charts/blob/main/bitnami/mariadb/values.yaml) file of the mariadb helm chart, when enabled
+- the [environment variables](https://github.com/passbolt/passbolt_docker/tree/master) of the passbolt docker image.
 
 ### General
 
@@ -133,10 +133,10 @@ For more parameters you should have a look at ...
     ```
     helm install \
       -f values.yaml \
-      --set-file passbolt.config.serverkey=./gpg/serverkey.asc \
-      --set-file passbolt.config.serverkey_private=./gpg/serverkey_private.asc \
-      --set-file passbolt.config.jwtkey=./jwt/jwt.key \
-      --set-file passbolt.config.jwtcert=./jwt/jwt.pem \
+      --set-file passbolt.config.serverkey=./secrets/gpg/serverkey.asc \
+      --set-file passbolt.config.serverkey_private=./secrets/gpg/serverkey_private.asc \
+      --set-file passbolt.config.jwtkey=./secrets/jwt/jwt.key \
+      --set-file passbolt.config.jwtcert=./secrets/jwt/jwt.pem \
       passbolt ../passbolt-helm/
 
 ## Create first passbolt admin user

requirements.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: mariadb
   repository: https://charts.bitnami.com/bitnami
-  version: 7.7.2
-digest: sha256:71afa498fad2963cd961ee928fb308aca36a46fe7311024ab79ed33835c849a5
-generated: "2022-02-13T17:51:12.0891486+01:00"
+  version: 11.1.2
+digest: sha256:28c5c0e580f0642c912e53e4634f2a6209a0c5b3bed05c4407133faa342db2ad
+generated: "2022-08-01T15:42:13.063952303+02:00"

requirements.yaml

@@ -1,5 +1,5 @@
 dependencies:
   - name: mariadb
-    version: 7.7.2
+    version: ">11.1.2"
     repository: https://charts.bitnami.com/bitnami
-    condition: mariadb.enabled
+    condition: mariadb.enabled

templates/deployment.yaml

@@ -42,22 +42,24 @@ spec:
           {{- if .Values.mariadb.enabled }}
             value: {{ .Release.Name }}-mariadb
           {{- else }}
-            value: {{ .Values.mariadb.db.host }}
+            value: {{ .Values.mariadb.auth.host }}
           {{- end }}
           - name: DATASOURCES_DEFAULT_USERNAME
-            value: {{ .Values.mariadb.db.user }}
+            value: {{ .Values.mariadb.auth.username }}
           - name: DATASOURCES_DEFAULT_PASSWORD
           {{- if .Values.mariadb.enabled }}
             valueFrom:
               secretKeyRef:
                 name: {{ .Release.Name }}-mariadb
                 key: mariadb-password
           {{- else }}
-            value: {{ .Values.mariadb.db.password }}          
-          {{- end }}      
+            value: {{ .Values.mariadb.auth.password }}
+          {{- end }}
           - name: DATASOURCES_DEFAULT_DATABASE
-            value: {{ .Values.mariadb.db.name }}
+            value: {{ .Values.mariadb.auth.database }}
           {{- if .Values.passbolt.config.email.enabled }}
+          - name: EMAIL_DEFAULT_FROM_NAME
+            value: {{ .Values.passbolt.config.email.from_name }}
           - name: EMAIL_DEFAULT_FROM
             value: {{ .Values.passbolt.config.email.from }}
           - name: EMAIL_TRANSPORT_DEFAULT_HOST

values.yaml

@@ -84,14 +84,14 @@ mariadb:
   enabled: true
   replication:
     enabled: false
-  db:
+  auth:
     # define external host, when mariadb is disabled
     host: internal
+    rootPassword: "<pwgen -n 64 1>"
 
-    name: passbolt
-    user: passbolt
-    password: passbolt
-
+    database: "passbolt"
+    username: "passbolt"
+    password: "<pwgen -n 64 1>"
 
 # Service
 service: