moved deprecated label to annotations

Signed-off-by: Karel Šimon <[email protected]>
kubevirt · Apr 1, 2021 · 0a0a99f · 0a0a99f
1 parent c3c392e
commit 0a0a99f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/internal/operands/common-templates/constants.go b/internal/operands/common-templates/constants.go
@@ -4,10 +4,10 @@ const (
 	GoldenImagesNSname = "kubevirt-os-images"
 	BundleDir          = "data/common-templates-bundle/"
 
-	TemplateVersionLabel        = "template.kubevirt.io/version"
-	TemplateTypeLabel           = "template.kubevirt.io/type"
-	TemplateOsLabelPrefix       = "os.template.kubevirt.io/"
-	TemplateFlavorLabelPrefix   = "flavor.template.kubevirt.io/"
-	TemplateWorkloadLabelPrefix = "workload.template.kubevirt.io/"
-	TemplateDeprecatedLabel     = "template.kubevirt.io/deprecated"
+	TemplateVersionLabel         = "template.kubevirt.io/version"
+	TemplateTypeLabel            = "template.kubevirt.io/type"
+	TemplateOsLabelPrefix        = "os.template.kubevirt.io/"
+	TemplateFlavorLabelPrefix    = "flavor.template.kubevirt.io/"
+	TemplateWorkloadLabelPrefix  = "workload.template.kubevirt.io/"
+	TemplateDeprecatedAnnotation = "template.kubevirt.io/deprecated"
 )
diff --git a/internal/operands/common-templates/reconcile.go b/internal/operands/common-templates/reconcile.go
@@ -186,7 +186,10 @@ func reconcileOlderTemplates(request *common.Request) ([]common.ReconcileFunc, e
 	funcs := make([]common.ReconcileFunc, 0, len(existingTemplates.Items))
 	for i := range existingTemplates.Items {
 		template := &existingTemplates.Items[i]
-		template.Labels[TemplateDeprecatedLabel] = "true"
+		if template.Annotations == nil {
+			template.Annotations = make(map[string]string)
+		}
+		template.Annotations[TemplateDeprecatedAnnotation] = "true"
 		funcs = append(funcs, func(*common.Request) (common.ResourceStatus, error) {
 			return common.CreateOrUpdate(request).
 				ClusterResource(template).

diff --git a/internal/operands/common-templates/reconcile_test.go b/internal/operands/common-templates/reconcile_test.go
@@ -190,7 +190,7 @@ var _ = Describe("Common-Templates operand", func() {
 			Expect(updatedTpl.Labels[testWorkflowLabel]).To(Equal(""), TemplateWorkloadLabelPrefix+" should be empty")
 			Expect(updatedTpl.Labels[TemplateTypeLabel]).To(Equal("base"), TemplateTypeLabel+" should equal base")
 			Expect(updatedTpl.Labels[TemplateVersionLabel]).To(Equal("not-latest"), TemplateVersionLabel+" should equal not-latest")
-			Expect(updatedTpl.Labels[TemplateDeprecatedLabel]).To(Equal("true"), TemplateDeprecatedLabel+" should not be empty")
+			Expect(updatedTpl.Annotations[TemplateDeprecatedAnnotation]).To(Equal("true"), TemplateDeprecatedAnnotation+" should not be empty")
 		})
 		It("should not remove labels from latest templates", func() {
 			_, err := operand.Reconcile(&request)

diff --git a/tests/commonTemplates_test.go b/tests/commonTemplates_test.go
@@ -327,6 +327,17 @@ var _ = Describe("Common templates", func() {
 					updatedTpl.Labels[commonTemplates.TemplateVersionLabel] == "not-latest"
 			}, shortTimeout).Should(BeTrue(), "labels were not removed from older templates")
 		})
+		It("[test_id:5969]: should add deprecated annotation to old templates", func() {
+			triggerReconciliation()
+
+			Eventually(func() bool {
+				updatedTpl := &templatev1.Template{}
+				key := client.ObjectKey{Name: oldTemplate.Name, Namespace: oldTemplate.Namespace}
+				err := apiClient.Get(ctx, key, updatedTpl)
+				return err == nil &&
+					updatedTpl.Annotations[commonTemplates.TemplateDeprecatedAnnotation] == "true"
+			}, shortTimeout).Should(BeTrue(), "deprecated annotation should be added to old template")
+		})
 		It("should continue to have labels on latest templates", func() {
 			triggerReconciliation()