From 8ae3750348ecbf5dca09c236b49aad4e055e8943 Mon Sep 17 00:00:00 2001 From: Steven Hawkins Date: Thu, 20 Nov 2025 02:53:28 -0500 Subject: [PATCH] fix: switching to Boolean instead of boolean (#44340) closes: #38843 Signed-off-by: Steve Hawkins --- .../controllers/KeycloakDeploymentDependentResource.java | 4 ++-- .../operator/crds/v2alpha1/deployment/KeycloakSpec.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDeploymentDependentResource.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDeploymentDependentResource.java index c873fd20c01..ec9d102a49f 100644 --- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDeploymentDependentResource.java +++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakDeploymentDependentResource.java @@ -327,7 +327,7 @@ public class KeycloakDeploymentDependentResource extends CRUDKubernetesDependent if (!specBuilder.hasDnsPolicy()) { specBuilder.withDnsPolicy("ClusterFirst"); } - boolean automount = keycloakCR.getSpec().getAutomountServiceAccountToken(); + boolean automount = !Boolean.FALSE.equals(keycloakCR.getSpec().getAutomountServiceAccountToken()); specBuilder.withAutomountServiceAccountToken(automount); handleScheduling(keycloakCR, schedulingLabels, specBuilder); @@ -472,7 +472,7 @@ public class KeycloakDeploymentDependentResource extends CRUDKubernetesDependent if (useServiceCaCrt) { truststores += "," + SERVICE_CA_CRT; } - + // include the kube CA if the user is not controlling KC_TRUSTSTORE_PATHS via the unsupported or the additional varMap.putIfAbsent(KC_TRUSTSTORE_PATHS, new EnvVarBuilder().withName(KC_TRUSTSTORE_PATHS).withValue(truststores).build()); } diff --git a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java index 0fd352304cb..39468966b00 100644 --- a/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java +++ b/operator/src/main/java/org/keycloak/operator/crds/v2alpha1/deployment/KeycloakSpec.java @@ -164,7 +164,7 @@ public class KeycloakSpec { @JsonProperty("automountServiceAccountToken") @JsonPropertyDescription("Set this to to false to disable automounting the default ServiceAccount Token and Service CA. This is enabled by default.") - private boolean automountServiceAccountToken = true; + private Boolean automountServiceAccountToken; public HttpSpec getHttpSpec() { return httpSpec; @@ -391,10 +391,11 @@ public class KeycloakSpec { this.serviceMonitorSpec = serviceMonitorSpec; } - public boolean getAutomountServiceAccountToken() { + public Boolean getAutomountServiceAccountToken() { return automountServiceAccountToken; } - public void setAutomountServiceAccountToken(boolean automountServiceAccountToken) { + + public void setAutomountServiceAccountToken(Boolean automountServiceAccountToken) { this.automountServiceAccountToken = automountServiceAccountToken; } }