Disable controlplane/network webhook mutation for "no overlay"

go.mod

@@ -10,7 +10,6 @@ require (
 	github.com/coreos/go-systemd/v22 v22.3.2
 	github.com/gardener/etcd-druid v0.9.0
 	github.com/gardener/gardener v1.53.0
-	github.com/gardener/gardener-extension-networking-calico v1.25.0
 	github.com/gardener/machine-controller-manager v0.45.0
 	github.com/go-logr/logr v1.2.3
 	github.com/golang/mock v1.6.0

go.sum

@@ -212,8 +212,6 @@ github.com/gardener/external-dns-management v0.7.18 h1:15uIyFfZSbR8fivnXvqb1Dvv4
 github.com/gardener/external-dns-management v0.7.18/go.mod h1:oHhauLQ3/sop0c1urS6n304Wqv/WM4me0geLn9nTAcY=
 github.com/gardener/gardener v1.53.0 h1:SffBCuyxcPlveZkxFuek+sVwMeF2F5wEjD8F6+EiNvE=
 github.com/gardener/gardener v1.53.0/go.mod h1:O+59kTQavqxX5nr5jyHqD6o4JxIukHMaW2t5BLiXqmc=
-github.com/gardener/gardener-extension-networking-calico v1.25.0 h1:mkdroxXFkMDNgX0wMrqGWKBGuB4YaXnNFIJFSgeyyCk=
-github.com/gardener/gardener-extension-networking-calico v1.25.0/go.mod h1:A6pG11WJwT0WD7fY6nNupfm/w9YNla7P9YTcC/Baz5I=
 github.com/gardener/hvpa-controller/api v0.5.0 h1:f4F3O7YUrenwh4S3TgPREPiB287JjjUiUL18OqPLyAA=
 github.com/gardener/hvpa-controller/api v0.5.0/go.mod h1:QQl3ELkCaki+8RhXl0FZMfvnm0WCGwGJlGmrxJj6lvM=
 github.com/gardener/machine-controller-manager v0.45.0 h1:rpf0PHRXJMGY93oMruNP+tnMawKJXhhzCACyNJsT8Lo=

pkg/cmd/options.go

@@ -28,7 +28,6 @@ import (
 	workercontroller "github.com/gardener/gardener-extension-provider-aws/pkg/controller/worker"
 	controlplanewebhook "github.com/gardener/gardener-extension-provider-aws/pkg/webhook/controlplane"
 	controlplaneexposurewebhook "github.com/gardener/gardener-extension-provider-aws/pkg/webhook/controlplaneexposure"
-	networkwebhook "github.com/gardener/gardener-extension-provider-aws/pkg/webhook/network"
 	shootwebhook "github.com/gardener/gardener-extension-provider-aws/pkg/webhook/shoot"
 
 	extensionsbackupbucketcontroller "github.com/gardener/gardener/extensions/pkg/controller/backupbucket"
@@ -43,7 +42,6 @@ import (
 	extensionsworkercontroller "github.com/gardener/gardener/extensions/pkg/controller/worker"
 	webhookcmd "github.com/gardener/gardener/extensions/pkg/webhook/cmd"
 	extensioncontrolplanewebhook "github.com/gardener/gardener/extensions/pkg/webhook/controlplane"
-	extensionsnetworkwebhook "github.com/gardener/gardener/extensions/pkg/webhook/network"
 	extensionshootwebhook "github.com/gardener/gardener/extensions/pkg/webhook/shoot"
 	"github.com/spf13/pflag"
 	"golang.org/x/time/rate"
@@ -77,7 +75,6 @@ func ControllerSwitchOptions() *controllercmd.SwitchOptions {
 // WebhookSwitchOptions are the webhookcmd.SwitchOptions for the provider webhooks.
 func WebhookSwitchOptions() *webhookcmd.SwitchOptions {
 	return webhookcmd.NewSwitchOptions(
-		webhookcmd.Switch(extensionsnetworkwebhook.WebhookName, networkwebhook.AddToManager),
 		webhookcmd.Switch(extensioncontrolplanewebhook.WebhookName, controlplanewebhook.AddToManager),
 		webhookcmd.Switch(extensioncontrolplanewebhook.ExposureWebhookName, controlplaneexposurewebhook.AddToManager),
 		webhookcmd.Switch(extensionshootwebhook.WebhookName, shootwebhook.AddToManager),

pkg/webhook/controlplane/add.go

@@ -40,9 +40,8 @@ func AddToManager(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
 		Types: []extensionswebhook.Type{
 			{Obj: &appsv1.Deployment{}},
 			{Obj: &extensionsv1alpha1.OperatingSystemConfig{}},
-			{Obj: &extensionsv1alpha1.ControlPlane{}},
 		},
-		Mutator: NewControlPlaneMutator(logger, genericmutator.NewMutator(NewEnsurer(logger),
-			oscutils.NewUnitSerializer(), kubelet.NewConfigCodec(fciCodec), fciCodec, logger)),
+		Mutator: genericmutator.NewMutator(NewEnsurer(logger), oscutils.NewUnitSerializer(),
+			kubelet.NewConfigCodec(fciCodec), fciCodec, logger),
 	})
 }

pkg/webhook/controlplane/ensurer.go

@@ -19,8 +19,6 @@ import (
 	"context"
 	"regexp"
 
-	"github.com/gardener/gardener-extension-provider-aws/pkg/apis/aws/install"
-	awsv1alpha1 "github.com/gardener/gardener-extension-provider-aws/pkg/apis/aws/v1alpha1"
 	"github.com/gardener/gardener-extension-provider-aws/pkg/aws"
 
 	"github.com/Masterminds/semver"
@@ -37,30 +35,11 @@ import (
 	"github.com/go-logr/logr"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/runtime/inject"
 )
 
-var (
-	// Scheme is a scheme with the types relevant for aws control plane configuration.
-	scheme *runtime.Scheme
-
-	decoder runtime.Decoder
-)
-
-func init() {
-	scheme = runtime.NewScheme()
-	utilruntime.Must(install.AddToScheme(scheme))
-
-	decoder = serializer.NewCodecFactory(scheme, serializer.EnableStrict).UniversalDecoder()
-}
-
 // NewEnsurer creates a new controlplane ensurer.
 func NewEnsurer(logger logr.Logger) genericmutator.Ensurer {
 	return &ensurer{
@@ -612,85 +591,3 @@ func appendUniqueFile(files *[]extensionsv1alpha1.File, file extensionsv1alpha1.
 
 	*files = append(resFiles, file)
 }
-
-// NewControlPlaneMutator creates a new controlplane mutator.
-func NewControlPlaneMutator(logger logr.Logger, mutator extensionswebhook.Mutator) extensionswebhook.Mutator {
-	return &controlPlaneMutator{
-		logger:  logger.WithName("aws-controlplane-mutator"),
-		mutator: mutator,
-	}
-}
-
-type controlPlaneMutator struct {
-	client  client.Client
-	logger  logr.Logger
-	mutator extensionswebhook.Mutator
-}
-
-// InjectClient injects the given client into the mutator.
-func (c *controlPlaneMutator) InjectClient(client client.Client) error {
-	c.client = client
-	_, err := inject.ClientInto(client, c.mutator)
-	return err
-}
-
-// InjectFunc injects stuff into the mutator.
-func (c *controlPlaneMutator) InjectFunc(f inject.Func) error {
-	return f(c.mutator)
-}
-
-// Mutate validates and if needed mutates the given object.
-func (c *controlPlaneMutator) Mutate(ctx context.Context, new, old client.Object) error {
-	// If the object does have a deletion timestamp then we don't want to mutate anything.
-	if new.GetDeletionTimestamp() != nil {
-		return nil
-	}
-
-	switch x := new.(type) {
-	case *extensionsv1alpha1.ControlPlane:
-		// Only mutate inital control plane for now
-		if old != nil {
-			return nil
-		}
-
-		gctx := gcontext.NewGardenContext(c.client, new)
-		cluster, err := gctx.GetCluster(ctx)
-		if err != nil {
-			return err
-		}
-		// source/destination checks are only disabled for kubernetes >= 1.22
-		// see https://github.com/gardener/machine-controller-manager-provider-aws/issues/36 for details
-		greaterEqual122, err := versionutils.CompareVersions(cluster.Shoot.Spec.Kubernetes.Version, ">=", "1.22")
-		if err != nil {
-			return err
-		}
-		if greaterEqual122 {
-			switch x.Name {
-			case cluster.Shoot.Name:
-				config := &awsv1alpha1.ControlPlaneConfig{
-					TypeMeta: metav1.TypeMeta{
-						APIVersion: awsv1alpha1.SchemeGroupVersion.String(),
-						Kind:       "ControlPlaneConfig",
-					},
-				}
-				if x.Spec.ProviderConfig != nil && x.Spec.ProviderConfig.Raw != nil {
-					if _, _, err := decoder.Decode(x.Spec.ProviderConfig.Raw, nil, config); err != nil {
-						return err
-					}
-				}
-				if config.CloudControllerManager == nil {
-					config.CloudControllerManager = &awsv1alpha1.CloudControllerManagerConfig{}
-				}
-				if config.CloudControllerManager.UseCustomRouteController == nil {
-					extensionswebhook.LogMutation(c.logger, x.Kind, x.Namespace, x.Name)
-					config.CloudControllerManager.UseCustomRouteController = pointer.Bool(true)
-					x.Spec.ProviderConfig = &runtime.RawExtension{
-						Object: config,
-					}
-				}
-			}
-		}
-		return nil
-	}
-	return c.mutator.Mutate(ctx, new, old)
-}

pkg/webhook/controlplane/ensurer_test.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"testing"
 
-	awsv1alpha1 "github.com/gardener/gardener-extension-provider-aws/pkg/apis/aws/v1alpha1"
 	"github.com/gardener/gardener-extension-provider-aws/pkg/aws"
 
 	"github.com/Masterminds/semver"
@@ -37,7 +36,6 @@ import (
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"
 
-	kutil "github.com/gardener/gardener/pkg/utils/kubernetes"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -773,93 +771,6 @@ done
 			Expect(*data).To(Equal(result))
 		})
 	})
-
-	Describe("Custom Route Controller", func() {
-		var (
-			client       *mockclient.MockClient
-			controlPlane *extensionsv1alpha1.ControlPlane
-			mutator      extensionswebhook.Mutator
-
-			namespace  = "foo"
-			clusterKey = kutil.Key(namespace)
-			oldCluster = &extensionsv1alpha1.Cluster{
-				Spec: extensionsv1alpha1.ClusterSpec{
-					Shoot: runtime.RawExtension{
-						Raw: []byte(`{"spec":{"kubernetes":{"version": "1.21.5"}}}`),
-					},
-				},
-			}
-			newCluster = &extensionsv1alpha1.Cluster{
-				Spec: extensionsv1alpha1.ClusterSpec{
-					Shoot: runtime.RawExtension{
-						Raw: []byte(`{"spec":{"kubernetes":{"version": "1.22.4"}}}`),
-					},
-				},
-			}
-		)
-
-		BeforeEach(func() {
-			client = mockclient.NewMockClient(ctrl)
-			controlPlane = &extensionsv1alpha1.ControlPlane{
-				ObjectMeta: metav1.ObjectMeta{Namespace: namespace},
-				Spec: extensionsv1alpha1.ControlPlaneSpec{
-					DefaultSpec: extensionsv1alpha1.DefaultSpec{
-						ProviderConfig: &runtime.RawExtension{
-							Raw: []byte("{}"),
-						},
-					},
-				},
-			}
-			mutator = NewControlPlaneMutator(logger, nil)
-			err := mutator.(inject.Client).InjectClient(client)
-			Expect(err).To(Not(HaveOccurred()))
-		})
-
-		It("should not enable for kubernetes < 1.22", func() {
-			oldControlPlane := controlPlane.DeepCopy()
-
-			client.EXPECT().Get(ctx, clusterKey, &extensionsv1alpha1.Cluster{}).DoAndReturn(clientGet(oldCluster))
-
-			err := mutator.Mutate(ctx, controlPlane, nil)
-			Expect(err).To(Not(HaveOccurred()))
-			Expect(oldControlPlane).To(Equal(controlPlane))
-		})
-
-		It("should enable for kubernetes >= 1.22", func() {
-			oldControlPlane := controlPlane.DeepCopy()
-
-			client.EXPECT().Get(ctx, clusterKey, &extensionsv1alpha1.Cluster{}).DoAndReturn(clientGet(newCluster))
-
-			err := mutator.Mutate(ctx, controlPlane, nil)
-			Expect(err).To(Not(HaveOccurred()))
-			Expect(oldControlPlane).To(Not(Equal(controlPlane)))
-			Expect(controlPlane.Spec.ProviderConfig.Object).ToNot(BeNil())
-			Expect(*controlPlane.Spec.ProviderConfig.Object.(*awsv1alpha1.ControlPlaneConfig).CloudControllerManager).ToNot(BeNil())
-			Expect(*controlPlane.Spec.ProviderConfig.Object.(*awsv1alpha1.ControlPlaneConfig).CloudControllerManager.UseCustomRouteController).To(BeTrue())
-		})
-
-		It("should enable for kubernetes >= 1.22 without provider config", func() {
-			controlPlane.Spec.DefaultSpec = extensionsv1alpha1.DefaultSpec{}
-			oldControlPlane := controlPlane.DeepCopy()
-
-			client.EXPECT().Get(ctx, clusterKey, &extensionsv1alpha1.Cluster{}).DoAndReturn(clientGet(newCluster))
-
-			err := mutator.Mutate(ctx, controlPlane, nil)
-			Expect(err).To(Not(HaveOccurred()))
-			Expect(oldControlPlane).To(Not(Equal(controlPlane)))
-			Expect(controlPlane.Spec.ProviderConfig.Object).ToNot(BeNil())
-			Expect(*controlPlane.Spec.ProviderConfig.Object.(*awsv1alpha1.ControlPlaneConfig).CloudControllerManager).ToNot(BeNil())
-			Expect(*controlPlane.Spec.ProviderConfig.Object.(*awsv1alpha1.ControlPlaneConfig).CloudControllerManager.UseCustomRouteController).To(BeTrue())
-		})
-
-		It("should not enable on update", func() {
-			oldControlPlane := controlPlane.DeepCopy()
-
-			err := mutator.Mutate(ctx, controlPlane, controlPlane)
-			Expect(err).To(Not(HaveOccurred()))
-			Expect(oldControlPlane).To(Equal(controlPlane))
-		})
-	})
 })
 
 func checkKubeAPIServerDeployment(dep *appsv1.Deployment, annotations map[string]string, k8sVersion string, needsCSIMigrationCompletedFeatureGates bool) {
@@ -995,8 +906,6 @@ func clientGet(result runtime.Object) interface{} {
 			*obj.(*corev1.Secret) = *result.(*corev1.Secret)
 		case *corev1.ConfigMap:
 			*obj.(*corev1.ConfigMap) = *result.(*corev1.ConfigMap)
-		case *extensionsv1alpha1.Cluster:
-			*obj.(*extensionsv1alpha1.Cluster) = *result.(*extensionsv1alpha1.Cluster)
 		}
 		return nil
 	}