From a895c8559afcf572b20bbea66d76872b84a98c42 Mon Sep 17 00:00:00 2001
From: Konstantinos Angelopoulos <konstantinos.angelopoulos@sap.com>
Date: Mon, 6 Dec 2021 21:09:20 +0100
Subject: [PATCH] remove gcpmachineclass cleanup

---
 pkg/controller/worker/machines.go      |  9 +-----
 pkg/controller/worker/machines_test.go | 43 ++++----------------------
 2 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/pkg/controller/worker/machines.go b/pkg/controller/worker/machines.go
index ed9f8a927..6cd6abe48 100644
--- a/pkg/controller/worker/machines.go
+++ b/pkg/controller/worker/machines.go
@@ -36,9 +36,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-var (
-	labelRegex = regexp.MustCompile(`[^a-z0-9_-]`)
-)
+var labelRegex = regexp.MustCompile(`[^a-z0-9_-]`)
 
 const maxGcpLabelCharactersSize = 63
 
@@ -65,11 +63,6 @@ func (w *workerDelegate) DeployMachineClasses(ctx context.Context) error {
 		}
 	}
 
-	// Delete any older version machine class CRs.
-	if err := w.Client().DeleteAllOf(ctx, &machinev1alpha1.GCPMachineClass{}, client.InNamespace(w.worker.Namespace)); err != nil {
-		return fmt.Errorf("cleaning up older version of GCP machine class CRs failed: %w", err)
-	}
-
 	return w.seedChartApplier.Apply(ctx, filepath.Join(gcp.InternalChartsPath, "machineclass"), w.worker.Namespace, "machineclass", kubernetes.Values(map[string]interface{}{"machineClasses": w.machineClasses}))
 }
 
diff --git a/pkg/controller/worker/machines_test.go b/pkg/controller/worker/machines_test.go
index 09e16bdcb..bfb0e5052 100644
--- a/pkg/controller/worker/machines_test.go
+++ b/pkg/controller/worker/machines_test.go
@@ -46,7 +46,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 var _ = Describe("Machines", func() {
@@ -522,19 +521,12 @@ var _ = Describe("Machines", func() {
 
 					workerDelegateCloudRouter, _ := NewWorkerDelegate(common.NewClientContext(c, scheme, decoder), chartApplier, "", workerCloudRouter, cluster)
 					// Test workerDelegate.DeployMachineClasses()
-
-					gomock.InOrder(
-						c.EXPECT().
-							DeleteAllOf(context.TODO(), &machinev1alpha1.GCPMachineClass{}, client.InNamespace(namespace)),
-						chartApplier.
-							EXPECT().
-							Apply(
-								context.TODO(),
-								filepath.Join(gcp.InternalChartsPath, "machineclass"),
-								namespace,
-								"machineclass",
-								kubernetes.Values(machineClasses),
-							),
+					chartApplier.EXPECT().Apply(
+						context.TODO(),
+						filepath.Join(gcp.InternalChartsPath, "machineclass"),
+						namespace,
+						"machineclass",
+						kubernetes.Values(machineClasses),
 					)
 
 					err := workerDelegateCloudRouter.DeployMachineClasses(context.TODO())
@@ -572,29 +564,6 @@ var _ = Describe("Machines", func() {
 					Expect(err).NotTo(HaveOccurred())
 					Expect(result).To(Equal(machineDeployments))
 				})
-
-				It("should delete all old GCPMachineClasses", func() {
-					setup(true)
-					workerCloudRouter := w
-					workerDelegateCloudRouter, _ := NewWorkerDelegate(common.NewClientContext(c, scheme, decoder), chartApplier, "", workerCloudRouter, cluster)
-
-					gomock.InOrder(
-						c.EXPECT().
-							DeleteAllOf(context.TODO(), &machinev1alpha1.GCPMachineClass{}, client.InNamespace(namespace)),
-						chartApplier.
-							EXPECT().
-							Apply(
-								context.TODO(),
-								filepath.Join(gcp.InternalChartsPath, "machineclass"),
-								namespace,
-								"machineclass",
-								kubernetes.Values(machineClasses),
-							),
-					)
-
-					err := workerDelegateCloudRouter.DeployMachineClasses(context.TODO())
-					Expect(err).NotTo(HaveOccurred())
-				})
 			})
 
 			It("should fail because the version is invalid", func() {