From 43577c3f2b0c13dbcd815ef5ea610c7a0ced0f86 Mon Sep 17 00:00:00 2001 From: msvechla Date: Thu, 11 Sep 2025 13:16:58 +0200 Subject: [PATCH] [bitnami/keycloak] fix: consider httpRelativePath for metrics (#36219) * [bitnami/keycloak] fix: consider httpRelativePath for metrics When a relative path is set, this path is used as a prefix to the metrics path: https://www.keycloak.org/server/management-interface#_relative_path This issue was introduced with the recent metrics refactorings. Signed-off-by: Marius Svechla * Update CHANGELOG.md Signed-off-by: Bitnami Bot --------- Signed-off-by: Marius Svechla Signed-off-by: Bitnami Bot Co-authored-by: Bitnami Bot --- bitnami/keycloak/CHANGELOG.md | 6 +++++- bitnami/keycloak/Chart.yaml | 2 +- bitnami/keycloak/templates/servicemonitor.yaml | 2 +- bitnami/keycloak/templates/statefulset.yaml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bitnami/keycloak/CHANGELOG.md b/bitnami/keycloak/CHANGELOG.md index fac5a482f9..95dc7a61c9 100644 --- a/bitnami/keycloak/CHANGELOG.md +++ b/bitnami/keycloak/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog +## 25.2.2 (2025-09-08) + +* [bitnami/keycloak] fix: consider httpRelativePath for metrics ([#36219](https://github.com/bitnami/charts/pull/36219)) + ## 25.2.0 (2025-08-21) -* [bitnami/keycloak] Add externalDatabase.extraParams for custom JDBC connection parameters ([#35770](https://github.com/bitnami/charts/pull/35770)) +* [bitnami/keycloak] Add externalDatabase.extraParams for custom JDBC connection parameters (#35770) ([d7ec0ea](https://github.com/bitnami/charts/commit/d7ec0ea7bff7264df7068ec6e51fbd3493d2c890)), closes [#35770](https://github.com/bitnami/charts/issues/35770) ## 25.1.2 (2025-08-20) diff --git a/bitnami/keycloak/Chart.yaml b/bitnami/keycloak/Chart.yaml index fca8638c37..c419e60406 100644 --- a/bitnami/keycloak/Chart.yaml +++ b/bitnami/keycloak/Chart.yaml @@ -35,4 +35,4 @@ maintainers: name: keycloak sources: - https://github.com/bitnami/charts/tree/main/bitnami/keycloak -version: 25.2.1 +version: 25.2.2 diff --git a/bitnami/keycloak/templates/servicemonitor.yaml b/bitnami/keycloak/templates/servicemonitor.yaml index 87b39067fa..8025def729 100644 --- a/bitnami/keycloak/templates/servicemonitor.yaml +++ b/bitnami/keycloak/templates/servicemonitor.yaml @@ -21,7 +21,7 @@ spec: jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel | quote }} endpoints: - port: tcp-metrics - path: "/metrics" + path: "{{ trimSuffix "/" .Values.httpRelativePath }}/metrics" {{- if .Values.tls.enabled }} scheme: https {{- if .Values.metrics.serviceMonitor.tlsConfig }} diff --git a/bitnami/keycloak/templates/statefulset.yaml b/bitnami/keycloak/templates/statefulset.yaml index 72f12f0ca2..41738ea010 100644 --- a/bitnami/keycloak/templates/statefulset.yaml +++ b/bitnami/keycloak/templates/statefulset.yaml @@ -218,7 +218,7 @@ spec: {{- else if .Values.readinessProbe.enabled }} readinessProbe: {{- omit .Values.readinessProbe "enabled" | toYaml | nindent 12 }} httpGet: - path: {{ .Values.httpRelativePath }}realms/{{ .Values.adminRealm | default "master" }} + path: {{ trimSuffix "/" .Values.httpRelativePath }}/realms/{{ .Values.adminRealm | default "master" }} port: {{ ternary "http" "https" (or .Values.httpEnabled (not .Values.tls.enabled)) }} scheme: {{ ternary "HTTP" "HTTPS" (or .Values.httpEnabled (not .Values.tls.enabled)) }} {{- end }}