Update depdendencies to gardener 1.75.x (#33)

* Update gardener dependencies

* Replace removed Inject() functions

* replace InjectDecoder

Author: maboehm

.golangci.yml

@@ -126,4 +126,4 @@ run:
   issues-exit-code: 1
   tests: true
   concurrency: 4
-  deadline: 10m
+  deadline: 10m

cmd/gardener-extension/app/app.go

@@ -94,7 +94,7 @@ func (o *Options) run(ctx context.Context) error {
 	o.healthOptions.Completed().Apply(&healthcheck.DefaultAddOptions.Controller)
 	o.reconcileOptions.Completed().Apply(&controller.DefaultAddOptions.IgnoreOperationAnnotation)
 
-	if err := o.controllerSwitches.Completed().AddToManager(mgr); err != nil {
+	if err := o.controllerSwitches.Completed().AddToManager(ctx, mgr); err != nil {
 		return fmt.Errorf("could not add controllers to manager: %s", err)
 	}
 

cmd/webhook/main.go

@@ -12,6 +12,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
 
@@ -77,8 +78,13 @@ func main() {
 
 	allowedCidrs := strings.Split(additionalAllowedCidrs, ",")
 
+	decoder, err := admission.NewDecoder(mgr.GetScheme())
+	if err != nil {
+		setupLog.Error(err, "unable to create decoder")
+	}
 	server.Register("/mutate", &webhook.Admission{Handler: &aclwebhook.EnvoyFilterWebhook{
 		Client:             mgr.GetClient(),
+		Decoder:            decoder,
 		EnvoyFilterService: envoyfilters.EnvoyFilterService{},
 		WebhookConfig:      aclwebhook.Config{AdditionalAllowedCidrs: allowedCidrs},
 	}})

go.mod

@@ -2,21 +2,11 @@ module github.com/stackitcloud/gardener-extension-acl
 
 go 1.21
 
-replace (
-	github.com/gardener/gardener => github.com/gardener/gardener v1.73.1
-	k8s.io/api => k8s.io/api v0.26.6
-	k8s.io/apimachinery => k8s.io/apimachinery v0.26.6
-	k8s.io/apiserver => k8s.io/apiserver v0.26.6
-	k8s.io/client-go => k8s.io/client-go v0.26.6
-	k8s.io/code-generator => k8s.io/code-generator v0.26.6
-	k8s.io/component-base => k8s.io/component-base v0.26.6
-	k8s.io/helm => k8s.io/helm v2.13.1+incompatible
-	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.5
-)
+replace k8s.io/client-go => k8s.io/client-go v0.26.10
 
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
-	github.com/gardener/gardener v1.65.0
+	github.com/gardener/gardener v1.75.2
 	github.com/gardener/gardener-extension-provider-openstack v1.30.1-0.20221215131400-b390fb780945
 	github.com/go-logr/logr v1.2.4
 	github.com/golang/mock v1.6.0
@@ -30,12 +20,12 @@ require (
 	gomodules.xyz/jsonpatch/v2 v2.2.0
 	gopkg.in/yaml.v3 v3.0.1
 	istio.io/client-go v1.17.1
-	k8s.io/api v0.26.6
-	k8s.io/apiextensions-apiserver v0.26.3
-	k8s.io/apimachinery v0.26.6
+	k8s.io/api v0.26.10
+	k8s.io/apiextensions-apiserver v0.26.10
+	k8s.io/apimachinery v0.26.10
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/code-generator v0.26.3
-	k8s.io/component-base v0.26.6
+	k8s.io/code-generator v0.26.10
+	k8s.io/component-base v0.26.10
 	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
 	sigs.k8s.io/controller-runtime v0.14.6
 )
@@ -47,10 +37,10 @@ require (
 	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bronze1man/yaml2json v0.0.0-20211227013850-8972abeaea25 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/fluent/fluent-operator/v2 v2.2.0 // indirect
@@ -110,13 +100,13 @@ require (
 	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
+	golang.org/x/oauth2 v0.4.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect
+	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

go.sum

@@ -48,6 +48,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
 
 const (
@@ -75,10 +76,13 @@ var (
 )
 
 // NewActuator returns an actuator responsible for Extension resources.
-func NewActuator(cfg config.Config) extension.Actuator {
+func NewActuator(mgr manager.Manager, cfg config.Config) extension.Actuator {
 	return &actuator{
 		extensionConfig:    cfg,
 		envoyfilterService: envoyfilters.EnvoyFilterService{},
+		client:             mgr.GetClient(),
+		config:             mgr.GetConfig(),
+		decoder:            serializer.NewCodecFactory(mgr.GetScheme(), serializer.EnableStrict).UniversalDecoder(),
 	}
 }
 
@@ -229,24 +233,6 @@ func (a *actuator) Migrate(ctx context.Context, log logr.Logger, ex *extensionsv
 	return a.Delete(ctx, log, ex)
 }
 
-// InjectConfig injects the rest config to this actuator.
-func (a *actuator) InjectConfig(cfg *rest.Config) error {
-	a.config = cfg
-	return nil
-}
-
-// InjectClient injects the controller runtime client into the reconciler.
-func (a *actuator) InjectClient(c client.Client) error {
-	a.client = c
-	return nil
-}
-
-// InjectScheme injects the given scheme into the reconciler.
-func (a *actuator) InjectScheme(scheme *runtime.Scheme) error {
-	a.decoder = serializer.NewCodecFactory(scheme, serializer.EnableStrict).UniversalDecoder()
-	return nil
-}
-
 func (a *actuator) reconcileVPNEnvoyFilter(
 	ctx context.Context,
 	alwaysAllowedCIDRs []string,

pkg/controller/actuator.go

@@ -16,6 +16,8 @@
 package controller
 
 import (
+	"context"
+
 	controllerconfig "github.com/stackitcloud/gardener-extension-acl/pkg/controller/config"
 
 	"github.com/gardener/gardener/extensions/pkg/controller/extension"
@@ -45,20 +47,20 @@ type AddOptions struct {
 }
 
 // AddToManager adds a controller with the default Options to the given Controller Manager.
-func AddToManager(mgr manager.Manager) error {
-	return AddToManagerWithOptions(mgr, &DefaultAddOptions)
+func AddToManager(ctx context.Context, mgr manager.Manager) error {
+	return AddToManagerWithOptions(ctx, mgr, &DefaultAddOptions)
 }
 
 // AddToManagerWithOptions adds a controller with the given Options to the given manager.
 // The opts.Reconciler is being set with a newly instantiated actuator.
-func AddToManagerWithOptions(mgr manager.Manager, opts *AddOptions) error {
-	return extension.Add(mgr, extension.AddArgs{
-		Actuator:          NewActuator(opts.ExtensionConfig),
+func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts *AddOptions) error {
+	return extension.Add(ctx, mgr, extension.AddArgs{
+		Actuator:          NewActuator(mgr, opts.ExtensionConfig),
 		ControllerOptions: opts.ControllerOptions,
 		Name:              Type + Suffix,
 		FinalizerSuffix:   Type + Suffix,
 		Resync:            0,
-		Predicates:        extension.DefaultPredicates(DefaultAddOptions.IgnoreOperationAnnotation),
+		Predicates:        extension.DefaultPredicates(ctx, mgr, DefaultAddOptions.IgnoreOperationAnnotation),
 		Type:              Type,
 	})
 }

pkg/controller/add.go

@@ -16,6 +16,8 @@
 package healthcheck
 
 import (
+	"context"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -38,8 +40,9 @@ var (
 
 // RegisterHealthChecks registers health checks for each extension resource
 // HealthChecks are grouped by extension (e.g worker), extension.type (e.g aws) and  Health Check Type (e.g SystemComponentsHealthy)
-func RegisterHealthChecks(mgr manager.Manager, opts *healthcheck.DefaultAddArgs) error {
+func RegisterHealthChecks(ctx context.Context, mgr manager.Manager, opts *healthcheck.DefaultAddArgs) error {
 	return healthcheck.DefaultRegistration(
+		ctx,
 		controller.Type,
 		extensionsv1alpha1.SchemeGroupVersion.WithKind(extensionsv1alpha1.ExtensionResource),
 		func() client.ObjectList { return &extensionsv1alpha1.ExtensionList{} },
@@ -58,6 +61,6 @@ func RegisterHealthChecks(mgr manager.Manager, opts *healthcheck.DefaultAddArgs)
 }
 
 // AddToManager adds a controller with the default Options.
-func AddToManager(mgr manager.Manager) error {
-	return RegisterHealthChecks(mgr, &DefaultAddOptions)
+func AddToManager(ctx context.Context, mgr manager.Manager) error {
+	return RegisterHealthChecks(ctx, mgr, &DefaultAddOptions)
 }

pkg/controller/healthcheck/add.go

@@ -33,14 +33,14 @@ type Config struct {
 type EnvoyFilterWebhook struct {
 	Client             client.Client
 	EnvoyFilterService envoyfilters.EnvoyFilterService
-	decoder            *admission.Decoder
+	Decoder            *admission.Decoder
 	WebhookConfig      Config
 }
 
 //nolint:gocritic // the signature is forced by kubebuilder
 func (e *EnvoyFilterWebhook) Handle(ctx context.Context, req admission.Request) admission.Response {
 	filter := &istionetworkingClientGo.EnvoyFilter{}
-	if err := e.decoder.Decode(req, filter); err != nil {
+	if err := e.Decoder.Decode(req, filter); err != nil {
 		return admission.Errored(http.StatusInternalServerError, err)
 	}
 
@@ -138,8 +138,3 @@ func (e *EnvoyFilterWebhook) createAdmissionResponse(
 		},
 	}
 }
-
-func (e *EnvoyFilterWebhook) InjectDecoder(d *admission.Decoder) error {
-	e.decoder = d
-	return nil
-}

pkg/webhook/webhook.go

@@ -20,6 +20,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	istionetworkingClientGo "istio.io/client-go/pkg/apis/networking/v1alpha3"
 )
@@ -380,8 +381,11 @@ var _ = Describe("webhook unit test", func() {
 })
 
 func getNewWebhook() *EnvoyFilterWebhook {
+	decoder, err := admission.NewDecoder(clientScheme)
+	ExpectWithOffset(1, err).NotTo(HaveOccurred())
 	return &EnvoyFilterWebhook{
 		Client:             k8sClient,
+		Decoder:            decoder,
 		EnvoyFilterService: envoyfilters.EnvoyFilterService{},
 	}
 }