Merge pull request #19 from akalenyu/labels-not-upgraded-workloads

Address labels not updating after upgrade
kubevirt · Oct 28, 2021 · 1987210 · 1987210
2 parents 64585ea + 7319c68
commit 1987210
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/pkg/sdk/reconciler/reconciler.go b/pkg/sdk/reconciler/reconciler.go
@@ -782,4 +782,15 @@ func (r *Reconciler) setRecommendedLabels(cr client.Object, obj metav1.Object) {
 	for k, v := range labels {
 		sdk.SetLabel(k, v, obj)
 	}
+
+	// Actual workload templates need special care, otherwise we just update the top level labels
+	switch typedObj := obj.(type) {
+	case *appsv1.Deployment:
+		if typedObj.Spec.Template.GetLabels() == nil {
+			typedObj.Spec.Template.SetLabels(make(map[string]string))
+		}
+		for k, v := range labels {
+			typedObj.Spec.Template.GetLabels()[k] = v
+		}
+	}
 }
diff --git a/pkg/sdk/reconciler/reconciler_test.go b/pkg/sdk/reconciler/reconciler_test.go
@@ -682,6 +682,10 @@ var _ = Describe("Reconciler", func() {
 				storedObj, err := getObject(args.client, r)
 				Expect(err).ToNot(HaveOccurred())
 				Expect(storedObj.GetLabels()[sdk.AppKubernetesVersionLabel]).Should(Equal(newVersion))
+				switch typedObj := storedObj.(type) {
+				case *appsv1.Deployment:
+					Expect(typedObj.Spec.Template.GetLabels()[sdk.AppKubernetesVersionLabel]).Should(Equal(newVersion))
+				}
 			}
 		})
 	})