From ed47893161f0602f59a1b495c9cdfc1e9914ed45 Mon Sep 17 00:00:00 2001
From: Gabriel Mainberger <gabriel.mainberger@vshn.net>
Date: Wed, 24 Jan 2024 16:51:18 +0100
Subject: [PATCH] Remove Keycloak JDK UseContainerSupport parameter

The parameter `-XX:+UseContainerSupport` is no longer required for Keycloak >= v21 based on JDK v17.
JDK >= v17 has enabled the container support by default.
---
 charts/keycloakx/README.md                                     | 3 ++-
 charts/keycloakx/ci/h2-values.yaml                             | 1 -
 .../examples/postgresql-kubeping/keycloak-server-values.yaml   | 1 -
 .../keycloakx/examples/postgresql/keycloak-server-values.yaml  | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/charts/keycloakx/README.md b/charts/keycloakx/README.md
index dfd1fab0..8b3112a6 100644
--- a/charts/keycloakx/README.md
+++ b/charts/keycloakx/README.md
@@ -269,7 +269,6 @@ This allows you to only configure memory using Kubernetes resources and the JVM
 extraEnv: |
   - name: JAVA_OPTS
     value: >-
-      -XX:+UseContainerSupport
       -XX:MaxRAMPercentage=50.0
       -Djava.net.preferIPv4Stack=true
       -Djava.awt.headless=true
@@ -277,6 +276,8 @@ extraEnv: |
 
 Alternatively one can append custom JVM options by setting the `JAVA_OPTS_APPEND` environment variable.
 
+The parameter `-XX:+UseContainerSupport` is no longer required for [Keycloak >= v21 based on JDK v17](https://github.com/keycloak/keycloak/blob/release/21.0/quarkus/container/Dockerfile#L20).
+
 #### Using an External Database
 
 The Keycloak Docker image supports various database types.
diff --git a/charts/keycloakx/ci/h2-values.yaml b/charts/keycloakx/ci/h2-values.yaml
index 65402520..1a0912f4 100644
--- a/charts/keycloakx/ci/h2-values.yaml
+++ b/charts/keycloakx/ci/h2-values.yaml
@@ -18,7 +18,6 @@ extraEnv: |
         key: password
   - name: JAVA_OPTS_APPEND
     value: >-
-      -XX:+UseContainerSupport
       -XX:MaxRAMPercentage=50.0
       -Djava.awt.headless=true
       -Djgroups.dns.query={{ include "keycloak.fullname" . }}-headless
diff --git a/charts/keycloakx/examples/postgresql-kubeping/keycloak-server-values.yaml b/charts/keycloakx/examples/postgresql-kubeping/keycloak-server-values.yaml
index 72eb2f83..839a884e 100644
--- a/charts/keycloakx/examples/postgresql-kubeping/keycloak-server-values.yaml
+++ b/charts/keycloakx/examples/postgresql-kubeping/keycloak-server-values.yaml
@@ -37,7 +37,6 @@ extraEnv: |
         key: password
   - name: JAVA_OPTS_APPEND
     value: >-
-      -XX:+UseContainerSupport
       -XX:MaxRAMPercentage=50.0
       -Djava.awt.headless=true
       -Dkubeping_namespace={{ .Release.Namespace }}
diff --git a/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml b/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml
index 3d82fb33..4ec59ecb 100644
--- a/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml
+++ b/charts/keycloakx/examples/postgresql/keycloak-server-values.yaml
@@ -25,7 +25,6 @@ extraEnv: |
         key: password
   - name: JAVA_OPTS_APPEND
     value: >-
-      -XX:+UseContainerSupport
       -XX:MaxRAMPercentage=50.0
       -Djava.awt.headless=true
       -Djgroups.dns.query={{ include "keycloak.fullname" . }}-headless