feat: ⬆️ upgrade keycloak to v26.0.5

cloud-pi-native · Dec 10, 2024 · 2c1401e · 2c1401e
1 parent f1d9267
commit 2c1401e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml
@@ -267,10 +267,10 @@
     display_name: Dso Realm
     loginWithEmailAllowed: true
     registration_email_as_username: false
-    loginTheme: dsfr
-    accountTheme: dsfr
-    adminTheme: dsfr
-    emailTheme: dsfr
+    loginTheme: DSFR
+    accountTheme: DSFR
+    adminTheme: DSFR
+    emailTheme: DSFR
     internationalizationEnabled: true
     supportedLocales:
       - en

diff --git a/roles/keycloak/templates/values/00-main.j2 b/roles/keycloak/templates/values/00-main.j2
@@ -11,7 +11,7 @@ tls:
   enabled: false
 
 production: true
-proxy: "edge"
+proxyHeaders: xforwarded
 httpRelativePath: "/"
 configuration: ""
 existingConfigmap: ""
@@ -303,19 +303,13 @@ logging:
   output: "default"
   level: "INFO"
 
-extraVolumes:
-  - name: extensions
-    emptyDir: {}
-extraVolumeMounts:
-  - mountPath: /opt/bitnami/keycloak/providers
-    name: extensions
 extraEnvVars:
   - name: DSFR_THEME_HOME_URL
     value: https://{{ console_domain }}
   - name: DSFR_THEME_SERVICE_TITLE
-    value: Cloud π Native
+    value: Cloud Pi Native
   - name: DSFR_THEME_BRAND_TOP
-    value: "Ministère<br/>de l'intérieur<br/>et des outre-mer"
+    value: "Ministere<br/>de l'interieur"
   - name: DSFR_THEME_CONTACT_EMAIL
     value: [email protected]
 initContainers:
@@ -330,10 +324,10 @@ initContainers:
       - sh
     args:
       - -c
-      - curl -k -L -f -S -o /extensions/keycloak-theme-dsfr.jar {{ dsc.keycloak.pluginDownloadUrl }}/retrocompat-keycloak-theme.jar
+      - curl -k -L -f -S -o /emptydir/app-providers-dir/keycloak-theme-dsfr.jar {{ dsc.keycloak.pluginDownloadUrl }}
     volumeMounts:
-      - name: extensions
-        mountPath: /extensions
+      - name: empty-dir
+        mountPath: /emptydir
 {% if dsc.proxy.enabled %}
     env:
       - name: HTTP_PROXY

diff --git a/roles/socle-config/files/config.yaml b/roles/socle-config/files/config.yaml
@@ -87,7 +87,7 @@ spec:
     subDomain: keycloak
     helmRepoUrl: https://charts.bitnami.com/bitnami
     postgresPvcSize: 1Gi
-    pluginDownloadUrl: https://github.com/codegouvfr/keycloak-theme-dsfr/releases/download/v1.0.3
+    pluginDownloadUrl: https://github.com/codegouvfr/keycloak-theme-dsfr/releases/download/v2.1.0/keycloak-theme-for-kc-26-and-above.jar
     cnpg:
       mode: primary
       exposed: false

diff --git a/roles/socle-config/files/releases.yaml b/roles/socle-config/files/releases.yaml
@@ -38,7 +38,7 @@ spec:
     chartVersion: 1.14.1
   keycloak:
     # https://artifacthub.io/packages/helm/bitnami/keycloak
-    chartVersion: 19.3.4
+    chartVersion: 24.2.3
   kyverno:
     # https://artifacthub.io/packages/helm/kyverno/kyverno
     chartVersion: 3.1.4

diff --git a/versions.md b/versions.md
@@ -1,5 +1,5 @@
 | Outil                     | Version          | Chart version | Source                                                                                                               |
-| ------------------------- | ---------------- | ------------- |----------------------------------------------------------------------------------------------------------------------|
+| ------------------------- | ---------------- | ------------- | -------------------------------------------------------------------------------------------------------------------- |
 | argocd                    | 2.11.7           | 7.3.11        | [argocd](https://artifacthub.io/packages/helm/argo/argo-cd)                                                          |
 | certmanager               | 1.14.3           | 1.14.3        | [certmanager](https://github.com/cert-manager/cert-manager/releases)                                                 |
 | cloudnativepg             | 1.22.1           | 0.20.1        | [cloudnativepg](https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg)                                  |
@@ -11,7 +11,7 @@
 | grafana                   | 10.4.3           | N/A           | [grafana](https://github.com/grafana/grafana/tags)                                                                   |
 | grafanaOperator           | 5.10.0           | 5.4.2         | [grafanaOperator](https://github.com/grafana/grafana-operator/tags)                                                  |
 | harbor                    | 2.10.1           | 1.14.1        | [harbor](https://artifacthub.io/packages/helm/harbor/harbor)                                                         |
-| keycloak                  | 23.0.7           | 19.3.4        | [keycloak](https://artifacthub.io/packages/helm/bitnami/keycloak)                                                    |
+| keycloak                  | 26.0.5           | 24.2.3        | [keycloak](https://artifacthub.io/packages/helm/bitnami/keycloak)                                                    |
 | kyverno                   | v1.11.4          | 3.1.4         | [kyverno](https://artifacthub.io/packages/helm/kyverno/kyverno)                                                      |
 | nexus                     | 3.68.1           | N/A           | [nexus](https://hub.docker.com/r/sonatype/nexus3/)                                                                   |
 | sonarqube                 | 10.6.1-community | 10.6.1+3163   | [sonarqube](https://artifacthub.io/packages/helm/sonarqube/sonarqube)                                                |