Update module github.com/gardener/gardener to v1.137.0

Makefile

@@ -65,10 +65,13 @@ check: $(GOIMPORTS) $(GOLANGCI_LINT) $(HELM) $(YQ)
 	@REPO_ROOT=$(REPO_ROOT) bash $(GARDENER_HACK_DIR)/check.sh --golangci-lint-config=./.golangci.yaml ./cmd/... ./pkg/... ./test/...
 	@REPO_ROOT=$(REPO_ROOT) bash $(GARDENER_HACK_DIR)/check-charts.sh ./charts
 
+tools-for-generate: $(CONTROLLER_GEN) $(EXTENSION_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(KUSTOMIZE) $(YQ)
+	@go mod download
+
 .PHONY: generate
-generate: $(CONTROLLER_GEN) $(EXTENSION_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(KUSTOMIZE) $(VGOPATH) $(YQ)
-	@REPO_ROOT=$(REPO_ROOT) VGOPATH=$(VGOPATH) GARDENER_HACK_DIR=$(GARDENER_HACK_DIR) bash $(GARDENER_HACK_DIR)/generate-sequential.sh ./charts/... ./example/... ./cmd/... ./pkg/...
-	@REPO_ROOT=$(REPO_ROOT) VGOPATH=$(VGOPATH) GARDENER_HACK_DIR=$(GARDENER_HACK_DIR) $(REPO_ROOT)/hack/update-codegen.sh
+generate: tools-for-generate
+	@REPO_ROOT=$(REPO_ROOT) GARDENER_HACK_DIR=$(GARDENER_HACK_DIR) bash $(GARDENER_HACK_DIR)/generate-sequential.sh ./charts/... ./example/... ./cmd/... ./pkg/...
+	@REPO_ROOT=$(REPO_ROOT) GARDENER_HACK_DIR=$(GARDENER_HACK_DIR) $(REPO_ROOT)/hack/update-codegen.sh
 	@GARDENER_HACK_DIR=$(GARDENER_HACK_DIR) bash ./hack/generate-renovate-ignore-deps.sh
 
 .PHONY: format

cmd/gardener-extension-image-rewriter/app/app.go

@@ -94,7 +94,7 @@ func (o *Options) run(ctx context.Context) error {
 	o.extensionOptions.Completed().Apply(&podwebhook.DefaultAddOptions.Config)
 	o.extensionOptions.Completed().Apply(&imagewebhook.DefaultAddOptions.Config)
 	o.extensionOptions.Completed().Apply(&containerdwebhook.DefaultAddOptions.Config)
-	shootWebhookConfig, err := o.webhookOptions.Completed().AddToManager(ctx, mgr, nil, false)
+	shootWebhookConfig, err := o.webhookOptions.Completed().AddToManager(ctx, mgr, nil)
 	if err != nil {
 		return fmt.Errorf("could not add the mutating webhook to manager: %w", err)
 	}

cmd/gardener-extension-image-rewriter/app/options.go

@@ -43,6 +43,7 @@ func NewOptions() *Options {
 		"image-rewriter",
 		controller.ShootWebhooksResourceName,
 		nil,
+		nil,
 		webhookServerOptions,
 		webhookSwitches,
 	)

example/20-crd-extensions.gardener.cloud_clusters.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.20.1
   name: clusters.extensions.gardener.cloud
 spec:
   group: extensions.gardener.cloud

example/20-crd-extensions.gardener.cloud_extensions.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.20.1
   name: extensions.extensions.gardener.cloud
 spec:
   group: extensions.gardener.cloud

example/20-crd-resources.gardener.cloud_managedresources.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.20.1
   name: managedresources.resources.gardener.cloud
 spec:
   group: resources.gardener.cloud

hack/update-codegen.sh

@@ -8,14 +8,9 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-# setup virtual GOPATH
-source "$GARDENER_HACK_DIR"/vgopath-setup.sh
-
 CODE_GEN_DIR=$(go list -m -f '{{.Dir}}' k8s.io/code-generator)
 source "${CODE_GEN_DIR}/kube_codegen.sh"
 
-rm -f $GOPATH/bin/*-gen
-
 PROJECT_ROOT=$(dirname $0)/..
 
 kube::codegen::gen_helpers \

pkg/webhook/operatingsystemconfig/image/mutator.go

@@ -11,8 +11,8 @@ import (
 
 	extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
 	extensionswebhook "github.com/gardener/gardener/extensions/pkg/webhook"
+	extensionsv1alpha1helper "github.com/gardener/gardener/pkg/api/extensions/v1alpha1/helper"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
-	extensionsv1alpha1helper "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/helper"
 	gardenerutils "github.com/gardener/gardener/pkg/utils"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"

renovate.json5

@@ -27,13 +27,23 @@ The following dependencies have been updated:\n\
       groupName: "open-component-model",
       matchPackageNames: ["ocm.software/open-component-model/"],
     },
+    // Keep gardener/gardener and API modules in lockstep.
+    {
+      matchDatasources: ["go"],
+      groupName: "gardener-gardener",
+      matchPackageNames: [
+        "github.com/gardener/gardener",
+        "github.com/gardener/gardener/pkg/apis"
+      ]
+    },
     // The following list of dependencies is updated by `make generate` and restricts updates to type `patch`.
     // DO NOT EDIT THIS SECTION MANUALLY.
     {
       matchUpdateTypes: ["major", "minor"],
       enabled: false,
       matchPackageNames: [ // GENERATOR-PIN
         "github.com/ahmetb/gen-crd-api-reference-docs",
+        "github.com/gardener/gardener/pkg/apis",
         "github.com/go-logr/logr",
         "github.com/onsi/ginkgo/v2",
         "github.com/onsi/gomega",
@@ -55,15 +65,36 @@ The following dependencies have been updated:\n\
         "github.com/Masterminds/sprig/v3",
         "github.com/PaesslerAG/gval",
         "github.com/PaesslerAG/jsonpath",
+        "github.com/VictoriaMetrics/VictoriaLogs",
+        "github.com/VictoriaMetrics/VictoriaMetrics",
+        "github.com/VictoriaMetrics/easyproto",
+        "github.com/VictoriaMetrics/metrics",
+        "github.com/VictoriaMetrics/metricsql",
+        "github.com/VictoriaMetrics/operator/api",
         "github.com/andybalholm/brotli",
         "github.com/antlr4-go/antlr/v4",
+        "github.com/aws/aws-sdk-go-v2",
+        "github.com/aws/aws-sdk-go-v2/config",
+        "github.com/aws/aws-sdk-go-v2/credentials",
+        "github.com/aws/aws-sdk-go-v2/feature/ec2/imds",
+        "github.com/aws/aws-sdk-go-v2/internal/configsources",
+        "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2",
+        "github.com/aws/aws-sdk-go-v2/internal/ini",
+        "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding",
+        "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url",
+        "github.com/aws/aws-sdk-go-v2/service/sso",
+        "github.com/aws/aws-sdk-go-v2/service/ssooidc",
+        "github.com/aws/aws-sdk-go-v2/service/sts",
+        "github.com/aws/smithy-go",
         "github.com/beorn7/perks",
+        "github.com/bmatcuk/doublestar/v4",
         "github.com/brunoga/deep",
         "github.com/cenkalti/backoff/v5",
         "github.com/cespare/xxhash/v2",
         "github.com/coreos/go-systemd/v22",
         "github.com/cyphar/filepath-securejoin",
         "github.com/davecgh/go-spew",
+        "github.com/elliotchance/orderedmap/v3",
         "github.com/emicklei/go-restful/v3",
         "github.com/evanphx/json-patch/v5",
         "github.com/fatih/color",
@@ -80,7 +111,17 @@ The following dependencies have been updated:\n\
         "github.com/go-openapi/jsonpointer",
         "github.com/go-openapi/jsonreference",
         "github.com/go-openapi/swag",
+        "github.com/go-openapi/swag/cmdutils",
+        "github.com/go-openapi/swag/conv",
+        "github.com/go-openapi/swag/fileutils",
         "github.com/go-openapi/swag/jsonname",
+        "github.com/go-openapi/swag/jsonutils",
+        "github.com/go-openapi/swag/loading",
+        "github.com/go-openapi/swag/mangling",
+        "github.com/go-openapi/swag/netutils",
+        "github.com/go-openapi/swag/stringutils",
+        "github.com/go-openapi/swag/typeutils",
+        "github.com/go-openapi/swag/yamlutils",
         "github.com/go-task/slim-sprig/v3",
         "github.com/gobuffalo/flect",
         "github.com/gobwas/glob",
@@ -95,26 +136,21 @@ The following dependencies have been updated:\n\
         "github.com/google/pprof",
         "github.com/google/uuid",
         "github.com/gorilla/websocket",
-        "github.com/grafana/regexp",
         "github.com/grpc-ecosystem/grpc-gateway/v2",
         "github.com/hashicorp/errwrap",
         "github.com/hashicorp/go-multierror",
-        "github.com/hashicorp/go-version",
         "github.com/huandu/xstrings",
         "github.com/inconshreveable/mousetrap",
-        "github.com/ironcore-dev/vgopath",
-        "github.com/josharian/intern",
         "github.com/jpillora/backoff",
         "github.com/json-iterator/go",
+        "github.com/klauspost/compress",
         "github.com/kubernetes-csi/external-snapshotter/client/v4",
         "github.com/labstack/echo/v4",
         "github.com/labstack/gommon",
-        "github.com/mailru/easyjson",
         "github.com/mattn/go-colorable",
         "github.com/mattn/go-isatty",
         "github.com/mitchellh/copystructure",
         "github.com/mitchellh/hashstructure/v2",
-        "github.com/mitchellh/mapstructure",
         "github.com/mitchellh/reflectwalk",
         "github.com/moby/spdystream",
         "github.com/modern-go/concurrent",
@@ -124,31 +160,36 @@ The following dependencies have been updated:\n\
         "github.com/mwitkow/go-conntrack",
         "github.com/mxk/go-flowrate",
         "github.com/nexucis/lamenv",
-        "github.com/open-telemetry/opentelemetry-operator",
         "github.com/perses/common",
         "github.com/perses/perses",
         "github.com/perses/perses-operator",
         "github.com/pkg/errors",
         "github.com/pmezard/go-difflib",
         "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring",
+        "github.com/prometheus/alertmanager",
         "github.com/prometheus/client_golang",
         "github.com/prometheus/client_model",
         "github.com/prometheus/common",
         "github.com/prometheus/otlptranslator",
         "github.com/prometheus/procfs",
+        "github.com/prometheus/sigv4",
         "github.com/russross/blackfriday/v2",
         "github.com/santhosh-tekuri/jsonschema/v6",
         "github.com/shopspring/decimal",
         "github.com/sirupsen/logrus",
         "github.com/spf13/cast",
         "github.com/stoewer/go-strcase",
         "github.com/valyala/bytebufferpool",
+        "github.com/valyala/fastjson",
+        "github.com/valyala/fastrand",
         "github.com/valyala/fasttemplate",
+        "github.com/valyala/gozstd",
+        "github.com/valyala/histogram",
+        "github.com/valyala/quicktemplate",
         "github.com/x448/float16",
         "github.com/zitadel/oidc/v3",
         "github.com/zitadel/schema",
         "go.opentelemetry.io/auto/sdk",
-        "go.opentelemetry.io/collector/featuregate",
         "go.opentelemetry.io/contrib/otelconf",
         "go.opentelemetry.io/otel",
         "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc",
@@ -169,7 +210,6 @@ The following dependencies have been updated:\n\
         "go.opentelemetry.io/otel/sdk/metric",
         "go.opentelemetry.io/otel/trace",
         "go.opentelemetry.io/proto/otlp",
-        "go.uber.org/automaxprocs",
         "go.uber.org/mock",
         "go.uber.org/multierr",
         "go.uber.org/zap",
@@ -209,7 +249,9 @@ The following dependencies have been updated:\n\
         "k8s.io/kube-openapi",
         "k8s.io/kubelet",
         "k8s.io/metrics",
+        "k8s.io/pod-security-admission",
         "sigs.k8s.io/controller-tools",
+        "sigs.k8s.io/gateway-api",
         "sigs.k8s.io/json",
         "sigs.k8s.io/randfill",
         "sigs.k8s.io/structured-merge-diff/v6",