groundhog2k · groundhog2k · May 5, 2023 · May 5, 2023
diff --git a/charts/commento/README.md b/charts/commento/README.md
@@ -1,3 +1,7 @@
+# ⚠️ Deprecation and Archive Notice
+
+This chart version (v0.1.34) is the last update and the chart is deprecated and will no longer be maintained.
+
 # Commento
 
 ![Version: 0.1.34](https://img.shields.io/badge/Version-0.1.34-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.8.0](https://img.shields.io/badge/AppVersion-v1.8.0-informational?style=flat-square)

diff --git a/charts/commento/RELEASENOTES.md b/charts/commento/RELEASENOTES.md
@@ -15,5 +15,9 @@
 | 0.1.31 | v1.8.0 | Updated chart dependencies (postgres 0.2.23) |
 | 0.1.32 | v1.8.0 | Fixed values documentation - thx @generalovmaksim |
 | 0.1.33 | v1.8.0 | Updated version detection for pod disruption budget |
+<<<<<<< HEAD
 | 0.1.34 | v1.8.0 | Updated chart dependencies (postgres 0.2.25) |
+=======
+| 0.1.34 | v1.8.0 | Added deprecation notice |
+>>>>>>> 6496098 (Implement support for custom secrets and additional environment configurations)
 | | | |
diff --git a/charts/etcd/Chart.yaml b/charts/etcd/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.1.5
+version: "0.1.6"
 
 appVersion: "v3.5.9"
diff --git a/charts/etcd/README.md b/charts/etcd/README.md
@@ -1,6 +1,6 @@
 # Etcd
 
-![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.5.9](https://img.shields.io/badge/AppVersion-v3.5.9-informational?style=flat-square)
+![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.5.9](https://img.shields.io/badge/AppVersion-v3.5.9-informational?style=flat-square)
 
 ## Changelog
 
@@ -145,3 +145,4 @@ helm uninstall my-release
 | extraSecrets[].name | string | `nil` | Name of the existing K8s secret |
 | extraSecrets[].mountPath | string | `nil` | Mount path where the secret should be mounted into the container (f.e. /mysecretfolder) |
 | extraEnvSecrets | list | `[]` | A list of existing secrets that will be mounted into the container as environment variables |
+| extraEnvConfigs | list | `[]` | A list of existing configmaps that will be mounted into the container as environment variables |
diff --git a/charts/etcd/RELEASENOTES.md b/charts/etcd/RELEASENOTES.md
@@ -8,4 +8,5 @@
 | 0.1.3 | v3.5.7 | Fixed "nil" syntax error for health checks (thx @omegazeng) |
 | 0.1.4 | v3.5.8 | Upgraded etcd to v3.5.8 |
 | 0.1.5 | v3.5.9 | Upgraded etcd to v3.5.9 |
+| 0.1.6 | v3.5.8 | Added support for custom secrets and additional environment configurations |
 | | | |
diff --git a/charts/etcd/templates/statefulset.yaml b/charts/etcd/templates/statefulset.yaml
@@ -169,6 +169,10 @@ spec:
             - secretRef:
                 name: {{ . }}
           {{- end }}
+          {{- range .Values.extraEnvConfigs }}
+            - configMapRef:
+                name: {{ . }}
+          {{- end }}
           volumeMounts:
             - name: {{ .Values.storage.volumeName }}
               mountPath: /data

diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml
@@ -172,6 +172,9 @@ args: []
 ## A list of existing secrets that will be mounted into the container as environment variables
 extraEnvSecrets: []
 
+## A list of existing configmaps that will be mounted into the container as environment variables
+extraEnvConfigs: []
+
 ## A list of additional existing secrets that will be mounted into the etcd container
 ## The mounted files of the secrets can be used for custom configuration options (see https.enabled)
 extraSecrets: []

diff --git a/charts/ghost/Chart.yaml b/charts/ghost/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: "0.90.3"
+version: "0.90.4"
 
 appVersion: "5.47.2"
 

diff --git a/charts/ghost/README.md b/charts/ghost/README.md
@@ -1,6 +1,6 @@
 # Ghost
 
-![Version: 0.90.3](https://img.shields.io/badge/Version-0.90.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.47.2](https://img.shields.io/badge/AppVersion-5.47.2-informational?style=flat-square)
+![Version: 0.90.4](https://img.shields.io/badge/Version-0.90.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.47.2](https://img.shields.io/badge/AppVersion-5.47.2-informational?style=flat-square)
 
 ## Changelog
 
@@ -68,6 +68,8 @@ helm uninstall my-release
 | image.repository | string | `"ghost"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
+| extraInitContainers | list | `[]` | Extra init containers |
+| extaContainers | list | `[]` | Extra containers for usage as sidecars |
 | strategy | object | `{}` | Pod deployment strategy |
 | startupProbe | object | `see values.yaml` | Startup probe configuration |
 | livenessProbe | object | `see values.yaml` | Liveness probe configuration |
@@ -138,13 +140,13 @@ helm uninstall my-release
 | mysql.userDatabase.user | string | `nil` | User name with full access to ghost database |
 | mysql.userDatabase.password | string | `nil` | Password of the ghost database user |
 | mysql.storage | string | `nil` | MySQL storage parameter (see storage parameters) |
-| externalDatabase.type | string | `"sqlite"` | External database type (mysql or mariadb - default: sqlite) |
-| externalDatabase.sqliteDatabaseFile | string | `"content/data/ghost.db"` | Path to default SQLite database (only sqlite) |
 | externalDatabase.host | string | `nil` | External database host (only mysql/mariadb) |
 | externalDatabase.name | string | `"ghost"` | External database name (only mysql/mariadb) |
 | externalDatabase.user | string | `nil` | External database user (only mysql/mariadb) |
 | externalDatabase.password | string | `nil` | External database password (only mysql/mariadb) |
 | settings.mode | string | `"production"` | Ghost mode (production or development) |
+| settings.useSqlite | bool | `true` | Use internal Sqlite when no externalDatabase: or mariadb.enabled / mysql.enabled was configured |
+| settings.sqliteDatabaseFile | string | `"content/data/ghost.db"` | Path to default SQLite database (only sqlite) |
 | settings.url | string | `nil` | URL of Ghost blog |
 | settings.logToStdout | bool | `true`| Log to stdout by default (otherwise logging will go to stdout and file) |
 | settings.mail.from | string | `nil` | Mail from address |
@@ -154,3 +156,8 @@ helm uninstall my-release
 | settings.mail.service | string | `nil` | Service for mail transport (Mailgun, Sendgrid, Gmail, SES) |
 | settings.mail.user | string | `nil` | Mail auth user |
 | settings.mail.passwort | string | `nil` | Mail auth password |
+| extraEnvSecrets | list | `[]` | A list of existing secrets that will be mounted into the container as environment variables |
+| extraEnvConfigs | list | `[]` | A list of existing configmaps that will be mounted into the container as environment variables |
+| extraSecrets | list | `[]` | A list of additional existing secrets that will be mounted into the container |
+| extraSecrets[].name | string | `nil` | Name of the existing K8s secret |
+| extraSecrets[].mountPath | string | `nil` | Mount path where the secret should be mounted into the container (f.e. /mysecretfolder) |
diff --git a/charts/ghost/RELEASENOTES.md b/charts/ghost/RELEASENOTES.md
@@ -124,4 +124,5 @@
 | 0.90.1 | 5.47.1 | Upgraded to Ghost 5.47.1 |
 | 0.90.2 | 5.47.1 | Updated chart dependencies (mariadb 0.2.26) |
 | 0.90.3 | 5.47.2 | Upgraded to Ghost 5.47.2 |
+| 0.90.4 | 5.47.2 | Added support for custom secrets and additional environment configurations |
 | | | |
diff --git a/charts/ghost/templates/deployment.yaml b/charts/ghost/templates/deployment.yaml
@@ -35,6 +35,10 @@ spec:
       securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.extraInitContainers }}
+      initContainers:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           {{- with .Values.securityContext }}
@@ -50,6 +54,14 @@ spec:
           envFrom:
             - secretRef:
                 name: {{ include "ghost.fullname" . }}
+          {{- range .Values.extraEnvSecrets }}
+            - secretRef:
+                name: {{ . }}
+          {{- end }}
+          {{- range .Values.extraEnvConfigs }}
+            - configMapRef:
+                name: {{ . }}
+          {{- end }}
           env:
             {{- if .Values.settings.url }}
             - name: url
@@ -174,6 +186,13 @@ spec:
               name: tmp
             - mountPath: /var/lib/ghost/content
               name: ghost-vol
+            {{- range $secret := .Values.extraSecrets }}
+            - mountPath: {{ $secret.mountPath }}
+              name: {{ $secret.name }}
+            {{- end }}
+      {{- with .Values.extraContainers }}
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -189,6 +208,12 @@ spec:
       volumes:
         - name: tmp
           emptyDir: {}
+        {{- range $secret := .Values.extraSecrets }}
+        - name: {{ $secret.name }}
+          secret:
+            secretName: {{ $secret.name }}
+            defaultMode: 0440
+        {{- end }}
         - name: ghost-vol
         {{- if .Values.storage.persistentVolumeClaimName }}
           persistentVolumeClaim:

diff --git a/charts/ghost/templates/secureconfig.yaml b/charts/ghost/templates/secureconfig.yaml
@@ -26,17 +26,16 @@ data:
   {{- end }}
 {{- else }}
   {{- with .Values.externalDatabase }}
-  {{- if or (eq .type "mariadb") (eq .type "mysql") }}
   database__client: {{ "mysql" | b64enc }}
   database__connection__host: {{ .host | b64enc }}
   database__connection__port: {{ (.port | default "3306") | toString | b64enc }}
   database__connection__user: {{ .user | b64enc }}
   database__connection__password: {{ .password | b64enc }}
   database__connection__database: {{ .name | b64enc }}
-  {{- else }}
-  database__client: {{ "sqlite3" | b64enc }}
-  database__connection__filename: {{ .sqliteDatabaseFile | b64enc }}
   {{- end }}
+  {{- if and .Values.settings.useSqlite (not .Values.externalDatabase) }}
+  database__client: {{ "sqlite3" | b64enc }}
+  database__connection__filename: {{ .Values.settings.sqliteDatabaseFile | b64enc }}
   {{- end }}
 {{- end }}
 {{- end }}

diff --git a/charts/ghost/values.yaml b/charts/ghost/values.yaml
@@ -133,33 +133,36 @@ readinessProbe:
   successThreshold: 1
   periodSeconds: 10
 
+## Extra init containers
+extraInitContainers: []
+
+## Extra containers for usage as sidecars
+extraContainers: []
+
 ## Additional environment variables
 env: []
 
 ## Arguments for the container entrypoint process
 args: []
 
-externalDatabase:
-  ## Type of database ("mysql" or "mariadb" - default: sqlite)
-  type: sqlite
-
-  ## Path to default SQLite database (only sqlite)
-  sqliteDatabaseFile: "content/data/ghost.db"
+externalDatabase: {}
+  ## Type of database ("mysql" or "mariadb")
+  # type:
 
   ## Name of the database (default: ghost)
-  name: ghost
+  # name: ghost
 
   ## Database user (only mysql/mariadb)
-  user:
+  # user:
 
   ## Database password (only mysql/mariadb)
-  password:
+  # password:
 
   ## Database host (only for mysql/mariadb)
-  host:
+  # host:
 
   ## Database port (only for mysql/mariadb)
-  port:
+  # port:
 
 ## Ghost specific configuration
 settings:
@@ -172,15 +175,35 @@ settings:
   ## Environment mode (development or production - default: production)
   mode: production
 
+  ## Use internal Sqlite when no externalDatabase: or mariadb.enabled / mysql.enabled was configured
+  ## Set false in case you want to use own environment variables to configure a database connection
+  useSqlite: true
+  ## Path to default SQLite database (only sqlite)
+  sqliteDatabaseFile: "content/data/ghost.db"
+
   ## SMTP connection details
-  mail:
-    from:
-    transport: SMTP
-    host:
-    port:
-    service:
-    user:
-    password:
+  mail: {}
+  #  from:
+  #  transport: SMTP
+  #  host:
+  #  port:
+  #  service:
+  #  user:
+  #  password:
+
+## A list of existing secrets that will be mounted into the container as environment variables
+extraEnvSecrets: []
+
+## A list of existing configmaps that will be mounted into the container as environment variables
+extraEnvConfigs: []
+
+## A list of additional existing secrets that will be mounted into the container
+## The mounted files of the secrets can be used for advanced configuration - f.e. TLS
+extraSecrets: []
+    ## Name of the existing K8s secret
+#  - name:
+    ## Mount path where the secret should be mounted into the container (f.e. /mysecretfolder)
+#    mountPath:
 
 ## Storage parameters
 storage:

diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
   - name: groundhog2k
 
 # This is the chart version.
-version: "0.13.4"
+version: "0.13.5"
 
 # This is the version number of the application being deployed.
 appVersion: "26.0.1-apache"

diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
@@ -1,6 +1,6 @@
 # Nextcloud
 
-![Version: 0.13.4](https://img.shields.io/badge/Version-0.13.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 26.0.1-apache](https://img.shields.io/badge/AppVersion-26.0.1-informational?style=flat-square)
+![Version: 0.13.5](https://img.shields.io/badge/Version-0.13.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 26.0.1-apache](https://img.shields.io/badge/AppVersion-26.0.1-informational?style=flat-square)
 
 ## Changelog
 
@@ -102,6 +102,8 @@ helm uninstall my-release
 | image.repository | string | `"nextcloud"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
+| extraInitContainers | list | `[]` | Extra init containers |
+| extaContainers | list | `[]` | Extra containers for usage as sidecars |
 | strategy.type | object | `"RollingUpdate"` | Pod deployment strategy |
 | livenessProbe | object | `see values.yaml` | Liveness probe configuration |
 | startupProbe | object | `see values.yaml` | Startup probe configuration |
@@ -222,6 +224,8 @@ helm uninstall my-release
 | settings.admin.name | string | `nil` | Nextcloud administrator user |
 | settings.admin.password | string | `nil` | Nextcloud admin user password |
 | settings.update | bool | `false` | Enable update (Only necessary if custom command is used) |
+| settings.useSqlite | bool | `true` | Use internal Sqlite when no externalDatabase: or mariadb.enabled was configured |
+| settings.sqliteDbName | string | `"nextcloud"` | Sqlite database name |
 | settings.maxFileUploadSize | string | `512M` | Maximum file upload size |
 | settings.memoryLimit | string | `512M` | PHP memory limit |
 | settings.disableRewriteIP | bool | `false` | Disable rewriting IP address |
@@ -236,6 +240,11 @@ helm uninstall my-release
 | settings.smtp.name | string | `nil` | SMTP user name |
 | settings.smtp.password | string | `nil` | SMTP password |
 | settings.smtp.secure | bool | `true` | Use secure SMTP |
+| extraEnvSecrets | list | `[]` | A list of existing secrets that will be mounted into the container as environment variables |
+| extraEnvConfigs | list | `[]` | A list of existing configmaps that will be mounted into the container as environment variables |
+| extraSecrets | list | `[]` | A list of additional existing secrets that will be mounted into the container |
+| extraSecrets[].name | string | `nil` | Name of the existing K8s secret |
+| extraSecrets[].mountPath | string | `nil` | Mount path where the secret should be mounted into the container (f.e. /mysecretfolder) |
 
 ## Storage parameters
 

diff --git a/charts/nextcloud/RELEASENOTES.md b/charts/nextcloud/RELEASENOTES.md
@@ -41,5 +41,6 @@
 | 0.13.1 | 26.0.0-apache | Updated chart dependencies (mariadb 0.3.11 / postgres 0.4.4 / redis 0.6.9) |
 | 0.13.2 | 26.0.0-apache | Updated chart dependencies (redis 0.6.10) |
 | 0.13.3 | 26.0.1-apache | Upgraded to Nextcloud 26.0.1 |
-| 0.13.3 | 26.0.1-apache | Updated chart dependencies (mariadb 0.3.12 / postgres 0.4.5 / redis 0.6.11) |
+| 0.13.4 | 26.0.1-apache | Updated chart dependencies (mariadb 0.3.12 / postgres 0.4.5 / redis 0.6.11) |
+| 0.13.5 | 26.0.1-apache | Added support for custom secrets and additional environment configurations |
 | | | |
diff --git a/charts/nextcloud/templates/cronjobs.yaml b/charts/nextcloud/templates/cronjobs.yaml
@@ -37,6 +37,14 @@ spec:
               envFrom:
                 - secretRef:
                     name: {{ $fullname }}
+              {{- range $.Values.extraEnvSecrets }}
+                - secretRef:
+                    name: {{ . }}
+              {{- end }}
+              {{- range $.Values.extraEnvConfigs }}
+                - configMapRef:
+                    name: {{ . }}
+              {{- end }}
               env:
                 - name: NEXTCLOUD_DATA_DIR
                   value: /var/datavolume/data
@@ -57,6 +65,10 @@ spec:
                   name: tmp
                 - mountPath: /var/run
                   name: run
+                {{- range $secret := $.Values.extraSecrets }}
+                - mountPath: {{ $secret.mountPath }}
+                  name: {{ $secret.name }}
+                {{- end }}
               resources:
                 {{- toYaml $job.resources | nindent 18 }}
           {{- if $job.nodeSelector -}}
@@ -83,6 +95,12 @@ spec:
               emptyDir: {}
             - name: run
               emptyDir: {}
+            {{- range $secret := $.Values.extraSecrets }}
+            - name: {{ $secret.name }}
+              secret:
+                secretName: {{ $secret.name }}
+                defaultMode: 0440
+            {{- end }}
             - name: nextcloud-vol
             {{- if $.Values.storage.nextcloud.persistentVolumeClaimName }}
               persistentVolumeClaim: