fix(conflict): resolve conflict with upstream

Author: Frederic Spiers

charts/ghost/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Changelog
 
-## 0.2.1 (2025-10-01)
+## 0.2.3 (2025-10-06)
 
-* [ghost] switch helm-chart icon to a new svg ([#199](https://github.com/CloudPirates-io/helm-charts/pull/199))
+* [mariadb] chore(deps): update mariadb:12.0.2 Docker digest to 03a03a6 ([#208](https://github.com/CloudPirates-io/helm-charts/pull/208))
+
+## <small>0.2.2 (2025-10-01)</small>
+
+* use png as icon (#200) ([359e88f](https://github.com/CloudPirates-io/helm-charts/commit/359e88f)), closes [#200](https://github.com/CloudPirates-io/helm-charts/issues/200)
+
+## <small>0.2.1 (2025-10-01)</small>
+
+* switch helm-chart icon to a new svg (#199) ([44e4d0d](https://github.com/CloudPirates-io/helm-charts/commit/44e4d0d)), closes [#199](https://github.com/CloudPirates-io/helm-charts/issues/199)
 
 ## 0.2.0 (2025-10-01)
 

charts/ghost/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: ghost
 description: A simple, powerful publishing platform that allows you to share your stories with the world.
 type: application
-version: 0.2.2
+version: 0.2.3
 appVersion: "6.0.9"
 keywords:
   - ghost

charts/ghost/values.yaml

@@ -194,7 +194,7 @@ extraObjects: []
 initContainers:
   ## @param initContainers.waitForMariadb.image MariaDB init container image for waiting
   waitForMariadb:
-    image: "mariadb:12.0.2@sha256:8a061ef9813cf960f94a262930a32b190c3fbe5c8d3ab58456ef1df4b90fd5dc"
+    image: "mariadb:12.0.2@sha256:03a03a6817bb9eaa21e5aed1b734d432ec3f80021f5a2de1795475f158217545"
 
 config:
   database:

charts/keycloak/CHANGELOG.md

@@ -1,55 +1,5 @@
 # Changelog
 
-## 0.1.10 (2025-10-02)
+## 0.2.0 (2025-10-06)
 
-* [postgres] chore(deps): update postgres:17.6 Docker digest to e6a4209 ([#173](https://github.com/CloudPirates-io/helm-charts/pull/173))
-
-## <small>0.1.9 (2025-10-02)</small>
-
-* add topologySpreadConstraints and trafficDistribution opti… (#209) ([c777fca](https://github.com/CloudPirates-io/helm-charts/commit/c777fca)), closes [#209](https://github.com/CloudPirates-io/helm-charts/issues/209)
-
-## <small>0.1.8 (2025-09-30)</small>
-
-* Feature/command customize (#186) ([a458e15](https://github.com/CloudPirates-io/helm-charts/commit/a458e15)), closes [#186](https://github.com/CloudPirates-io/helm-charts/issues/186)
-
-## <small>0.1.7 (2025-09-29)</small>
-
-* replace deprecated 'proxy' with new proxy parameters (#183) ([d850b7b](https://github.com/CloudPirates-io/helm-charts/commit/d850b7b)), closes [#183](https://github.com/CloudPirates-io/helm-charts/issues/183)
-
-## <small>0.1.6 (2025-09-26)</small>
-
-* [postgres] chore(deps): update postgres:17.6 Docker digest to 0b6428e (#162) ([6293612](https://github.com/CloudPirates-io/helm-charts/commit/6293612)), closes [#162](https://github.com/CloudPirates-io/helm-charts/issues/162)
-
-## <small>0.1.5 (2025-09-25)</small>
-
-* add namespaces to templates, change user/group-ids to 1001 ([31b203b](https://github.com/CloudPirates-io/helm-charts/commit/31b203b))
-* add readme documentation and values.schema.json ([369448b](https://github.com/CloudPirates-io/helm-charts/commit/369448b))
-* add support for extra env vars from an existing secret (#158) ([263604f](https://github.com/CloudPirates-io/helm-charts/commit/263604f)), closes [#158](https://github.com/CloudPirates-io/helm-charts/issues/158)
-* Fix resolving template expressions in extraobjects ([12a1cb5](https://github.com/CloudPirates-io/helm-charts/commit/12a1cb5))
-* [postgres] chore(deps): update postgres:17.6 Docker digest to 0f4f200 ([b4a6a30](https://github.com/CloudPirates-io/helm-charts/commit/b4a6a30))
-* Add keycloak logo ([bf1e1c2](https://github.com/CloudPirates-io/helm-charts/commit/bf1e1c2))
-* Add TODO ([8162d60](https://github.com/CloudPirates-io/helm-charts/commit/8162d60))
-* Artifact hub id ([02540ae](https://github.com/CloudPirates-io/helm-charts/commit/02540ae))
-* Bump the correct thing ([35e7901](https://github.com/CloudPirates-io/helm-charts/commit/35e7901))
-* Fix chart version bump ([aae07b1](https://github.com/CloudPirates-io/helm-charts/commit/aae07b1))
-* Fix deprecated env vars warning ([50d9fa0](https://github.com/CloudPirates-io/helm-charts/commit/50d9fa0))
-* Fix lint ([4bf9e77](https://github.com/CloudPirates-io/helm-charts/commit/4bf9e77))
-* Fix lint 2 ([a38fc35](https://github.com/CloudPirates-io/helm-charts/commit/a38fc35))
-* Fix lint 3 ([0875bfa](https://github.com/CloudPirates-io/helm-charts/commit/0875bfa))
-* Fix lint 4 ([7fcbd78](https://github.com/CloudPirates-io/helm-charts/commit/7fcbd78))
-* Improvements ([cea8f2c](https://github.com/CloudPirates-io/helm-charts/commit/cea8f2c))
-* Initial implementation ([c5d41ec](https://github.com/CloudPirates-io/helm-charts/commit/c5d41ec))
-* Rework keycloak ([2afb0fd](https://github.com/CloudPirates-io/helm-charts/commit/2afb0fd))
-* Update CHANGELOG.md ([b7572a8](https://github.com/CloudPirates-io/helm-charts/commit/b7572a8))
-* Update CHANGELOG.md ([245f9b6](https://github.com/CloudPirates-io/helm-charts/commit/245f9b6))
-* Update CHANGELOG.md ([0bf9f75](https://github.com/CloudPirates-io/helm-charts/commit/0bf9f75))
-* Update CHANGELOG.md ([03d476e](https://github.com/CloudPirates-io/helm-charts/commit/03d476e))
-* Update CHANGELOG.md ([20c19bb](https://github.com/CloudPirates-io/helm-charts/commit/20c19bb))
-* Update CHANGELOG.md ([68435aa](https://github.com/CloudPirates-io/helm-charts/commit/68435aa))
-* Update CHANGELOG.md ([b8adca8](https://github.com/CloudPirates-io/helm-charts/commit/b8adca8))
-* Update CHANGELOG.md ([62e51b9](https://github.com/CloudPirates-io/helm-charts/commit/62e51b9))
-* Update CHANGELOG.md ([54f725e](https://github.com/CloudPirates-io/helm-charts/commit/54f725e))
-* Update CHANGELOG.md ([2ed9b3f](https://github.com/CloudPirates-io/helm-charts/commit/2ed9b3f))
-* Update CHANGELOG.md ([2178148](https://github.com/CloudPirates-io/helm-charts/commit/2178148))
-* Update CHANGELOG.md ([8d6710f](https://github.com/CloudPirates-io/helm-charts/commit/8d6710f))
-* chore: fix changelog ([bd9f1a8](https://github.com/CloudPirates-io/helm-charts/commit/bd9f1a8))
+* [keycloak] Add support for extra volumes, volumeMounts and initContainers ([#215](https://github.com/CloudPirates-io/helm-charts/pull/215))

charts/keycloak/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: keycloak
 description: Open Source Identity and Access Management Solution
 type: application
-version: 0.1.10
+version: 0.2.0
 appVersion: "26.3.4"
 keywords:
   - keycloak

charts/keycloak/README.md

@@ -99,6 +99,19 @@ The following table lists the configurable parameters of the Keycloak chart and
 | `podAnnotations` | Map of annotations to add to the pods | `{}`    |
 | `podLabels`      | Map of labels to add to the pods      | `{}`    |
 
+### Extra volumes and volumes mount
+
+| Parameter           | Description                                           | Default |
+| ------------------- | ----------------------------------------------------- | ------- |
+| `extraVolumes`      | Array of Volume to add to the keycloak pod            | `[]`    |
+| `extraVolumeMounts` | Array of VolumeMount to add to the keycloak container | `[]`    |
+
+### Extra init containers for Keycloak pod
+
+| Parameter             | Description                                           | Default |
+| --------------------- | ----------------------------------------------------- | ------- |
+| `extraInitContainers` | Array of initContainer to add to the keycloak pod     | `[]`    |
+
 ### Security
 
 | Parameter                                  | Description                                       | Default   |
@@ -130,6 +143,7 @@ The following table lists the configurable parameters of the Keycloak chart and
 | `keycloak.proxyProtocolEnabled`        | Whether the server should use the HA PROXY protocol when serving requests from behind a proxy. (true, false) | `false`            |
 | `keycloak.proxyTrustedAddresses`       | A comma separated list of trusted proxy addresses                                                            | `""`               |
 | `keycloak.production`                  | Enable production mode                                                                                       | `false`            |
+| `keycloak.httpRelativePath`            | Set relative path for serving resources; must start with a /                                                 | `""`               |
 
 ### Database Configuration
 

charts/keycloak/templates/_helpers.tpl

@@ -180,4 +180,15 @@ Return the database JDBC URL
 {{- printf "jdbc:mysql://%s:%s/%s%s" .Values.database.host (default "3306" (.Values.database.port | toString)) .Values.database.name (ternary (printf "?%s" .Values.database.jdbcParams) "" (ne .Values.database.jdbcParams "")) -}}
 {{- end -}}
 {{- end -}}
+{{- end }}
+
+{{/*
+Return the url to use for probes
+*/}}
+{{- define "keycloak.probeUrl" -}}
+{{- if or (eq .Values.keycloak.httpRelativePath "") (eq .Values.keycloak.httpRelativePath "/") -}}
+{{- printf "/realms/master" -}}
+{{- else -}}
+{{- printf "%s/realms/master" .Values.keycloak.httpRelativePath -}}
+{{- end -}}
 {{- end }}

charts/keycloak/templates/deployment.yaml

@@ -52,6 +52,9 @@ spec:
           image: {{ .Values.initContainers.waitForMariadb.image }}
           command: ["sh", "-c", "until mysqladmin ping -h {{ .Release.Name }}-mariadb -P 3306 --silent; do echo waiting for database; sleep 2; done;"]
         {{- end }}
+        {{- if .Values.extraInitContainers }}
+          {{- toYaml .Values.extraInitContainers | nindent 8 }}
+        {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
@@ -108,6 +111,8 @@ spec:
             - --features-disabled={{ join "," .Values.features.disabled }}
             {{- end }}
           env:
+            - name: KC_HTTP_RELATIVE_PATH
+              value: {{ .Values.keycloak.httpRelativePath | quote | default "/" }}
             - name: KC_BOOTSTRAP_ADMIN_USERNAME
               value: {{ .Values.keycloak.adminUser | quote }}
             - name: KC_BOOTSTRAP_ADMIN_PASSWORD
@@ -166,7 +171,7 @@ spec:
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: /realms/master
+              path: {{ include "keycloak.probeUrl" . }}
               port: http
               scheme: HTTP
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
@@ -178,7 +183,7 @@ spec:
           {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: /realms/master
+              path: {{ include "keycloak.probeUrl" . }}
               port: http
               scheme: HTTP
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
@@ -190,7 +195,7 @@ spec:
           {{- if .Values.startupProbe.enabled }}
           startupProbe:
             httpGet:
-              path: /realms/master
+              path: {{ include "keycloak.probeUrl" . }}
               port: http
               scheme: HTTP
             initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
@@ -202,10 +207,8 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
-            {{- if .Values.persistence.enabled }}
             - name: data
               mountPath: /opt/keycloak/data
-            {{- end }}
             {{- if .Values.cache.configFile }}
             - name: cache-config
               mountPath: /opt/keycloak/conf/cache-ispn.xml
@@ -218,11 +221,18 @@ spec:
               mountPath: /opt/keycloak/work
             - name: keycloak-lib-quarkus
               mountPath: /opt/keycloak/lib/quarkus
+            {{- if .Values.extraVolumeMounts }}
+              {{- toYaml .Values.extraVolumeMounts | nindent 12}}
+            {{- end }}
+
       volumes:
         {{- if .Values.persistence.enabled }}
         - name: data
           persistentVolumeClaim:
             claimName: {{ default (include "keycloak.fullname" .) .Values.persistence.existingClaim }}
+        {{- else }}
+        - name: data
+          emptyDir: {}
         {{- end }}
         {{- if .Values.cache.configFile }}
         - name: cache-config
@@ -235,6 +245,9 @@ spec:
           emptyDir: {}
         - name: keycloak-lib-quarkus
           emptyDir: {}
+          {{- if .Values.extraVolumes }}
+            {{- toYaml .Values.extraVolumes | nindent 8 }}
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/keycloak/tests/deployment-parameters_test.yaml

@@ -0,0 +1,17 @@
+suite: test service account
+templates:
+  - templates/deployment.yaml
+tests:
+  - it: readiness probe should be original
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.httpGet.path
+          value: /realms/master
+  - it: readiness probe should include the httpRelativePath
+    set:
+      keycloak:
+        httpRelativePath: /auth
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.httpGet.path
+          value: /auth/realms/master

charts/keycloak/values.schema.json

@@ -73,6 +73,27 @@
       "type": "object",
       "description": "Map of labels to add to the pods"
     },
+    "extraVolumes": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      },
+      "description": "Array of Volume to add to the keycloak pod"
+    },
+    "extraVolumeMounts": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      },
+      "description": "Array of VolumeMount to add to the keycloak container"
+    },
+    "extraInitContainers": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      },
+      "description": "Array of initContainer to add to the keycloak pod"
+    },
     "podSecurityContext": {
       "type": "object",
       "properties": {
@@ -191,6 +212,10 @@
         "production": {
           "type": "boolean",
           "description": "Enable production mode"
+        },
+        "httpRelativePath": {
+          "type": "string",
+          "description": "Set relative path for serving resources; must start with a /"
         }
       }
     },