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.

Sign up for GitHub

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(chart): remove conditionals from values.yaml for architecture support #339

Merged
merged 4 commits into from
Feb 9, 2025
Merged

fix(chart): remove conditionals from values.yaml for architecture support #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4e0c5d
fix(chart): update Keycloak chart version to 0.61.0 and enhance READM…
akafazov Feb 8, 2025
204190b
fix(local-setup): add extra environment variables for Keycloak in arm…
akafazov Feb 8, 2025
8ae797c
fix(chart): remove architecture key from Keycloak values and README
akafazov Feb 8, 2025
7f5b3fc
fix(local-setup): add JAVA_OPTS_APPEND environment variable for Keycl…
akafazov Feb 8, 2025
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: 1 addition & 1 deletion charts/keycloak/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: keycloak
description: A Helm chart to deploy keycloak as OIDC provider in openmfp

type: application
version: 0.60.23
version: 0.61.0
appVersion: "1.16.0"

dependencies:
Expand Down
4 changes: 2 additions & 2 deletions charts/keycloak/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ A Helm chart to deploy keycloak as OIDC provider in openmfp
| job | object | `{"annotations":{"argocd.argoproj.io/hook":"PostSync"},"serviceAccount":"keycloak-client-creation"}` | job configuration |
| job.annotations | object | `{"argocd.argoproj.io/hook":"PostSync"}` | custom job annotations |
| job.serviceAccount | string | `"keycloak-client-creation"` | job ServiceAccount name |
| keycloak | object | `{"extraEnvVars":"- name: KEYCLOAK_USER\n value: keycloak-admin\n- name: KEYCLOAK_PASSWORD\n valueFrom:\n secretKeyRef:\n name: keycloak-admin\n key: secret\n- name: JAVA_OPTS_APPEND\n value: >-\n {% if eq .Values.arch \"Arm64\" -%}\n -XX:UseSVE=0 -Djgroups.dns.query=openmfp-keycloak-headless.openmfp-system.svc.cluster.local\n {%- end %}\n -Djgroups.dns.query=openmfp-keycloak-headless.openmfp-system.svc.cluster.local\n","postgresql":{"auth":{"existingSecret":"","secretKeys":{"adminPasswordKey":"password","userPasswordKey":"password"}}}}` | configuration passed to the child 'keyclaok' chart https://github.com/bitnami/charts/tree/main/bitnami/keycloak |
| keycloak.extraEnvVars | string | `"- name: KEYCLOAK_USER\n value: keycloak-admin\n- name: KEYCLOAK_PASSWORD\n valueFrom:\n secretKeyRef:\n name: keycloak-admin\n key: secret\n- name: JAVA_OPTS_APPEND\n value: >-\n {% if eq .Values.arch \"Arm64\" -%}\n -XX:UseSVE=0 -Djgroups.dns.query=openmfp-keycloak-headless.openmfp-system.svc.cluster.local\n {%- end %}\n -Djgroups.dns.query=openmfp-keycloak-headless.openmfp-system.svc.cluster.local\n"` | keycloak environment variables (raw) |
| keycloak | object | `{"extraEnvVars":[{"name":"KEYCLOAK_USER","value":"keycloak-admin"},{"name":"KEYCLOAK_PASSWORD","valueFrom":{"secretKeyRef":{"key":"secret","name":"keycloak-admin"}}},{"name":"JAVA_OPTS_APPEND","value":"-Djgroups.dns.query=openmfp-keycloak-headless.openmfp-system.svc.cluster.local"}],"postgresql":{"auth":{"existingSecret":"","secretKeys":{"adminPasswordKey":"password","userPasswordKey":"password"}}}}` | configuration passed to the child 'keyclaok' chart https://github.com/bitnami/charts/tree/main/bitnami/keycloak |
| keycloak.extraEnvVars | list | `[{"name":"KEYCLOAK_USER","value":"keycloak-admin"},{"name":"KEYCLOAK_PASSWORD","valueFrom":{"secretKeyRef":{"key":"secret","name":"keycloak-admin"}}},{"name":"JAVA_OPTS_APPEND","value":"-Djgroups.dns.query=openmfp-keycloak-headless.openmfp-system.svc.cluster.local"}]` | keycloak environment variables (raw) For Arm64 arch (especially Apple M4), add -XX:UseSVE=0 to JAVA_OPTS_APPEND |
| keycloak.postgresql | object | `{"auth":{"existingSecret":"","secretKeys":{"adminPasswordKey":"password","userPasswordKey":"password"}}}` | configuration for the postgresql sub-chart |
| keycloak.postgresql.auth | object | `{"existingSecret":"","secretKeys":{"adminPasswordKey":"password","userPasswordKey":"password"}}` | authorization configuration |
| keycloak.postgresql.auth.existingSecret | string | `""` | existing secret name |
Expand Down
8 changes: 3 additions & 5 deletions charts/keycloak/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ crossplane:
# https://github.com/bitnami/charts/tree/main/bitnami/keycloak
keycloak:
# -- keycloak environment variables (raw)
extraEnvVars: |
# For Arm64 arch (especially Apple M4), add -XX:UseSVE=0 to JAVA_OPTS_APPEND
extraEnvVars:
- name: KEYCLOAK_USER
value: keycloak-admin
- name: KEYCLOAK_PASSWORD
Expand All @@ -52,10 +53,7 @@ keycloak:
name: keycloak-admin
key: secret
- name: JAVA_OPTS_APPEND
value: >-
{% if eq .Values.arch "Arm64" -%}
-XX:UseSVE=0 -Djgroups.dns.query=openmfp-keycloak-headless.openmfp-system.svc.cluster.local
{%- end %}
value: |-
-Djgroups.dns.query=openmfp-keycloak-headless.openmfp-system.svc.cluster.local

# -- configuration for the postgresql sub-chart
Expand Down
5 changes: 5 additions & 0 deletions local-setup/kustomize/components/openmfp/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ spec:
existingSecret: ""
primary:
resourcesPreset: none
extraEnvVars:
- name: JAVA_OPTS_APPEND
value: |-
-Djgroups.dns.query=openmfp-keycloak-headless.openmfp-system.svc.cluster.local
-XX:UseSVE=0
keycloakConfig:
url: http://openmfp-keycloak.openmfp-system.svc.cluster.local/keycloak
Expand Down
7 changes: 6 additions & 1 deletion local-setup/kustomize/overlays/arm64/patch-keycloak.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@ spec:
values:
keycloak:
keycloak:
arch: "Arm64"
extraEnvVars:
- name: JAVA_OPTS_APPEND
value: |-
-Djgroups.dns.query=openmfp-keycloak-headless.openmfp-system.svc.cluster.local
-XX:UseSVE=0

Loading