Merge pull request #24403 from theycallmeducks/upgrade-keycloak-23.0.1

Upgrade to Keycloak 23
jhipster · Dec 3, 2023 · 53e574c · 53e574c
2 parents 172f6c5 + 5c5484e
commit 53e574c
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 12 deletions.
diff --git a/generators/docker-compose/__snapshots__/docker-compose.spec.mts.snap b/generators/docker-compose/__snapshots__/docker-compose.spec.mts.snap
@@ -1171,7 +1171,7 @@ jhipster:
       - CONSUL_PORT=8500
   keycloak:
     image: keycloak-placeholder
-    command: ['start-dev --import-realm']
+    command: 'start-dev --import-realm'
     volumes:
       - ./realm-config:/opt/keycloak/data/import
       - ./realm-config/keycloak-health-check.sh:/opt/keycloak/health-check.sh

diff --git a/generators/docker-compose/templates/docker-compose.yml.ejs b/generators/docker-compose/templates/docker-compose.yml.ejs
@@ -110,7 +110,7 @@ services:
 <%_ if (usesOauth2) { _%>
   keycloak:
     image: <%- dockerContainers.keycloak %>
-    command: ['start-dev --import-realm']
+    command: 'start-dev --import-realm'
     volumes:
       - ./realm-config:/opt/keycloak/data/import
       - ./realm-config/keycloak-health-check.sh:/opt/keycloak/health-check.sh

diff --git a/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs b/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs
@@ -475,6 +475,7 @@
     "totpAppFreeOTPName",
     "totpAppMicrosoftAuthenticatorName"
   ],
+  "localizationTexts": {},
   "webAuthnPolicyRpEntityName": "keycloak",
   "webAuthnPolicySignatureAlgorithms": [
     "ES256"
@@ -487,6 +488,7 @@
   "webAuthnPolicyCreateTimeout": 0,
   "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyAcceptableAaguids": [],
+  "webAuthnPolicyExtraOrigins": [],
   "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
   "webAuthnPolicyPasswordlessSignatureAlgorithms": [
     "ES256"
@@ -499,6 +501,7 @@
   "webAuthnPolicyPasswordlessCreateTimeout": 0,
   "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+  "webAuthnPolicyPasswordlessExtraOrigins": [],
   "users": [
     {
       "id": "f742ba6f-1d8a-4dec-bf15-e02dab508283",
@@ -2578,7 +2581,7 @@
     "frontendUrl": "",
     "acr.loa.map": "[]"
   },
-  "keycloakVersion": "22.0.1",
+  "keycloakVersion": "23.0.1",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []

diff --git a/generators/docker/templates/docker/keycloak.yml.ejs b/generators/docker/templates/docker/keycloak.yml.ejs
@@ -21,7 +21,7 @@ name: <%= baseName.toLowerCase() %>
 services:
   keycloak:
     image: <%- dockerContainers.keycloak %>
-    command: ['start-dev --import-realm']
+    command: 'start-dev --import-realm'
     volumes:
       - ./realm-config:/opt/keycloak/data/import
       - ./realm-config/keycloak-health-check.sh:/opt/keycloak/health-check.sh

diff --git a/generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs b/generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs
@@ -475,6 +475,7 @@
     "totpAppFreeOTPName",
     "totpAppMicrosoftAuthenticatorName"
   ],
+  "localizationTexts": {},
   "webAuthnPolicyRpEntityName": "keycloak",
   "webAuthnPolicySignatureAlgorithms": [
     "ES256"
@@ -487,6 +488,7 @@
   "webAuthnPolicyCreateTimeout": 0,
   "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyAcceptableAaguids": [],
+  "webAuthnPolicyExtraOrigins": [],
   "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
   "webAuthnPolicyPasswordlessSignatureAlgorithms": [
     "ES256"
@@ -499,6 +501,7 @@
   "webAuthnPolicyPasswordlessCreateTimeout": 0,
   "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
   "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+  "webAuthnPolicyPasswordlessExtraOrigins": [],
   "users": [
     {
       "id": "f742ba6f-1d8a-4dec-bf15-e02dab508283",
@@ -2576,7 +2579,7 @@
     "frontendUrl": "",
     "acr.loa.map": "[]"
   },
-  "keycloakVersion": "22.0.1",
+  "keycloakVersion": "23.0.1",
   "userManagedAccessAllowed": false,
   "clientProfiles": {
     "profiles": []

diff --git a/generators/kubernetes/__snapshots__/kubernetes.spec.mts.snap b/generators/kubernetes/__snapshots__/kubernetes.spec.mts.snap
@@ -3041,6 +3041,7 @@ data:
         "FreeOTP",
         "Google Authenticator"
       ],
+      "localizationTexts": {},
       "webAuthnPolicyRpEntityName": "keycloak",
       "webAuthnPolicySignatureAlgorithms": [
         "ES256"
@@ -3053,6 +3054,7 @@ data:
       "webAuthnPolicyCreateTimeout": 0,
       "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
       "webAuthnPolicyAcceptableAaguids": [],
+      "webAuthnPolicyExtraOrigins": [],
       "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
       "webAuthnPolicyPasswordlessSignatureAlgorithms": [
         "ES256"
@@ -3065,6 +3067,7 @@ data:
       "webAuthnPolicyPasswordlessCreateTimeout": 0,
       "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
       "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+      "webAuthnPolicyPasswordlessExtraOrigins": [],
       "scopeMappings": [
         {
           "clientScope": "offline_access",
@@ -5014,7 +5017,7 @@ data:
         "cibaInterval": "5",
         "frontendUrl": ""
       },
-      "keycloakVersion": "22.0.1",
+      "keycloakVersion": "23.0.1",
       "userManagedAccessAllowed": false,
       "clientProfiles": {
         "profiles": []
@@ -5222,7 +5225,7 @@ spec:
       containers:
         - name: keycloak
           image: keycloak-placeholder
-          args: ["start --import-realm"]
+          args: "start --import-realm"
           env:
             - name: KEYCLOAK_ADMIN
               value: "admin"
@@ -6485,6 +6488,7 @@ data:
         "FreeOTP",
         "Google Authenticator"
       ],
+      "localizationTexts": {},
       "webAuthnPolicyRpEntityName": "keycloak",
       "webAuthnPolicySignatureAlgorithms": [
         "ES256"
@@ -6497,6 +6501,7 @@ data:
       "webAuthnPolicyCreateTimeout": 0,
       "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
       "webAuthnPolicyAcceptableAaguids": [],
+      "webAuthnPolicyExtraOrigins": [],
       "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
       "webAuthnPolicyPasswordlessSignatureAlgorithms": [
         "ES256"
@@ -6509,6 +6514,7 @@ data:
       "webAuthnPolicyPasswordlessCreateTimeout": 0,
       "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
       "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+      "webAuthnPolicyPasswordlessExtraOrigins": [],
       "scopeMappings": [
         {
           "clientScope": "offline_access",
@@ -8458,7 +8464,7 @@ data:
         "cibaInterval": "5",
         "frontendUrl": ""
       },
-      "keycloakVersion": "22.0.1",
+      "keycloakVersion": "23.0.1",
       "userManagedAccessAllowed": false,
       "clientProfiles": {
         "profiles": []
@@ -8666,7 +8672,7 @@ spec:
       containers:
         - name: keycloak
           image: keycloak-placeholder
-          args: ["start --import-realm"]
+          args: "start --import-realm"
           env:
             - name: KEYCLOAK_ADMIN
               value: "admin"

diff --git a/generators/kubernetes/templates/keycloak/keycloak-configmap.yml.ejs b/generators/kubernetes/templates/keycloak/keycloak-configmap.yml.ejs
@@ -469,6 +469,7 @@ data:
         "FreeOTP",
         "Google Authenticator"
       ],
+      "localizationTexts": {},
       "webAuthnPolicyRpEntityName": "keycloak",
       "webAuthnPolicySignatureAlgorithms": [
         "ES256"
@@ -481,6 +482,7 @@ data:
       "webAuthnPolicyCreateTimeout": 0,
       "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
       "webAuthnPolicyAcceptableAaguids": [],
+      "webAuthnPolicyExtraOrigins": [],
       "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
       "webAuthnPolicyPasswordlessSignatureAlgorithms": [
         "ES256"
@@ -493,6 +495,7 @@ data:
       "webAuthnPolicyPasswordlessCreateTimeout": 0,
       "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
       "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+      "webAuthnPolicyPasswordlessExtraOrigins": [],
       "scopeMappings": [
         {
           "clientScope": "offline_access",
@@ -2499,7 +2502,7 @@ data:
         "cibaInterval": "5",
         "frontendUrl": ""
       },
-      "keycloakVersion": "22.0.1",
+      "keycloakVersion": "23.0.1",
       "userManagedAccessAllowed": false,
       "clientProfiles": {
         "profiles": []

diff --git a/generators/kubernetes/templates/keycloak/keycloak.yml.ejs b/generators/kubernetes/templates/keycloak/keycloak.yml.ejs
@@ -38,7 +38,7 @@ spec:
       containers:
       - name: keycloak
         image: <%- dockerContainers.keycloak %>
-        args: ["start --import-realm"]
+        args: "start --import-realm"
         env:
         - name: KEYCLOAK_ADMIN
           value: "admin"

diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile
@@ -13,7 +13,7 @@ LABEL ALIAS=consul-config-loader
 FROM postgres:16.1
 LABEL ALIAS=postgresql
 
-FROM quay.io/keycloak/keycloak:22.0.5
+FROM quay.io/keycloak/keycloak:23.0.1
 LABEL ALIAS=keycloak
 
 FROM mysql:8.2.0