From c579cf737f83751333abf13fb82086d9bbdc5200 Mon Sep 17 00:00:00 2001 From: Michal Hajas Date: Thu, 1 Feb 2024 12:47:35 +0100 Subject: [PATCH] Fix Keycloak operator setting for cache-config-file (#26666) Fixes: #26458 Signed-off-by: Michal Hajas --- operator/src/main/java/org/keycloak/operator/Constants.java | 6 ++++-- .../operator/controllers/KeycloakDistConfigurator.java | 2 +- .../testsuite/unit/KeycloakDistConfiguratorTest.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/operator/src/main/java/org/keycloak/operator/Constants.java b/operator/src/main/java/org/keycloak/operator/Constants.java index ced49845f0..061c552c03 100644 --- a/operator/src/main/java/org/keycloak/operator/Constants.java +++ b/operator/src/main/java/org/keycloak/operator/Constants.java @@ -65,8 +65,10 @@ public final class Constants { public static final String INSECURE_DISABLE = "INSECURE-DISABLE"; public static final String CERTIFICATES_FOLDER = "/mnt/certificates"; - public static final String TRUSTSTORES_FOLDER = "/opt/keycloak/conf/truststores"; - public static final String CACHE_CONFIG_FOLDER = "/opt/keycloak/conf/cache"; + public static final String CONFIG_FOLDER = "/opt/keycloak/conf"; + public static final String TRUSTSTORES_FOLDER = CONFIG_FOLDER + "/truststores"; + public static final String CACHE_CONFIG_SUBFOLDER = "cache"; + public static final String CACHE_CONFIG_FOLDER = CONFIG_FOLDER + "/" + CACHE_CONFIG_SUBFOLDER; public static final String KEYCLOAK_HTTP_RELATIVE_PATH_KEY = "http-relative-path"; } diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java index 45a1624602..a9e45d5a87 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java @@ -112,7 +112,7 @@ public class KeycloakDistConfigurator { void configureCache() { optionMapper(keycloakCR -> keycloakCR.getSpec().getCacheSpec()) - .mapOption("cache-config-file", cache -> Optional.ofNullable(cache.getConfigMapFile()).map(c -> Constants.CACHE_CONFIG_FOLDER + "/" + c.getKey()).orElse(null)); + .mapOption("cache-config-file", cache -> Optional.ofNullable(cache.getConfigMapFile()).map(c -> Constants.CACHE_CONFIG_SUBFOLDER + "/" + c.getKey()).orElse(null)); } void configureDatabase() { diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java index 5159561508..d3d02d6983 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java @@ -66,7 +66,7 @@ public class KeycloakDistConfiguratorTest { @Test public void cache() { - testFirstClassCitizen(Map.of("cache-config-file", "/opt/keycloak/conf/cache/file.xml")); + testFirstClassCitizen(Map.of("cache-config-file", "cache/file.xml")); } @Test