Vendor gardener/gardener@v1.39.4

Signed-off-by: ialidzhikov <i.alidjikov@gmail.com>
gardener · Feb 8, 2022 · 87653b4 · 87653b4
1 parent 5a4f363
commit 87653b4
Show file tree

Hide file tree

Showing 17 changed files with 98 additions and 64 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
@@ -9,7 +9,7 @@ require (
 	github.com/aws/aws-sdk-go v1.38.19
 	github.com/coreos/go-systemd/v22 v22.3.2
 	github.com/gardener/etcd-druid v0.7.0
-	github.com/gardener/gardener v1.39.0
+	github.com/gardener/gardener v1.39.4
 	github.com/gardener/machine-controller-manager v0.42.0
 	github.com/go-logr/logr v0.4.0
 	github.com/golang/mock v1.6.0

diff --git a/go.sum b/go.sum
@@ -251,8 +251,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.0 h1:DTtuSlgV7yZnJHmh8tRdLi2pBm6fQ6LdpueFQ0nBErM=
-github.com/gardener/gardener v1.39.0/go.mod h1:NwK0dGM8H+lgLncEa0iQKWRLqGNqYHtDkwia+msLuc0=
+github.com/gardener/gardener v1.39.4 h1:El48zEYEKJGTqe91S9YTikopGicOnjHe3tNAhuz0tp8=
+github.com/gardener/gardener v1.39.4/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/pkg/controller/bastion/actuator_reconcile.go b/pkg/controller/bastion/actuator_reconcile.go
@@ -73,7 +73,7 @@ func (a *actuator) Reconcile(ctx context.Context, bastion *extensionsv1alpha1.Ba
 	// once a public endpoint is available, publish the endpoint on the
 	// Bastion resource to notify upstream about the ready instance
 	patch := client.MergeFrom(bastion.DeepCopy())
-	bastion.Status.Ingress = *endpoints.public
+	bastion.Status.Ingress = endpoints.public
 	return a.Client().Status().Patch(ctx, bastion, patch)
 }
 

diff --git a/test/integration/bastion/bastion_test.go b/test/integration/bastion/bastion_test.go
@@ -228,7 +228,7 @@ var _ = Describe("Bastion tests", func() {
 		Expect(c.Get(ctx, client.ObjectKey{Namespace: bastion.Namespace, Name: bastion.Name}, bastion)).To(Succeed())
 
 		By("verify the bastion's status contains endpoints")
-		Expect(bastionctrl.IngressReady(&bastion.Status.Ingress)).To(BeTrue())
+		Expect(bastionctrl.IngressReady(bastion.Status.Ingress)).To(BeTrue())
 
 		By("verify cloud resources")
 		verifyCreation(ctx, awsClient, options)

diff --git a/....com/gardener/gardener/extensions/pkg/controller/controlplane/genericactuator/actuator.go b/....com/gardener/gardener/extensions/pkg/controller/controlplane/genericactuator/actuator.go
diff --git a/...om/gardener/gardener/extensions/pkg/controller/worker/genericactuator/actuator_restore.go b/...om/gardener/gardener/extensions/pkg/controller/worker/genericactuator/actuator_restore.go
diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/helper/helpers.go b/vendor/github.com/gardener/gardener/pkg/apis/core/helper/helpers.go
diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/helper/helper.go b/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/helper/helper.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/...botanist/component/extensions/operatingsystemconfig/original/components/kubelet/config.go b/...botanist/component/extensions/operatingsystemconfig/original/components/kubelet/config.go
diff --git a/...ub.com/gardener/gardener/pkg/operation/botanist/component/kubeapiserver/kube_apiserver.go b/...ub.com/gardener/gardener/pkg/operation/botanist/component/kubeapiserver/kube_apiserver.go
diff --git a/vendor/github.com/gardener/gardener/pkg/operation/botanist/controlplane.go b/vendor/github.com/gardener/gardener/pkg/operation/botanist/controlplane.go
diff --git a/vendor/github.com/gardener/gardener/pkg/operation/botanist/secrets.go b/vendor/github.com/gardener/gardener/pkg/operation/botanist/secrets.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -119,7 +119,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.0
+# github.com/gardener/gardener v1.39.4
 ## explicit
 github.com/gardener/gardener/.github
 github.com/gardener/gardener/.github/ISSUE_TEMPLATE