removing webhooks and crs cleanup

Author: haouc

config/rbac/role.yaml

@@ -21,18 +21,6 @@ rules:
   - list
   - patch
   - watch
-- apiGroups:
-  - admissionregistration.k8s.io
-  resources:
-  - mutatingwebhookconfigurations
-  verbs:
-  - delete
-- apiGroups:
-  - admissionregistration.k8s.io
-  resources:
-  - validatingwebhookconfigurations
-  verbs:
-  - delete
 - apiGroups:
   - ""
   resources:

controllers/crds/cninode_controller.go

@@ -15,7 +15,6 @@ package crds
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/aws/amazon-vpc-resource-controller-k8s/apis/vpcresources/v1alpha1"
@@ -24,8 +23,6 @@ import (
 	"github.com/aws/amazon-vpc-resource-controller-k8s/pkg/config"
 	"github.com/aws/amazon-vpc-resource-controller-k8s/pkg/k8s"
 	"github.com/aws/amazon-vpc-resource-controller-k8s/pkg/utils"
-	"github.com/awslabs/operatorpkg/reasonable"
-	"github.com/awslabs/operatorpkg/singleton"
 	"github.com/go-logr/logr"
 	"github.com/prometheus/client_golang/prometheus"
 	v1 "k8s.io/api/core/v1"
@@ -38,9 +35,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
 var (
@@ -275,49 +270,3 @@ func (r *CNINodeReconciler) createCNINodeFromObj(ctx context.Context, newCNINode
 			return r.Client.Create(ctx, newCNINode)
 		})
 }
-
-type CNINodeCleaner struct {
-	k8sClient k8s.K8sWrapper
-	log       logr.Logger
-}
-
-func NewCNINodeCleaner(client k8s.K8sWrapper, log logr.Logger) *CNINodeCleaner {
-	return &CNINodeCleaner{
-		k8sClient: client,
-		log:       log,
-	}
-}
-
-func (c *CNINodeCleaner) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
-	return ctrl.NewControllerManagedBy(mgr).
-		Named("cninode-cleaner").
-		WithOptions(controller.Options{RateLimiter: reasonable.RateLimiter()}).
-		WatchesRawSource(singleton.Source()).
-		Complete(singleton.AsReconciler(c))
-}
-
-func (c *CNINodeCleaner) Reconcile(ctx context.Context) (reconcile.Result, error) {
-	cniNodeList, err := c.k8sClient.ListCNINodes()
-	c.log.Info("get cninodes", "cninodes", len(cniNodeList))
-	if err != nil {
-		return reconcile.Result{}, fmt.Errorf("listing cni nodes, %w", err)
-	}
-
-	for _, oldCNINode := range cniNodeList {
-		newCNINode := oldCNINode.DeepCopy()
-		// if the cninode has finalizer, remove it and then delete the resource
-		// otherwise just delete the resource
-		if yes := controllerutil.RemoveFinalizer(newCNINode, config.NodeTerminationFinalizer); yes {
-			if err := c.k8sClient.PatchCNINode(oldCNINode, newCNINode); err != nil {
-				c.log.Info("patch cninode failed", "cninode", newCNINode.Name, "error", err.Error())
-				continue
-			}
-		}
-		if err := c.k8sClient.DeleteCNINode(newCNINode); err != nil {
-			c.log.Info("delete cninode failed", "cninode", newCNINode.Name, "error", err.Error())
-		}
-		c.log.Info("deleted cninode", "cninode", oldCNINode.Name)
-	}
-
-	return reconcile.Result{RequeueAfter: 1 * time.Hour}, nil
-}

go.mod

@@ -13,7 +13,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.207.1
 	github.com/aws/aws-sdk-go-v2/service/sts v1.33.17
 	github.com/aws/smithy-go v1.22.2
-	github.com/awslabs/operatorpkg v0.0.0-20250325071853-9b4e36db18ce
 	github.com/go-logr/logr v1.4.2
 	github.com/go-logr/zapr v1.3.0
 	github.com/golang/mock v1.6.0

go.sum

@@ -34,8 +34,6 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 h1:PZV5W8yk4OtH1JAuhV2PXwwO9v5
 github.com/aws/aws-sdk-go-v2/service/sts v1.33.17/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4=
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
-github.com/awslabs/operatorpkg v0.0.0-20250325071853-9b4e36db18ce h1:48PMrh3mbAo4I16cs8KIyTNR+hiece4ls0x5N8lW66Y=
-github.com/awslabs/operatorpkg v0.0.0-20250325071853-9b4e36db18ce/go.mod h1:cXLW4jXn/PwlKrKaGsTtshO1ELR6UqWfiPXe88u6VEo=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

main.go

@@ -42,7 +42,6 @@ import (
 	"github.com/aws/amazon-vpc-resource-controller-k8s/pkg/version"
 	asyncWorkers "github.com/aws/amazon-vpc-resource-controller-k8s/pkg/worker"
 	webhookcore "github.com/aws/amazon-vpc-resource-controller-k8s/webhooks/core"
-	webhookidle "github.com/aws/amazon-vpc-resource-controller-k8s/webhooks/idle"
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/go-logr/zapr"
@@ -318,32 +317,6 @@ func main() {
 
 	if disableController {
 		setupLog.Info("vpc resource controller is disabled")
-		// +kubebuilder:scaffold:builder
-		setupLog.Info("setting up idle webhook servers")
-		webhookServer := mgr.GetWebhookServer()
-
-		// these webhooks are backup in case configurations are still existing for any reason
-		webhookServer.Register("/mutate-v1-pod", &webhook.Admission{
-			Handler: webhookidle.NewPodMutationWebHook(),
-		})
-
-		webhookServer.Register("/validate-v1-node", &webhook.Admission{
-			Handler: webhookidle.NewNodeUpdateWebhook()})
-
-		webhookServer.Register("/validate-v1-pod", &webhook.Admission{
-			Handler: webhookidle.NewAnnotationValidator()})
-
-		cninodeCleaner := crdcontroller.NewCNINodeCleaner(k8sApi, ctrl.Log.WithName("cninodeCleaner"))
-		if err := cninodeCleaner.SetupWithManager(ctx, mgr); err != nil {
-			setupLog.Error(err, "unable to start cninode cleaner")
-			os.Exit(1)
-		}
-		webhookManager := utils.NewWebhookManager(clientSet, ctrl.Log.WithName("webhookCleaner"))
-		if err := webhookManager.SetupWithManager(ctx, mgr); err != nil {
-			setupLog.Error(err, "unable to start webhook cleaner")
-			os.Exit(1)
-		}
-
 		featureGauge.Set(float64(0))
 	} else {
 		ec2APIHelper := ec2API.NewEC2APIHelper(ec2Wrapper, clusterName)