cleanup the apiserver deployment while switching between variant

Author: vara2504

pkg/controller/apiserver/apiserver_controller_test.go

@@ -152,6 +152,7 @@ var _ = Describe("apiserver controller tests", func() {
 		mockStatus.On("ClearDegraded")
 		mockStatus.On("AddCertificateSigningRequests", mock.Anything)
 		mockStatus.On("RemoveCertificateSigningRequests", mock.Anything)
+		mockStatus.On("RemoveDeployments", mock.Anything)
 		mockStatus.On("ReadyToMonitor")
 		mockStatus.On("SetMetaData", mock.Anything).Return()
 		mockStatus.On("SetDegraded", operatorv1.ResourceReadError, mock.Anything, mock.Anything, mock.Anything).Return().Maybe()

pkg/render/apiserver.go

@@ -328,13 +328,16 @@ func (c *apiServerComponent) Objects() ([]client.Object, []client.Object) {
 		globalObjects = append(globalObjects, globalEnterpriseObjects...)
 		namespacedObjects = append(namespacedObjects, namespacedEnterpriseObjects...)
 
+		objsToDelete = append(objsToDelete, c.cleanupDeployment())
+
 	} else {
 		// Add in a NetworkPolicy.
 		namespacedObjects = append(namespacedObjects, c.networkPolicy())
 
 		// Explicitly delete any global enterprise objects.
 		// Namespaced objects will be handled by namespace deletion.
 		objsToDelete = append(objsToDelete, globalEnterpriseObjects...)
+		objsToDelete = append(objsToDelete, c.cleanupDeployment())
 	}
 
 	// Explicitly delete any renamed/deprecated objects.
@@ -2406,3 +2409,16 @@ func (c *apiServerComponent) l7AdmissionControllerContainer() corev1.Container {
 
 	return l7AdmssCtrl
 }
+
+// Both Calico and Calico Enterprise, but different names.
+func (c *apiServerComponent) cleanupDeployment() client.Object {
+	// Determine names based on the configured variant.
+	_, nameToDelete := c.resourceNameBasedOnVariant("tigera-apiserver", "calico-apiserver")
+	return &appsv1.Deployment{
+		TypeMeta: metav1.TypeMeta{Kind: "De", APIVersion: "rbac.authorization.k8s.io/v1"},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      nameToDelete,
+			Namespace: APIServerNamespace,
+		},
+	}
+}