Merge commit 'fe564d72279f4ab061b961dd528623f0ed272667' as 'cluster-config'

cluster-config/components/sso/overlays/default/keycloak-migration-job.yaml

@@ -0,0 +1,45 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: keycloak-migration
+  namespace: sso
+  annotations:
+    argocd.argoproj.io/hook: PostSync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
+spec:
+  template:
+    spec:
+      containers:
+      - image: klg71/keycloakmigration
+        env:
+        - name: BASEURL
+          value: "https://sso-sso.apps.home.ocplab.com/auth"
+        - name: CORRECT_HASHES
+          value: "true"
+        - name: ADMIN_USERNAME
+          valueFrom:
+            secretKeyRef:
+              name: sso-admin-credential
+              key: ADMIN_USERNAME
+        - name: ADMIN_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: sso-admin-credential
+              key: ADMIN_PASSWORD
+        imagePullPolicy: Always
+        name: keycloak-migration
+        volumeMounts:
+        - name: keycloak-migration
+          mountPath: "/migration"
+          readOnly: true
+        - name: logs
+          mountPath: "/logs"
+      dnsPolicy: ClusterFirst
+      restartPolicy: OnFailure
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - name: keycloak-migration
+        secret:
+          secretName: keycloak-migration
+      - name: logs
+        emptyDir: {}

cluster-config/components/sso/overlays/default/kustomization.yaml

@@ -0,0 +1,18 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: sso
+
+bases:
+- https://github.com/redhat-cop/gitops-catalog/rhsso/rhsso-standalone/overlays/default
+
+resources:
+- keycloak-migration-job.yaml
+
+patchesJson6902:
+  - path: patch-sso-statefulset.yaml
+    target:
+      group: ""
+      kind: StatefulSet
+      name: sso
+      version: v1

cluster-config/components/sso/overlays/default/patch-sso-statefulset.yaml

@@ -0,0 +1,8 @@
+- op: add
+  path: /spec/template/spec/containers/0/env/-
+  value:
+    name: JAVA_OPTS_APPEND
+    value: "-Dkeycloak.profile.feature.admin_fine_grained_authz=enabled -Dkeycloak.profile.feature.token_exchange=enabled"
+- op: replace
+  path: /spec/template/spec/containers/0/image
+  value: registry.redhat.io/rh-sso-7/sso75-openshift-rhel8:latest