Add APIServer finalizer only to the deployment

Author: vara2504

pkg/controller/apiserver/apiserver_controller.go

@@ -21,6 +21,7 @@ import (
 	"github.com/go-logr/logr"
 	appsv1 "k8s.io/api/apps/v1"
 
+	v1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -158,9 +159,6 @@ func add(c ctrlruntime.Controller, r *ReconcileAPIServer) error {
 	if err = c.WatchObject(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: render.APIServerNamespace}}, &handler.EnqueueRequestForObject{}); err != nil {
 		return fmt.Errorf("apiserver-controller failed to watch resource: %w", err)
 	}
-	if err = c.WatchObject(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: render.APIServerNamespace}}, &handler.EnqueueRequestForObject{}); err != nil {
-		return fmt.Errorf("apiserver-controller failed to watch resource: %w", err)
-	}
 
 	for _, secretName := range []string{
 		"calico-apiserver-certs", "tigera-apiserver-certs",
@@ -513,8 +511,8 @@ func validateAPIServerResource(instance *operatorv1.APIServer) error {
 // prior to the CNI plugin being removed.
 func (r *ReconcileAPIServer) maintainFinalizer(ctx context.Context, apiserver client.Object) error {
 	// These objects require graceful termination before the CNI plugin is torn down.
-	apiServerNamespace := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: render.APIServerNamespace}}
-	return utils.MaintainInstallationFinalizer(ctx, r.client, apiserver, render.APIServerFinalizer, apiServerNamespace)
+	apiServerDeployment := v1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "calico-apiserver", Namespace: render.APIServerNamespace}}
+	return utils.MaintainInstallationFinalizer(ctx, r.client, apiserver, render.APIServerFinalizer, &apiServerDeployment)
 }
 
 // canCleanupLegacyNamespace determines whether the legacy "tigera-system" namespace

pkg/render/apiserver.go

@@ -2332,7 +2332,7 @@ func (c *apiServerComponent) getDeprecatedResources() []client.Object {
 	}
 
 	// Delete the older namespace for OSS and EE.
-	// this is to support older version OSS update to newer EE and vice versa.
+	// This supports upgrades from older OSS versions to newer EE versions, and vice versa.
 	// CanCleanupOlderResources ensure the newdeployment is up and running in calico-system in both variant.
 	if c.cfg.CanCleanupOlderResources {
 		renamedRscList = append(renamedRscList, &corev1.Namespace{