Fixed deprecated PROXY configuration with new PROXY_HEADERS config

Signed-off-by: Hans Erik Heggem <[email protected]>
codecentric · Jun 24, 2024 · aadeb66 · aadeb66
1 parent 0c25292
commit aadeb66
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/charts/keycloakx/README.md b/charts/keycloakx/README.md
@@ -11,7 +11,6 @@ $ cat << EOF > values.yaml
 command:
   - "/opt/keycloak/bin/kc.sh"
   - "start"
-  - "--http-enabled=true"
   - "--http-port=8080"
   - "--hostname-strict=false"
 extraEnv: |

diff --git a/charts/keycloakx/examples/postgresql-kubeping/keycloak-server-values.yaml b/charts/keycloakx/examples/postgresql-kubeping/keycloak-server-values.yaml
@@ -5,7 +5,6 @@ command:
   - "/opt/keycloak/bin/kc.sh"
   - "--verbose"
   - "start"
-  - "--http-enabled=true"
   - "--http-port=8080"
   - "--hostname-strict=false"
   - "--spi-events-listener-jboss-logging-success-level=info"

diff --git a/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml b/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml
@@ -5,7 +5,6 @@ command:
   - "/opt/keycloak/bin/kc.sh"
   - "--verbose"
   - "start"
-  - "--http-enabled=true"
   - "--http-port=8080"
   - "--hostname-strict=false"
   - "--spi-events-listener-jboss-logging-success-level=info"

diff --git a/charts/keycloakx/templates/statefulset.yaml b/charts/keycloakx/templates/statefulset.yaml
@@ -100,9 +100,13 @@ spec:
               value: "kubernetes"
             {{- end }}
             {{- if .Values.proxy.enabled }}
-            - name: KC_PROXY
+            - name: KC_PROXY_HEADERS
               value: {{ .Values.proxy.mode }}
             {{- end }}
+            {{- if .Values.proxy.http.enabled }}
+            - name: KC_HTTP_ENABLED
+              value: "true"
+            {{- end }}
             {{- if .Values.database.vendor }}
             - name: KC_DB
               value: {{ .Values.database.vendor }}

diff --git a/charts/keycloakx/values.yaml b/charts/keycloakx/values.yaml
@@ -406,7 +406,9 @@ cache:
 
 proxy:
   enabled: true
-  mode: edge
+  mode: forwarded
+  http:
+    enabled: true
 
 metrics:
   enabled: true