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

Upgraded to version 25.0.0 of Keycloak #770

Merged
merged 5 commits into from
Jun 24, 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: 1 addition & 1 deletion charts/keycloakx/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: keycloakx
version: 2.3.0
appVersion: 22.0.4
appVersion: 25.0.0
description: Keycloak.X - Open Source Identity and Access Management for Modern Applications and Services
keywords:
- sso
Expand Down
2 changes: 0 additions & 2 deletions charts/keycloakx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ $ cat << EOF > values.yaml
command:
- "/opt/keycloak/bin/kc.sh"
- "start"
- "--http-enabled=true"
- "--http-port=8080"
- "--hostname-strict=false"
- "--hostname-strict-https=false"
extraEnv: |
- name: KEYCLOAK_ADMIN
value: admin
Expand Down
1 change: 0 additions & 1 deletion charts/keycloakx/ci/h2-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ command:
- "--verbose"
- "start"
- --hostname-strict=false
- --hostname-strict-https=false

extraEnv: |
- name: KEYCLOAK_ADMIN
Expand Down
2 changes: 1 addition & 1 deletion charts/keycloakx/examples/postgresql-kubeping/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/keycloak/keycloak:22.0.4
FROM quay.io/keycloak/keycloak:25.0.0

ENV JGROUPS_KUBERNETES_VERSION 1.0.16.Final

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ command:
- "/opt/keycloak/bin/kc.sh"
- "--verbose"
- "start"
- "--http-enabled=true"
- "--http-port=8080"
- "--hostname-strict=false"
- "--hostname-strict-https=false"
- "--spi-events-listener-jboss-logging-success-level=info"
- "--spi-events-listener-jboss-logging-error-level=warn"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ command:
- "/opt/keycloak/bin/kc.sh"
- "--verbose"
- "start"
- "--http-enabled=true"
- "--http-port=8080"
- "--hostname-strict=false"
- "--hostname-strict-https=false"
- "--spi-events-listener-jboss-logging-success-level=info"
- "--spi-events-listener-jboss-logging-error-level=warn"

Expand Down
9 changes: 8 additions & 1 deletion charts/keycloakx/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,13 @@ spec:
value: "kubernetes"
{{- end }}
{{- if .Values.proxy.enabled }}
- name: KC_PROXY
- name: KC_PROXY_HEADERS
value: {{ .Values.proxy.mode }}
{{- end }}
{{- if .Values.proxy.http.enabled }}
- name: KC_HTTP_ENABLED
value: "true"
{{- end }}
{{- if .Values.database.vendor }}
- name: KC_DB
value: {{ .Values.database.vendor }}
Expand Down Expand Up @@ -145,6 +149,9 @@ spec:
- name: http
containerPort: 8080
protocol: TCP
- name: '{{ .Values.http.internalPort }}'
containerPort: 9000
protocol: TCP
{{- if .Values.service.httpsPort }}
- name: https
containerPort: 8443
Expand Down
19 changes: 11 additions & 8 deletions charts/keycloakx/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ image:
# The Keycloak image repository
repository: quay.io/keycloak/keycloak
# Overrides the Keycloak image tag whose default is the chart appVersion
tag: "22.0.4"
tag: "25.0.0"
# Overrides the Keycloak image tag with a specific digest
digest: ""
# The Keycloak image pull policy
Expand Down Expand Up @@ -166,23 +166,23 @@ podAnnotations: {}
livenessProbe: |
httpGet:
path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/health/live'
port: http
port: '{{ .Values.http.internalPort }}'
initialDelaySeconds: 0
timeoutSeconds: 5

# Readiness probe configuration
readinessProbe: |
httpGet:
path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/health/ready'
port: http
port: '{{ .Values.http.internalPort }}'
initialDelaySeconds: 10
timeoutSeconds: 1

# Startup probe configuration
startupProbe: |
httpGet:
path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/health'
port: http
port: '{{ .Values.http.internalPort }}'
initialDelaySeconds: 15
timeoutSeconds: 1
failureThreshold: 60
Expand Down Expand Up @@ -406,7 +406,9 @@ cache:

proxy:
enabled: true
mode: edge
mode: forwarded
http:
enabled: true

metrics:
enabled: true
Expand All @@ -417,6 +419,7 @@ health:
http:
# For backwards compatibility reasons we set this to the value used by previous Keycloak versions.
relativePath: "/auth"
internalPort: http-internal

serviceMonitor:
# If `true`, a ServiceMonitor resource for the prometheus-operator is created
Expand All @@ -436,7 +439,7 @@ serviceMonitor:
# The path at which metrics are served
path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/metrics'
# The Service port at which metrics are served
port: http
port: '{{ .Values.http.internalPort }}'

extraServiceMonitor:
# If `true`, a ServiceMonitor resource for the prometheus-operator is created
Expand All @@ -454,9 +457,9 @@ extraServiceMonitor:
# Timeout for scraping
scrapeTimeout: 10s
# The path at which metrics are served
path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/realms/master/metrics'
path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/metrics'
# The Service port at which metrics are served
port: http
port: '{{ .Values.http.internalPort }}'

prometheusRule:
# If `true`, a PrometheusRule resource for the prometheus-operator is created
Expand Down
Loading