Merge pull request #394 from ialidzhikov/automated-cherry-pick-of-#39…

…3-origin-release-v1.23 [release-v1.23] Automated cherry pick of #393: Vendor gardener/[email protected]
gardener · Feb 15, 2022 · 650fe77 · 650fe77
2 parents 031208b + 01899d1
commit 650fe77
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 15 deletions.
diff --git a/example/20-crd-extensions.gardener.cloud_bastions.yaml b/example/20-crd-extensions.gardener.cloud_bastions.yaml
@@ -292,8 +292,6 @@ spec:
                   what ever data it needs.
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
-            required:
-            - ingress
             type: object
         required:
         - spec

diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.2.0
 	github.com/coreos/go-systemd/v22 v22.3.2
 	github.com/gardener/etcd-druid v0.7.0
-	github.com/gardener/gardener v1.39.3
+	github.com/gardener/gardener v1.39.5
 	github.com/gardener/machine-controller-manager v0.41.0
 	github.com/go-logr/logr v0.4.0
 	github.com/golang/mock v1.6.0

diff --git a/go.sum b/go.sum
@@ -249,8 +249,8 @@ github.com/gardener/gardener v1.6.5/go.mod h1:w5IHIQDccvSxZJFOtBa8YConyyFgt07DBH
 github.com/gardener/gardener v1.11.3/go.mod h1:5DzqfOm+G8UftKu5zUbYJ+9Cnfd4XrvRNDabkM9AIp4=
 github.com/gardener/gardener v1.17.1/go.mod h1:uucRHq0xV46xd9MpJJjRswx/Slq3+ipbbJg09FVUtvM=
 github.com/gardener/gardener v1.23.0/go.mod h1:xS/sYyzYsq2W0C79mT98G/qoOTvy/hHTfApHIVF3v2o=
-github.com/gardener/gardener v1.39.3 h1:b6k3XyfA6bprbcuAr9E9Sand/enOQVcKdx59awVN3Ec=
-github.com/gardener/gardener v1.39.3/go.mod h1:NwK0dGM8H+lgLncEa0iQKWRLqGNqYHtDkwia+msLuc0=
+github.com/gardener/gardener v1.39.5 h1:i6vMyyU0LvW5nwGMgTdVXu6ymNK3jz+R25HarAnUsTk=
+github.com/gardener/gardener v1.39.5/go.mod h1:NwK0dGM8H+lgLncEa0iQKWRLqGNqYHtDkwia+msLuc0=
 github.com/gardener/gardener-resource-manager v0.10.0/go.mod h1:0pKTHOhvU91eQB0EYr/6Ymd7lXc/5Hi8P8tF/gpV0VQ=
 github.com/gardener/gardener-resource-manager v0.13.1/go.mod h1:0No/XttYRUwDn5lSppq9EqlKdo/XJQ44aCZz5BVu3Vw=
 github.com/gardener/gardener-resource-manager v0.18.0/go.mod h1:k53Yw2iDAIpTxnChQY9qFHrRtuPQWJDNnCP9eE6TnWQ=

diff --git a/.../gardener/gardener/extensions/pkg/controller/worker/genericactuator/actuator_reconcile.go b/.../gardener/gardener/extensions/pkg/controller/worker/genericactuator/actuator_reconcile.go
diff --git a/...r/github.com/gardener/gardener/extensions/pkg/controller/worker/genericactuator/update.go b/...r/github.com/gardener/gardener/extensions/pkg/controller/worker/genericactuator/update.go
diff --git a/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/types_bastion.go b/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/types_bastion.go
diff --git a/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/zz_generated.deepcopy.go
diff --git a/.../gardener/pkg/operation/botanist/component/extensions/crds/templates/crd-bastion.tpl.yaml b/.../gardener/pkg/operation/botanist/component/extensions/crds/templates/crd-bastion.tpl.yaml
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -56,7 +56,7 @@ github.com/gardener/etcd-druid/pkg/utils
 # github.com/gardener/external-dns-management v0.7.18
 github.com/gardener/external-dns-management/pkg/apis/dns
 github.com/gardener/external-dns-management/pkg/apis/dns/v1alpha1
-# github.com/gardener/gardener v1.39.3
+# github.com/gardener/gardener v1.39.5
 ## explicit
 github.com/gardener/gardener/.github
 github.com/gardener/gardener/.github/ISSUE_TEMPLATE