libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Fix Keycloak operator setting for cache-config-file (#26666)

Browse source 
Fixes: #26458

Signed-off-by: Michal Hajas <mhajas@redhat.com>
This commit is contained in:
Michal Hajas 2024-02-01 12:47:35 +01:00 committed by GitHub
parent 3a7ce54266
commit c579cf737f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
operator/src/main/java/org/keycloak/operator/Constants.java
View file

@ -65,8 +65,10 @@ public final class Constants {
public static final String INSECURE_DISABLE = "INSECURE-DISABLE"; public static final String INSECURE_DISABLE = "INSECURE-DISABLE";
public static final String CERTIFICATES_FOLDER = "/mnt/certificates"; public static final String CERTIFICATES_FOLDER = "/mnt/certificates";
public static final String TRUSTSTORES_FOLDER = "/opt/keycloak/conf/truststores"; public static final String CONFIG_FOLDER = "/opt/keycloak/conf";
public static final String CACHE_CONFIG_FOLDER = "/opt/keycloak/conf/cache"; 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"; public static final String KEYCLOAK_HTTP_RELATIVE_PATH_KEY = "http-relative-path";
} }

2
operator/src/main/java/org/keycloak/operator/controllers/KeycloakDistConfigurator.java
View file

@ -112,7 +112,7 @@ public class KeycloakDistConfigurator {
void configureCache() { void configureCache() {
optionMapper(keycloakCR -> keycloakCR.getSpec().getCacheSpec()) 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() { void configureDatabase() {

2
operator/src/test/java/org/keycloak/operator/testsuite/unit/KeycloakDistConfiguratorTest.java
View file

@ -66,7 +66,7 @@ public class KeycloakDistConfiguratorTest {
@Test @Test
public void cache() { 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 @Test