Fix infra mutator (#911)

Co-authored-by: Alexander Hebel <a.hebelsun@gmail.com>

Author: AndreasBurger

pkg/webhook/infrastructure/add.go

@@ -32,9 +32,13 @@ func AddToManager(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
 		{Obj: &extensionsv1alpha1.Infrastructure{}},
 	}
 
+	// WithMutator can only add one mutator for the same type, so
+	// we created a general infraMutator that just calls all Mutate funcs
 	handler, err := extensionswebhook.NewBuilder(mgr, logger).
-		WithMutator(NewLayoutMutator(logger, NetworkLayoutMigrationMutate), types...).
-		WithMutator(NewFlowMutator(mgr, logger), types...).
+		WithMutator(NewInfraMutator([]extensionswebhook.Mutator{
+			newLayoutMutator(logger),
+			newFlowMutator(mgr, logger),
+		}), types...).
 		Build()
 	if err != nil {
 		return nil, err

pkg/webhook/infrastructure/flow.go

@@ -27,7 +27,7 @@ type flowMutator struct {
 }
 
 // NewFlowMutator returns a new Infrastructure flowMutator that uses mutateFunc to perform the mutation.
-func NewFlowMutator(mgr manager.Manager, logger logr.Logger) extensionswebhook.Mutator {
+func newFlowMutator(mgr manager.Manager, logger logr.Logger) extensionswebhook.Mutator {
 	return &flowMutator{
 		client: mgr.GetClient(),
 		logger: logger,

pkg/webhook/infrastructure/flow_test.go

@@ -56,7 +56,7 @@ var _ = Describe("Mutate", func() {
 		)
 
 		BeforeEach(func() {
-			mutator = NewFlowMutator(mgr, logger)
+			mutator = newFlowMutator(mgr, logger)
 			ctx = context.TODO()
 
 			c.EXPECT().Get(ctx, client.ObjectKey{Name: shootNamespace}, gomock.AssignableToTypeOf(&extensionsv1alpha1.Cluster{})).

pkg/webhook/infrastructure/infrastructure.go

@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Gardener contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package infrastructure
+
+import (
+	"context"
+
+	extensionswebhook "github.com/gardener/gardener/extensions/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+type infraMutator struct {
+	mutators []extensionswebhook.Mutator
+}
+
+// NewInfraMutator returns a new Infrastructure infraMutator that calls the
+// Mutate func of all passed mutators
+func NewInfraMutator(mutators []extensionswebhook.Mutator) extensionswebhook.Mutator {
+	return &infraMutator{
+		mutators: mutators,
+	}
+}
+
+// Mutate mutates the given object using the mutateFunc
+func (m *infraMutator) Mutate(ctx context.Context, new, old client.Object) error {
+	for _, mutator := range m.mutators {
+		err := mutator.Mutate(ctx, new, old)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}

pkg/webhook/infrastructure/layout.go

@@ -18,19 +18,14 @@ import (
 	azuretypes "github.com/gardener/gardener-extension-provider-azure/pkg/azure"
 )
 
-// MutateFunc is a function that can perform a mutation on Infrastructure objects.
-type MutateFunc func(ctx context.Context, logger logr.Logger, new, old *extensionsv1alpha1.Infrastructure) error
-
 type layoutMutator struct {
-	logger     logr.Logger
-	mutateFunc MutateFunc
+	logger logr.Logger
 }
 
-// NewLayoutMutator returns a new Infrastructure layoutMutator that uses mutateFunc to perform the mutation.
-func NewLayoutMutator(logger logr.Logger, mutateFunc MutateFunc) extensionswebhook.Mutator {
+// newLayoutMutator returns a new Infrastructure layoutMutator
+func newLayoutMutator(logger logr.Logger) extensionswebhook.Mutator {
 	return &layoutMutator{
-		logger:     logger,
-		mutateFunc: mutateFunc,
+		logger: logger,
 	}
 }
 
@@ -58,11 +53,11 @@ func (m *layoutMutator) Mutate(ctx context.Context, new, old client.Object) erro
 		return fmt.Errorf("could not mutate: object is not of type Infrastructure")
 	}
 
-	return m.mutateFunc(ctx, m.logger, newInfra, oldInfra)
+	return mutate(ctx, m.logger, newInfra, oldInfra)
 }
 
-// NetworkLayoutMigrationMutate annotates the infrastructure object with additonal information that are necessary during the reconciliation when migrating to a new network layout.
-func NetworkLayoutMigrationMutate(_ context.Context, logger logr.Logger, newInfra, oldInfra *extensionsv1alpha1.Infrastructure) error {
+// mutate annotates the infrastructure object with additional information that are necessary during the reconciliation when migrating to a new network layout.
+func mutate(_ context.Context, logger logr.Logger, newInfra, oldInfra *extensionsv1alpha1.Infrastructure) error {
 	var (
 		newProviderCfg, oldProviderCfg *azure.InfrastructureConfig
 		oldProviderStatus              *azure.InfrastructureStatus
@@ -78,8 +73,8 @@ func NetworkLayoutMigrationMutate(_ context.Context, logger logr.Logger, newInfr
 		return fmt.Errorf("could not mutate object: %v", err)
 	}
 
-	// if newInfra already contains the zone migration annotation, check if it is still necessary. Otherwise, remove the
-	// the annotation.
+	// if newInfra already contains the zone migration annotation, check if it is still necessary.
+	// Otherwise, remove the annotation.
 	if z, ok := newInfra.Annotations[azuretypes.NetworkLayoutZoneMigrationAnnotation]; ok {
 		findMatchingZone := false
 		for _, zone := range newProviderCfg.Networks.Zones {

pkg/webhook/infrastructure/layout_test.go

@@ -41,7 +41,7 @@ var _ = Describe("Mutate", func() {
 		var mutator extensionswebhook.Mutator
 
 		BeforeEach(func() {
-			mutator = NewLayoutMutator(logger, NetworkLayoutMigrationMutate)
+			mutator = newLayoutMutator(logger)
 		})
 
 		Context("add migration annotation", func() {