fix: recreate existing reconcilers if the realmspec changed

DoodleScheduling · Dec 7, 2023 · 0be5bdb · 0be5bdb
1 parent 007f67e
commit 0be5bdb
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 0 deletions.
diff --git a/internal/controllers/keycloakrealm_controller.go b/internal/controllers/keycloakrealm_controller.go
@@ -258,6 +258,17 @@ func (r *KeycloakRealmReconciler) podReconcile(ctx context.Context, realm infrav
 		if current, ok := secret.Data["realm.json"]; ok {
 			needUpdate = raw != string(current)
 		}
+
+		r.Log.Info("xxx", "pod", pod.Annotations)
+
+		specVersion, ok := pod.Annotations["keycloak-controller/realm-spec-version"]
+		if !needUpdate && podErr == nil && ok {
+			needUpdate = specVersion != fmt.Sprintf("%d", realm.Generation)
+		}
+
+		if !ok {
+			needUpdate = true
+		}
 	}
 
 	if secretErr != nil && !apierrors.IsNotFound(secretErr) {
@@ -381,6 +392,11 @@ func (r *KeycloakRealmReconciler) podReconcile(ctx context.Context, realm infrav
 	template.ResourceVersion = ""
 	template.UID = ""
 
+	if template.Annotations == nil {
+		template.Annotations = make(map[string]string)
+	}
+	template.Annotations["keycloak-controller/realm-spec-version"] = fmt.Sprintf("%d", realm.Generation)
+
 	usernameField := "username"
 	passwordField := "password"
 

diff --git a/internal/controllers/keycloakrealm_controller_test.go b/internal/controllers/keycloakrealm_controller_test.go
@@ -1445,6 +1445,60 @@ var _ = Describe("KeycloakRealm controller", func() {
 			Expect(pod.Spec.Containers[0].Env).Should(Equal(envs))
 			Expect(reconciledInstance.Status.SubResourceCatalog).Should(HaveLen(0))
 		})
+
+		It("recreates the running reconciler pod if the spec changed", func() {
+			By("waiting for the reconciliation")
+			instanceLookupKey := types.NamespacedName{Name: realmName, Namespace: "default"}
+			reconciledInstance := &v1beta1.KeycloakRealm{}
+			Expect(k8sClient.Get(ctx, instanceLookupKey, reconciledInstance)).Should(BeNil())
+
+			beforeChangeStatus := reconciledInstance.Status
+			reconciledInstance.Spec.ReconcilerTemplate.Spec.Containers[1].Image = "new-image:v1"
+			Expect(k8sClient.Update(ctx, reconciledInstance)).Should(Succeed())
+
+			Eventually(func() bool {
+				err := k8sClient.Get(ctx, instanceLookupKey, reconciledInstance)
+				if err != nil {
+					return false
+				}
+
+				return beforeChangeStatus.Reconciler != reconciledInstance.Status.Reconciler
+			}, timeout, interval).Should(BeTrue())
+
+			By("making sure there is a reconciler pod")
+			pod := &corev1.Pod{}
+			Expect(k8sClient.Get(ctx, types.NamespacedName{
+				Name:      reconciledInstance.Status.Reconciler,
+				Namespace: reconciledInstance.Namespace,
+			}, pod)).Should(Succeed())
+
+			Expect(pod.Spec.Containers[1].Image).Should(Equal("new-image:v1"))
+		})
+
+		It("recreates the running reconciler pod if the spec annotation is not present", func() {
+			By("waiting for the reconciliation")
+			instanceLookupKey := types.NamespacedName{Name: realmName, Namespace: "default"}
+			reconciledInstance := &v1beta1.KeycloakRealm{}
+			Expect(k8sClient.Get(ctx, instanceLookupKey, reconciledInstance)).Should(BeNil())
+			beforeChangeStatus := reconciledInstance.Status
+
+			pod := &corev1.Pod{}
+			Expect(k8sClient.Get(ctx, types.NamespacedName{
+				Name:      reconciledInstance.Status.Reconciler,
+				Namespace: reconciledInstance.Namespace,
+			}, pod)).Should(Succeed())
+			pod.Annotations = nil
+			Expect(k8sClient.Update(ctx, pod)).Should(Succeed())
+
+			Eventually(func() bool {
+				err := k8sClient.Get(ctx, instanceLookupKey, reconciledInstance)
+				if err != nil {
+					return false
+				}
+
+				return beforeChangeStatus.Reconciler != reconciledInstance.Status.Reconciler
+			}, timeout, interval).Should(BeTrue())
+		})
 	})
 
 	When("a realm without auth credentials is reconciled", func() {