From 0d4a0ebad0f54693bfb92211b88500c638c53316 Mon Sep 17 00:00:00 2001 From: Koren Peretz <62677694+KorenP1@users.noreply.github.com> Date: Wed, 23 Apr 2025 10:14:21 +0300 Subject: [PATCH] [bitnami/keycloak] Making keycloak config cli Availability Check configurable (#33130) --- bitnami/keycloak/CHANGELOG.md | 4 ++-- bitnami/keycloak/Chart.yaml | 2 +- bitnami/keycloak/README.md | 2 ++ bitnami/keycloak/templates/keycloak-config-cli-job.yaml | 6 +++++- bitnami/keycloak/values.yaml | 8 ++++++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/bitnami/keycloak/CHANGELOG.md b/bitnami/keycloak/CHANGELOG.md index 76e064668c..5381d33560 100644 --- a/bitnami/keycloak/CHANGELOG.md +++ b/bitnami/keycloak/CHANGELOG.md @@ -1,8 +1,8 @@ # Changelog -## 24.5.8 (2025-04-23) +## 24.6.0 (2025-04-23) -* [bitnami/keycloak] Fix Keycloak external DB secret keys ([#33117](https://github.com/bitnami/charts/pull/33117)) +* [bitnami/keycloak] Making keycloak config cli Availability Check configurable ([#33130](https://github.com/bitnami/charts/pull/33130)) ## 24.5.7 (2025-04-22) diff --git a/bitnami/keycloak/Chart.yaml b/bitnami/keycloak/Chart.yaml index 8c27990a08..ed067a8d96 100644 --- a/bitnami/keycloak/Chart.yaml +++ b/bitnami/keycloak/Chart.yaml @@ -34,4 +34,4 @@ maintainers: name: keycloak sources: - https://github.com/bitnami/charts/tree/main/bitnami/keycloak -version: 24.5.8 +version: 24.6.0 \ No newline at end of file diff --git a/bitnami/keycloak/README.md b/bitnami/keycloak/README.md index 847b256925..da2182150c 100644 --- a/bitnami/keycloak/README.md +++ b/bitnami/keycloak/README.md @@ -647,6 +647,8 @@ As an alternative, you can use of the preset configurations for pod affinity, po | `keycloakConfigCli.podAnnotations` | Annotations for job pod | `{}` | | `keycloakConfigCli.nodeSelector` | Node labels for pod assignment | `{}` | | `keycloakConfigCli.podTolerations` | Tolerations for job pod assignment | `[]` | +| `keycloakConfigCli.availabilityCheck.enabled` | Whether to wait until Keycloak is available | `true` | +| `keycloakConfigCli.availabilityCheck.timeout` | Timeout for the availability check (Default is 120s) | `""` | | `keycloakConfigCli.extraEnvVars` | Additional environment variables to set | `[]` | | `keycloakConfigCli.extraEnvVarsCM` | ConfigMap with extra environment variables | `""` | | `keycloakConfigCli.extraEnvVarsSecret` | Secret with extra environment variables | `""` | diff --git a/bitnami/keycloak/templates/keycloak-config-cli-job.yaml b/bitnami/keycloak/templates/keycloak-config-cli-job.yaml index 3a7885405d..6939d3dfdb 100644 --- a/bitnami/keycloak/templates/keycloak-config-cli-job.yaml +++ b/bitnami/keycloak/templates/keycloak-config-cli-job.yaml @@ -86,7 +86,11 @@ spec: value: /config/* {{- end }} - name: KEYCLOAK_AVAILABILITYCHECK_ENABLED - value: "true" + value: {{ .Values.keycloakConfigCli.availabilityCheck.enabled | quote }} + {{- if and .Values.keycloakConfigCli.availabilityCheck.enabled .Values.keycloakConfigCli.availabilityCheck.timeout }} + - name: KEYCLOAK_AVAILABILITYCHECK_TIMEOUT + value: {{ .Values.keycloakConfigCli.availabilityCheck.timeout }} + {{- end }} {{- if .Values.keycloakConfigCli.extraEnvVars }} {{- include "common.tplvalues.render" (dict "value" .Values.keycloakConfigCli.extraEnvVars "context" $) | nindent 12 }} {{- end }} diff --git a/bitnami/keycloak/values.yaml b/bitnami/keycloak/values.yaml index 838b7bcd81..09a692ffde 100644 --- a/bitnami/keycloak/values.yaml +++ b/bitnami/keycloak/values.yaml @@ -1247,6 +1247,14 @@ keycloakConfigCli: ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## podTolerations: [] + ## keycloak-config-cli availability-check configuration + ## ref: https://github.com/adorsys/keycloak-config-cli#Configuration + ## @param keycloakConfigCli.availabilityCheck.enabled Whether to wait until Keycloak is available + ## @param keycloakConfigCli.availabilityCheck.timeout Timeout for the availability check (Default is 120s) + ## + availabilityCheck: + enabled: true + timeout: "" ## @param keycloakConfigCli.extraEnvVars Additional environment variables to set ## Example: ## extraEnvVars: