From db829eff104073e5ad92bcea0b3eeac7ce87e266 Mon Sep 17 00:00:00 2001 From: ialidzhikov Date: Fri, 17 Nov 2023 11:39:13 +0200 Subject: [PATCH] Vendor gardener/gardener@v1.83.2 --- go.mod | 2 +- go.sum | 4 ++-- .../gardener/gardener/extensions/pkg/util/shoot_clients.go | 2 +- vendor/github.com/gardener/gardener/hack/generate-crds.sh | 2 +- vendor/modules.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 6a861c75..1599ae08 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/ahmetb/gen-crd-api-reference-docs v0.3.0 - github.com/gardener/gardener v1.83.1 + github.com/gardener/gardener v1.83.2 github.com/go-logr/logr v1.2.4 github.com/onsi/ginkgo/v2 v2.12.1 github.com/onsi/gomega v1.27.10 diff --git a/go.sum b/go.sum index 32be7531..ea9ce906 100644 --- a/go.sum +++ b/go.sum @@ -136,8 +136,8 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/gardener/etcd-druid v0.20.1 h1:o6F4higujfg7dvBXvk+yPb86+3t2+XLE0Hmw5W1kXtM= github.com/gardener/etcd-druid v0.20.1/go.mod h1:1tAeHycB0Vb2GfCX6sUCc6V6frGrCQI//quVg4K3GNA= -github.com/gardener/gardener v1.83.1 h1:+Bm9U/kgoIQRhaz33QU6jyUJVVoT7bbmMT/CLapwHHU= -github.com/gardener/gardener v1.83.1/go.mod h1:WbCEy0CuG3fk1QFDeQeagwvWRtA7FaiuP9ska9EA7Xc= +github.com/gardener/gardener v1.83.2 h1:Ia2vz0vjbL8ZuBIBBmiphLl3xBCwXmsY3Grc/YylkWk= +github.com/gardener/gardener v1.83.2/go.mod h1:WbCEy0CuG3fk1QFDeQeagwvWRtA7FaiuP9ska9EA7Xc= 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.50.0 h1:3dcQjzueFU1TGgprV00adjb3OCR99myTBx8DQGxywks= diff --git a/vendor/github.com/gardener/gardener/extensions/pkg/util/shoot_clients.go b/vendor/github.com/gardener/gardener/extensions/pkg/util/shoot_clients.go index 9570a197..cb3c8ebb 100644 --- a/vendor/github.com/gardener/gardener/extensions/pkg/util/shoot_clients.go +++ b/vendor/github.com/gardener/gardener/extensions/pkg/util/shoot_clients.go @@ -111,7 +111,7 @@ func NewClientForShoot(ctx context.Context, c client.Client, namespace string, o // TODO(ary1992): The new rest mapper implementation doesn't return a NoKindMatchError but a ErrGroupDiscoveryFailed // when an API GroupVersion is not present in the cluster. Remove the old restmapper usage once the upstream issue // (https://github.com/kubernetes-sigs/controller-runtime/pull/2425) is fixed. - mapper, err := thirdpartyapiutil.NewDynamicRESTMapper(shootRESTConfig) + mapper, err := thirdpartyapiutil.NewDynamicRESTMapper(shootRESTConfig, thirdpartyapiutil.WithLazyDiscovery) if err != nil { return nil, nil, fmt.Errorf("failed to create new DynamicRESTMapper: %w", err) } diff --git a/vendor/github.com/gardener/gardener/hack/generate-crds.sh b/vendor/github.com/gardener/gardener/hack/generate-crds.sh index 179994a5..3b3f30b4 100755 --- a/vendor/github.com/gardener/gardener/hack/generate-crds.sh +++ b/vendor/github.com/gardener/gardener/hack/generate-crds.sh @@ -105,7 +105,7 @@ generate_group () { # etcd-druid, due to adverse interaction with VPA. # See https://github.com/gardener/gardener/pull/6850 and https://github.com/gardener/gardener/pull/8560#discussion_r1347470394 # TODO(shreyas-s-rao): Remove this workaround as soon as the scale subresource is supported properly. - etcd_api_types_file="$(dirname "$0")/../vendor/github.com/gardener/etcd-druid/api/v1alpha1/types_etcd.go" + etcd_api_types_file="${package_path%;}/types_etcd.go" sed -i '/\/\/ +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.labelSelector/d' "$etcd_api_types_file" $generate git checkout "$etcd_api_types_file" diff --git a/vendor/modules.txt b/vendor/modules.txt index 3b94f097..e3cd19ed 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -72,7 +72,7 @@ github.com/fsnotify/fsnotify # github.com/gardener/etcd-druid v0.20.1 ## explicit; go 1.20 github.com/gardener/etcd-druid/api/v1alpha1 -# github.com/gardener/gardener v1.83.1 +# github.com/gardener/gardener v1.83.2 ## explicit; go 1.21 github.com/gardener/gardener/.github github.com/gardener/gardener/.github/ISSUE_TEMPLATE