Remove label protection when removing old metrics objects

Signed-off-by: João Vilaça <jvilaca@redhat.com>
kubevirt · May 13, 2022 · e0cadb4 · e0cadb4
1 parent e0888d5
commit e0cadb4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/controllers/hyperconverged/hyperconverged_controller.go b/controllers/hyperconverged/hyperconverged_controller.go
@@ -1304,7 +1304,7 @@ func (r ReconcileHyperConverged) removeOldMetricsObjs(req *common.HcoRequest) er
 	initOldMetricsObjects(req)
 
 	for name, object := range oldMetricsObjects {
-		removed, err := r.deleteObj(req, object, true)
+		removed, err := r.deleteObj(req, object, false)
 
 		if err != nil {
 			return err

diff --git a/controllers/hyperconverged/hyperconverged_controller_test.go b/controllers/hyperconverged/hyperconverged_controller_test.go
@@ -1956,18 +1956,12 @@ var _ = Describe("HyperconvergedController", func() {
 							ObjectMeta: metav1.ObjectMeta{
 								Name:      operatorMetrics,
 								Namespace: namespace,
-								Labels: map[string]string{
-									hcoutil.AppLabel: expected.hco.Name,
-								},
 							},
 						},
 						&corev1.Service{
 							ObjectMeta: metav1.ObjectMeta{
 								Name:      webhookMetrics,
 								Namespace: namespace,
-								Labels: map[string]string{
-									hcoutil.AppLabel: expected.hco.Name,
-								},
 							},
 						},
 					}
@@ -2000,9 +1994,6 @@ var _ = Describe("HyperconvergedController", func() {
 							ObjectMeta: metav1.ObjectMeta{
 								Name:      operatorMetrics,
 								Namespace: namespace,
-								Labels: map[string]string{
-									hcoutil.AppLabel: expected.hco.Name,
-								},
 							},
 						},
 					}