From 0a16522e394d60cb5c99f3363f93526ed95638d3 Mon Sep 17 00:00:00 2001
From: Hussein Galal <hussein.galal.ahmed.11@gmail.com>
Date: Wed, 3 Jun 2026 16:04:42 +0300
Subject: [PATCH] Remove pod mutating webhook refrences (#858)

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
---
 k3k-kubelet/controller/webhook/pod.go | 52 ---------------------------
 k3k-kubelet/kubelet.go                |  7 ----
 2 files changed, 59 deletions(-)
 delete mode 100644 k3k-kubelet/controller/webhook/pod.go

diff --git a/k3k-kubelet/controller/webhook/pod.go b/k3k-kubelet/controller/webhook/pod.go
deleted file mode 100644
index e4f73929..00000000
--- a/k3k-kubelet/controller/webhook/pod.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package webhook
-
-import (
-	"context"
-
-	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
-	corev1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/rancher/k3k/pkg/controller"
-)
-
-const webhookName = "podmutating.k3k.io"
-
-func RemovePodMutatingWebhook(ctx context.Context, virtualClient, hostClient ctrlruntimeclient.Client, clusterName, clusterNamespace string) error {
-	webhookSecret := &corev1.Secret{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Secret",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      controller.SafeConcatNameWithPrefix(clusterName, "webhook"),
-			Namespace: clusterNamespace,
-		},
-	}
-
-	if err := hostClient.Delete(ctx, webhookSecret); err != nil {
-		if !apierrors.IsNotFound(err) {
-			return err
-		}
-	}
-
-	webhook := &admissionregistrationv1.MutatingWebhookConfiguration{
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "admissionregistration.k8s.io/v1",
-			Kind:       "MutatingWebhookConfiguration",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: webhookName + "-configuration",
-		},
-	}
-
-	if err := virtualClient.Delete(ctx, webhook); err != nil {
-		if !apierrors.IsNotFound(err) {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/k3k-kubelet/kubelet.go b/k3k-kubelet/kubelet.go
index 4aa8130b..83da76b0 100644
--- a/k3k-kubelet/kubelet.go
+++ b/k3k-kubelet/kubelet.go
@@ -33,7 +33,6 @@ import (
 	ctrlserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"github.com/rancher/k3k/k3k-kubelet/controller/syncer"
-	k3kwebhook "github.com/rancher/k3k/k3k-kubelet/controller/webhook"
 	"github.com/rancher/k3k/k3k-kubelet/provider"
 	"github.com/rancher/k3k/pkg/apis/k3k.io/v1beta1"
 	"github.com/rancher/k3k/pkg/controller"
@@ -138,12 +137,6 @@ func newKubelet(ctx context.Context, c *config) (*kubelet, error) {
 		return nil, errors.New("unable to create controller-runtime mgr for virtual cluster: " + err.Error())
 	}
 
-	logger.Info("removing pod mutating webhook")
-
-	if err := k3kwebhook.RemovePodMutatingWebhook(ctx, virtualMgr.GetClient(), hostClient, c.ClusterName, c.ClusterNamespace); err != nil {
-		return nil, errors.New("unable to remove pod mutating webhook for virtual cluster: " + err.Error())
-	}
-
 	controllerName := c.AgentHostname
 	eb := record.NewBroadcaster(record.WithContext(ctx))
 	eb.StartRecordingToSink(&corev1client.EventSinkImpl{Interface: virtClient.CoreV1().Events(corev1.NamespaceAll)})