set auto-mount service account token to false in keycloak pods #40605
+185
−6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -149,6 +149,10 @@ public class KeycloakSpec { | |
| @JsonPropertyDescription("Configuration for startup probe, by default it is 1 for periodSeconds and 600 for failureThreshold") | ||
| private ProbeSpec startupProbeSpec; | ||
|
|
||
| @JsonProperty("automountServiceAccountToken") | ||
| @JsonPropertyDescription("Set this to automount the default ServiceAccount Token and Service CA") | ||
| private Boolean automountServiceAccountToken; | ||
|
|
||
|
|
||
| public HttpSpec getHttpSpec() { | ||
| return httpSpec; | ||
|
|
@@ -349,4 +353,9 @@ public void setReadinessProbeSpec(ProbeSpec readinessProbeSpec) { | |
| public void setStartupProbeSpec(ProbeSpec startupProbeSpec) { | ||
| this.startupProbeSpec = startupProbeSpec; | ||
| } | ||
|
|
||
| public Boolean getAutomountServiceAccountToken() { | ||
| return automountServiceAccountToken; | ||
| } | ||
| public void setAutomountServiceAccountToken(Boolean automountServiceAccountToken) {this.automountServiceAccountToken = automountServiceAccountToken;} | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -720,7 +720,16 @@ public void testApplyingResourcesDefaultValues() { | |
| assertThat(limits).isNotNull(); | ||
| assertThat(limits.get("memory")).isEqualTo(config.keycloak().resources().limits().memory()); | ||
| } | ||
| @Test | ||
| public void testNoAutoMountServiceAccount() { | ||
| var kc = getTestKeycloakDeployment(true); | ||
| kc.getSpec().setAutomountServiceAccountToken(Boolean.FALSE); | ||
| deployKeycloak(k8sclient, kc, true); | ||
| var pods = k8sclient.pods().inNamespace(namespace).withLabels(Constants.DEFAULT_LABELS).list().getItems(); | ||
| assertThat(pods).isNotNull(); | ||
| assertThat(pods).isNotEmpty(); | ||
| assertThat(pods.get(0).getSpec().getAutomountServiceAccountToken()).isEqualTo(Boolean.FALSE); | ||
| } | ||
| private void handleFakeImagePullSecretCreation(Keycloak keycloakCR, | ||
| String secretDescriptorFilename) { | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -313,5 +313,11 @@ private static void assertNetworkPolicyRules(Collection<NetworkPolicyPeer> rules | |
| fail(); | ||
| } | ||
| } | ||
| @Test | ||
| public void testNoAutoMountServiceAccountToken() { | ||
| var keycloak = Serialization.unmarshal(this.getClass().getResourceAsStream("/test-serialization-keycloak-cr-without-automount.yml"), Keycloak.class); | ||
| var keycloakSpec = keycloak.getSpec(); | ||
| assertNotNull(keycloakSpec); | ||
| assertFalse(keycloakSpec.getAutomountServiceAccountToken()); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| apiVersion: k8s.keycloak.org/v2alpha1 | ||
| kind: Keycloak | ||
| metadata: | ||
| name: test-serialization-kc | ||
| spec: | ||
| instances: 3 | ||
| image: my-image | ||
| automountServiceAccountToken: false | ||
| additionalOptions: | ||
| - name: key1 | ||
| value: value1 | ||
| - name: features | ||
| value: docker | ||
| db: | ||
| vendor: vendor | ||
| usernameSecret: | ||
| name: usernameSecret | ||
| key: usernameSecretKey | ||
| passwordSecret: | ||
| name: passwordSecret | ||
| key: passwordSecretKey | ||
| host: host | ||
| database: database | ||
| url: url | ||
| port: 123 | ||
| schema: schema | ||
| poolInitialSize: 1 | ||
| poolMinSize: 2 | ||
| poolMaxSize: 3 | ||
| ingress: | ||
| enabled: false | ||
| className: nginx | ||
| annotations: | ||
| myAnnotation: myValue | ||
| anotherAnnotation: anotherValue | ||
| readinessProbe: | ||
| periodSeconds: 50 | ||
| failureThreshold: 3 | ||
| livenessProbe: | ||
| periodSeconds: 60 | ||
| failureThreshold: 1 | ||
| startupProbe: | ||
| periodSeconds: 40 | ||
| failureThreshold: 2 | ||
| networkPolicy: | ||
| enabled: true | ||
| http: | ||
| - ipBlock: | ||
| cidr: 172.17.0.0/16 | ||
| except: | ||
| - 172.17.1.0/24 | ||
| - namespaceSelector: | ||
| matchLabels: | ||
| project: myproject | ||
| - podSelector: | ||
| matchLabels: | ||
| role: frontend | ||
| https: | ||
| - ipBlock: | ||
| cidr: 172.17.0.0/16 | ||
| except: | ||
| - 172.17.1.0/24 | ||
| - namespaceSelector: | ||
| matchLabels: | ||
| project: myproject | ||
| - podSelector: | ||
| matchLabels: | ||
| role: frontend | ||
| management: | ||
| - ipBlock: | ||
| cidr: 172.17.0.0/16 | ||
| except: | ||
| - 172.17.1.0/24 | ||
| - namespaceSelector: | ||
| matchLabels: | ||
| project: myproject | ||
| - podSelector: | ||
| matchLabels: | ||
| role: frontend | ||
| http: | ||
| httpEnabled: true | ||
| httpPort: 123 | ||
| httpsPort: 456 | ||
| tlsSecret: my-tls-secret | ||
| hostname: | ||
| hostname: my-hostname | ||
| admin: my-admin-hostname | ||
| adminUrl: https://www.my-admin-hostname.org:8448/something | ||
| strict: true | ||
| strictBackchannel: true | ||
| backchannelDynamic: true | ||
| cache: | ||
| configMapFile: | ||
| name: my-config-map | ||
| key: file.xml | ||
| features: | ||
| enabled: | ||
| - docker | ||
| - authorization | ||
| disabled: | ||
| - admin | ||
| - step-up-authentication | ||
| transaction: | ||
| xaEnabled: false | ||
| tracing: | ||
| enabled: true | ||
| endpoint: http://my-tracing:4317 | ||
| serviceName: my-best-keycloak | ||
| protocol: http/protobuf | ||
| samplerType: parentbased_traceidratio | ||
| samplerRatio: 0.01 | ||
| compression: gzip | ||
| resourceAttributes: | ||
| service.namespace: keycloak-namespace | ||
| service.name: custom-service-name | ||
| resources: | ||
| requests: | ||
| cpu: "500m" | ||
| memory: "500M" | ||
| limits: | ||
| cpu: "2" | ||
| memory: "1500M" | ||
| proxy: | ||
| headers: forwarded | ||
| truststores: | ||
| x: | ||
| secret: | ||
| name: my-secret | ||
| httpManagement: | ||
| port: 9003 | ||
| bootstrapAdmin: | ||
| user: | ||
| secret: something | ||
| service: | ||
| secret: else | ||
| update: | ||
| strategy: Auto | ||
| revision: 1 | ||
| unsupported: | ||
| podTemplate: | ||
| metadata: | ||
| labels: | ||
| my-label: "foo" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The assumption moving forward is that there will be no null case - we'll set the spec automountServiceAccountToken to true or false.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Allowing null to be the default handling would probably be best.