[bitnami/keycloak] reverts(#30368) (#31227)

* [bitnami/keyclak] reverts(#30368) Signed-off-by: Fran Mulero <francisco-jose.mulero@broadcom.com> --------- Signed-off-by: Fran Mulero <francisco-jose.mulero@broadcom.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Signed-off-by: Carlos Rodríguez Hernández <carlosrh@vmware.com> Signed-off-by: Carlos Rodríguez Hernández <carlos.rodriguez-hernandez@broadcom.com> Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com> Co-authored-by: Carlos Rodríguez Hernández <carlosrh@vmware.com> Co-authored-by: Carlos Rodríguez Hernández <carlos.rodriguez-hernandez@broadcom.com>
bitnami · Jan 31, 2025 · 328ffc4 · 328ffc4
1 parent 54af143
commit 328ffc4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/bitnami/keycloak/CHANGELOG.md b/bitnami/keycloak/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 24.4.7 (2025-01-28)
+## 24.4.8 (2025-01-30)
 
-* [bitnami/keycloak] Release 24.4.7 ([#31625](https://github.com/bitnami/charts/pull/31625))
+* [bitnami/keycloak] reverts(#30368) ([#31227](https://github.com/bitnami/charts/pull/31227))
+
+## <small>24.4.7 (2025-01-28)</small>
+
+* [bitnami/keycloak] Release 24.4.7 (#31625) ([22cc5c7](https://github.com/bitnami/charts/commit/22cc5c7fa8eef1895f5d2b38fc7895e860fa4654)), closes [#31625](https://github.com/bitnami/charts/issues/31625)
 
 ## <small>24.4.6 (2025-01-21)</small>
 

diff --git 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: 24.4.7
+version: 24.4.8
diff --git a/bitnami/keycloak/templates/configmap-env-vars.yaml b/bitnami/keycloak/templates/configmap-env-vars.yaml
@@ -21,10 +21,9 @@ data:
   {{- else }}
   KEYCLOAK_PROXY_HEADERS: {{ .Values.proxyHeaders | quote }}
   {{- end }}
-  {{- if and .Values.adminIngress.enabled .Values.adminIngress.hostname (empty .Values.proxyHeaders) }}
+  {{- if and .Values.adminIngress.enabled .Values.adminIngress.hostname }}
   KEYCLOAK_HOSTNAME_ADMIN: |-
-    {{ ternary "https://" "http://" ( or .Values.adminIngress.tls (eq .Values.proxy "edge") ) -}}
-    {{- include "common.tplvalues.render" (dict "value" .Values.adminIngress.hostname "context" $) -}}
+    {{ ternary "https://" "http://" ( or .Values.adminIngress.tls (eq .Values.proxy "edge") (not (empty .Values.proxyHeaders)) ) -}}    {{- include "common.tplvalues.render" (dict "value" .Values.adminIngress.hostname "context" $) -}}
     {{- if eq .Values.adminIngress.controller "default" }}
       {{- include "common.tplvalues.render" (dict "value" .Values.adminIngress.path "context" $) }}
     {{- else if eq .Values.adminIngress.controller "gce" }}
@@ -35,10 +34,9 @@ data:
       {{- include "common.tplvalues.render" (dict "value" $path "context" $) }}
     {{- end }}
   {{- end }}
-  {{- if and .Values.ingress.enabled .Values.ingress.hostname (empty .Values.proxyHeaders) }}
+  {{- if and .Values.ingress.enabled .Values.ingress.hostname }}
   KEYCLOAK_HOSTNAME: |-
-    {{ ternary "https://" "http://" ( or .Values.ingress.tls (eq .Values.proxy "edge") ) -}}
-    {{- include "common.tplvalues.render" (dict "value" .Values.ingress.hostname "context" $) -}}
+    {{ ternary "https://" "http://" ( or .Values.ingress.tls (eq .Values.proxy "edge") (not (empty .Values.proxyHeaders)) ) -}}    {{- include "common.tplvalues.render" (dict "value" .Values.ingress.hostname "context" $) -}}
     {{- if eq .Values.ingress.controller "default" }}
       {{- include "common.tplvalues.render" (dict "value" .Values.ingress.path "context" $) }}
     {{- else if eq .Values.ingress.controller "gce" }}