Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: keycloak volume permissions, UI update #223

Merged
merged 3 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/keycloak/chart/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ spec:
{{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 8 }}
{{- end }}
spec:
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
mjnagel marked this conversation as resolved.
Show resolved Hide resolved
initContainers:
- name: uds-config
image: "{{ .Values.configImage }}"
Expand Down
8 changes: 7 additions & 1 deletion src/keycloak/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ image:
pullPolicy: IfNotPresent

# renovate: datasource=github-tags depName=defenseunicorns/uds-identity-config versioning=semver
configImage: ghcr.io/defenseunicorns/uds/identity-config:0.3.2
configImage: ghcr.io/defenseunicorns/uds/identity-config:0.3.4

# The public domain name of the Keycloak server
domain: "###ZARF_VAR_DOMAIN###"
Expand Down Expand Up @@ -42,6 +42,12 @@ fips: false
# Pod priority class name
priorityClassName: ""

# Pod level securityContext
podSecurityContext: {}

# Keycloak container securityContext
securityContext: {}

# Pod affinity
affinity: |
podAntiAffinity:
Expand Down
2 changes: 1 addition & 1 deletion src/keycloak/tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
includes:
- config: https://raw.githubusercontent.com/defenseunicorns/uds-identity-config/v0.3.2/tasks.yaml
- config: https://raw.githubusercontent.com/defenseunicorns/uds-identity-config/v0.3.4/tasks.yaml

tasks:
# These tests break single capability test checks
Expand Down
2 changes: 2 additions & 0 deletions src/keycloak/values/registry1-values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
image:
repository: registry1.dso.mil/ironbank/opensource/keycloak/keycloak
tag: "23.0.4"
podSecurityContext:
fsGroup: 2000
securityContext:
runAsUser: 2000
runAsGroup: 2000
Expand Down
2 changes: 2 additions & 0 deletions src/keycloak/values/upstream-values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
podSecurityContext:
fsGroup: 1000
image:
repository: quay.io/keycloak/keycloak
tag: "23.0.4"
4 changes: 2 additions & 2 deletions src/keycloak/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ components:
- "values/upstream-values.yaml"
images:
- quay.io/keycloak/keycloak:23.0.4
- ghcr.io/defenseunicorns/uds/identity-config:0.3.2
- ghcr.io/defenseunicorns/uds/identity-config:0.3.4

- name: keycloak
required: true
Expand All @@ -37,4 +37,4 @@ components:
- "values/registry1-values.yaml"
images:
- registry1.dso.mil/ironbank/opensource/keycloak/keycloak:23.0.4
- ghcr.io/defenseunicorns/uds/identity-config:0.3.2
- ghcr.io/defenseunicorns/uds/identity-config:0.3.4