Merge pull request #128 from projectsyn/commodore-renovate/major-keyc…

…loak Update Helm release keycloak to v18
projectsyn · May 24, 2022 · 92ae30a · 92ae30a
2 parents 6ea6d91 + 6b39ff8
commit 92ae30a
Show file tree

Hide file tree

Showing 29 changed files with 63 additions and 58 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -36,7 +36,7 @@ parameters:
     namespace: syn-${_instance}
     name: keycloak
     charts:
-      keycloak: "17.0.3"
+      keycloak: "18.1.1"
     # FQDN should be overwritten on the cluster level
     fqdn: keycloak.example.com
     # Namespace labels

diff --git a/docs/modules/ROOT/pages/how-tos/upgrade-7.x-to-8.x.adoc b/docs/modules/ROOT/pages/how-tos/upgrade-7.x-to-8.x.adoc
@@ -0,0 +1,4 @@
+= Upgrade from v7 to v8
+
+There are no special steps required to upgrade from v7 to v8.
+However, note that this version upgrades Keycloak from v16 to v17, so once Keycloak executed the DB migrations, a downgrade won't be possible.
diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
@@ -1,6 +1,6 @@
 = keycloak: A Commodore component to manage Keycloak
 
-This component provides a set of tuned defaults and a simplified interface to deploy the https://artifacthub.io/packages/helm/codecentric/keycloak/17.0.3[Keycloak helm chart] on a Syn-enabled cluster.
+This component provides a set of tuned defaults and a simplified interface to deploy the https://artifacthub.io/packages/helm/codecentric/keycloak/18.1.1[Keycloak helm chart] on a Syn-enabled cluster.
 
 The component defaults to provisioning a Bitnami Postgres database via the
 Keycloak helm chart, but this behavior can be overridden using the

diff --git a/docs/modules/ROOT/pages/references/parameters.adoc b/docs/modules/ROOT/pages/references/parameters.adoc
@@ -44,7 +44,7 @@ Usually there is just one deployment and therefore no change is required.
 
 [horizontal]
 type:: helm chart version
-default:: `17.0.3`
+default:: `18.1.1`
 
 A specific chart version. See the https://kapitan.dev/external_dependencies/#helm-type[kapitan documentation] for more information.
 
@@ -724,6 +724,6 @@ type:: dict
 default:: see `defaults.yml`
 
 All helm_values are passed to the helm chart.
-This allows to configure all https://github.com/codecentric/helm-charts/tree/keycloak-17.0.3/charts/keycloak#configuration[keycloak helm chart values].
+This allows to configure all https://github.com/codecentric/helm-charts/tree/keycloak-18.1.1/charts/keycloak#configuration[keycloak helm chart values].
 
 Note that it's your own liability to make sure you don't break stuff by overwriting values here!
diff --git a/docs/modules/ROOT/partials/nav.adoc b/docs/modules/ROOT/partials/nav.adoc
@@ -19,6 +19,7 @@
 * xref:how-tos/upgrade-4.x-to-5.x.adoc[Upgrade 4.x to 5.x]
 * xref:how-tos/upgrade-5.x-to-6.x.adoc[Upgrade 5.x to 6.x]
 * xref:how-tos/upgrade-6.x-to-7.x.adoc[Upgrade 6.x to 7.x]
+* xref:how-tos/upgrade-7.x-to-8.x.adoc[Upgrade 7.x to 8.x]
 * xref:how-tos/openshift-4.adoc[Install on OpenShift 4]
 * xref:how-tos/pin-versions.adoc[Pin versions]
 

diff --git a/...n/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/configmap-startup.yaml b/...n/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/configmap-startup.yaml
@@ -31,6 +31,6 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-startup
diff --git a/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/ingress.yaml b/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/ingress.yaml
@@ -10,8 +10,8 @@ metadata:
     app.kubernetes.io/instance: builtin
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
 spec:
   rules:

diff --git a/...lden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/prometheusrule.yaml b/...lden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/prometheusrule.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: builtin
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
 spec:
   groups:

diff --git a/...en/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/service-headless.yaml b/...en/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/service-headless.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-headless
 spec:
   clusterIP: None

diff --git a/...golden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/service-http.yaml b/...golden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/service-http.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: builtin
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-http
 spec:
   ports:

diff --git a/...lden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/serviceaccount.yaml b/...lden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/serviceaccount.yaml
@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/instance: builtin
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
diff --git a/...lden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/servicemonitor.yaml b/...lden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/servicemonitor.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: builtin
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-wildfly
 spec:
   endpoints:

diff --git a/.../golden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/statefulset.yaml b/.../golden/builtin/builtin/builtin/01_keycloak_helmchart/keycloak/templates/statefulset.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: builtin
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
 spec:
   podManagementPolicy: Parallel
@@ -20,7 +20,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-startup: 240f7e88b3f85cfd89f1a68abd09c347682fbb0d905ee60babf45f20f3ad7bc1
+        checksum/config-startup: 75d6bfe5f02312ac63fc589eae454f3a93799b408922648b26a933a33e87aa27
         checksum/secrets: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
       labels:
         app.kubernetes.io/instance: keycloak
@@ -94,7 +94,7 @@ spec:
             name: keycloak-admin-user
         - secretRef:
             name: keycloak-postgresql
-        image: quay.io/keycloak/keycloak:16.1.1
+        image: quay.io/keycloak/keycloak:17.0.1-legacy
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/...xternal/external/external/01_keycloak_helmchart/keycloak/templates/configmap-startup.yaml b/...xternal/external/external/01_keycloak_helmchart/keycloak/templates/configmap-startup.yaml
@@ -31,6 +31,6 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-startup
diff --git a/...s/golden/external/external/external/01_keycloak_helmchart/keycloak/templates/ingress.yaml b/...s/golden/external/external/external/01_keycloak_helmchart/keycloak/templates/ingress.yaml
@@ -9,8 +9,8 @@ metadata:
     app.kubernetes.io/instance: external
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
 spec:
   rules:

diff --git a/...n/external/external/external/01_keycloak_helmchart/keycloak/templates/prometheusrule.yaml b/...n/external/external/external/01_keycloak_helmchart/keycloak/templates/prometheusrule.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: external
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
 spec:
   groups:

diff --git a/...external/external/external/01_keycloak_helmchart/keycloak/templates/service-headless.yaml b/...external/external/external/01_keycloak_helmchart/keycloak/templates/service-headless.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-headless
 spec:
   clusterIP: None

diff --git a/...den/external/external/external/01_keycloak_helmchart/keycloak/templates/service-http.yaml b/...den/external/external/external/01_keycloak_helmchart/keycloak/templates/service-http.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: external
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-http
 spec:
   ports:

diff --git a/...n/external/external/external/01_keycloak_helmchart/keycloak/templates/serviceaccount.yaml b/...n/external/external/external/01_keycloak_helmchart/keycloak/templates/serviceaccount.yaml
@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/instance: external
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
diff --git a/...n/external/external/external/01_keycloak_helmchart/keycloak/templates/servicemonitor.yaml b/...n/external/external/external/01_keycloak_helmchart/keycloak/templates/servicemonitor.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: external
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-wildfly
 spec:
   endpoints:

diff --git a/...lden/external/external/external/01_keycloak_helmchart/keycloak/templates/statefulset.yaml b/...lden/external/external/external/01_keycloak_helmchart/keycloak/templates/statefulset.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: external
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
 spec:
   podManagementPolicy: Parallel
@@ -20,7 +20,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-startup: 240f7e88b3f85cfd89f1a68abd09c347682fbb0d905ee60babf45f20f3ad7bc1
+        checksum/config-startup: 75d6bfe5f02312ac63fc589eae454f3a93799b408922648b26a933a33e87aa27
         checksum/secrets: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
       labels:
         app.kubernetes.io/instance: keycloak
@@ -76,7 +76,7 @@ spec:
             name: keycloak-admin-user
         - secretRef:
             name: keycloak-postgresql
-        image: quay.io/keycloak/keycloak:16.1.1
+        image: quay.io/keycloak/keycloak:17.0.1-legacy
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/...shift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/configmap-startup.yaml b/...shift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/configmap-startup.yaml
@@ -31,6 +31,6 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-startup
diff --git a/...olden/openshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/ingress.yaml b/...olden/openshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/ingress.yaml
@@ -10,8 +10,8 @@ metadata:
     app.kubernetes.io/instance: openshift
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
 spec:
   rules:

diff --git a/...penshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/prometheusrule.yaml b/...penshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/prometheusrule.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openshift
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
 spec:
   groups:

diff --git a/...nshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/service-headless.yaml b/...nshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/service-headless.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-headless
 spec:
   clusterIP: None

diff --git a/.../openshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/service-http.yaml b/.../openshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/service-http.yaml
@@ -8,8 +8,8 @@ metadata:
     app.kubernetes.io/instance: openshift
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-http
 spec:
   ports:

diff --git a/...penshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/serviceaccount.yaml b/...penshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/serviceaccount.yaml
@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/instance: openshift
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
diff --git a/...penshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/servicemonitor.yaml b/...penshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/servicemonitor.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openshift
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak-wildfly
 spec:
   endpoints:

diff --git a/...n/openshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/statefulset.yaml b/...n/openshift/openshift/openshift/01_keycloak_helmchart/keycloak/templates/statefulset.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/instance: openshift
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    app.kubernetes.io/version: 16.1.1
-    helm.sh/chart: keycloak-17.0.3
+    app.kubernetes.io/version: 17.0.1-legacy
+    helm.sh/chart: keycloak-18.1.1
   name: keycloak
 spec:
   podManagementPolicy: Parallel
@@ -20,7 +20,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-startup: 240f7e88b3f85cfd89f1a68abd09c347682fbb0d905ee60babf45f20f3ad7bc1
+        checksum/config-startup: 75d6bfe5f02312ac63fc589eae454f3a93799b408922648b26a933a33e87aa27
         checksum/secrets: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
       labels:
         app.kubernetes.io/instance: keycloak
@@ -76,7 +76,7 @@ spec:
             name: keycloak-admin-user
         - secretRef:
             name: keycloak-postgresql
-        image: quay.io/keycloak/keycloak:16.1.1
+        image: quay.io/keycloak/keycloak:17.0.1-legacy
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet: