From f04548a1dbae55d5dbad34cea87e6972f97c9bb7 Mon Sep 17 00:00:00 2001 From: Baljit Singh Date: Thu, 20 Jun 2024 05:09:36 -0400 Subject: [PATCH] [bitnami/keycloak] fix Keycloak HTTP schema for edge proxy mode (#27436) * fix Keycloak schema for edge proxy mode Signed-off-by: Baljit Singh * Update CHANGELOG.md Signed-off-by: Bitnami Containers --------- Signed-off-by: Baljit Singh Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/keycloak/CHANGELOG.md | 8 ++++++-- bitnami/keycloak/Chart.yaml | 2 +- bitnami/keycloak/templates/statefulset.yaml | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bitnami/keycloak/CHANGELOG.md b/bitnami/keycloak/CHANGELOG.md index d16406b21e..771549c308 100644 --- a/bitnami/keycloak/CHANGELOG.md +++ b/bitnami/keycloak/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 21.4.3 (2024-06-18) +## 21.4.4 (2024-06-18) -* [bitnami/keycloak] Release 21.4.3 ([#27361](https://github.com/bitnami/charts/pull/27361)) +* [bitnami/keycloak] fix Keycloak HTTP schema for edge proxy mode ([#27436](https://github.com/bitnami/charts/pull/27436)) + +## 21.4.3 (2024-06-18) + +* [bitnami/keycloak] Release 21.4.3 (#27361) ([31f011c](https://github.com/bitnami/charts/commit/31f011cb89e56bd33db8e51a9e42f7cc533dcc14)), closes [#27361](https://github.com/bitnami/charts/issues/27361) ## 21.4.2 (2024-06-17) diff --git a/bitnami/keycloak/Chart.yaml b/bitnami/keycloak/Chart.yaml index c48c2b561e..fcef3e78dd 100644 --- a/bitnami/keycloak/Chart.yaml +++ b/bitnami/keycloak/Chart.yaml @@ -33,4 +33,4 @@ maintainers: name: keycloak sources: - https://github.com/bitnami/charts/tree/main/bitnami/keycloak -version: 21.4.3 +version: 21.4.4 diff --git a/bitnami/keycloak/templates/statefulset.yaml b/bitnami/keycloak/templates/statefulset.yaml index 93857b60fd..42b0b71c19 100644 --- a/bitnami/keycloak/templates/statefulset.yaml +++ b/bitnami/keycloak/templates/statefulset.yaml @@ -214,11 +214,11 @@ spec: {{- end }} {{- if .Values.adminIngress.enabled }} - name: KC_HOSTNAME_ADMIN_URL - value: "http{{ if .Values.adminIngress.tls }}s{{ end }}://{{ include "common.tplvalues.render" (dict "value" .Values.adminIngress.hostname "context" $) }}" + value: "http{{ if or .Values.adminIngress.tls (eq .Values.proxy "edge") }}s{{ end }}://{{ include "common.tplvalues.render" (dict "value" .Values.adminIngress.hostname "context" $) }}" {{- end }} {{- if and .Values.adminIngress.enabled (not .Values.ingress.enabled) }} - name: KC_HOSTNAME_URL - value: "http{{ if .Values.adminIngress.tls }}s{{ end }}://{{ include "common.tplvalues.render" (dict "value" .Values.adminIngress.hostname "context" $) }}" + value: "http{{ if or .Values.adminIngress.tls (eq .Values.proxy "edge") }}s{{ end }}://{{ include "common.tplvalues.render" (dict "value" .Values.adminIngress.hostname "context" $) }}" {{- end }} {{- if .Values.extraEnvVars }} {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}