Vendor gardener/[email protected] (#430)

* make `make revendor` deterministic * Add tools to `make generate` * Upgrade gardener/gardener * Add replace directives for hvpa-controller * [automated] make revendor * [automated] make generate
gardener · Apr 19, 2022 · 412d355 · 412d355
1 parent 7ae1d00
commit 412d355
Show file tree

Hide file tree

Showing 75 changed files with 2,588 additions and 4,158 deletions.
diff --git a/Makefile b/Makefile
@@ -110,8 +110,8 @@ install-requirements:
 
 .PHONY: revendor
 revendor:
-	@GO111MODULE=on go mod vendor
 	@GO111MODULE=on go mod tidy
+	@GO111MODULE=on go mod vendor
 	@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/*
 	@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/.ci/*
 	@$(REPO_ROOT)/hack/update-github-templates.sh
@@ -136,7 +136,7 @@ check-docforge: $(DOCFORGE)
 	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check-docforge.sh $(REPO_ROOT) $(REPO_ROOT)/.docforge/manifest.yaml ".docforge/;docs/" "gardener-extension-provider-openstack" false
 
 .PHONY: generate
-generate:
+generate: $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(MOCKGEN)
 	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/generate.sh ./charts/... ./cmd/... ./example/... ./pkg/...
 
 .PHONY: format

diff --git a/example/20-crd-druid.gardener.cloud_etcds.yaml b/example/20-crd-druid.gardener.cloud_etcds.yaml
@@ -47,12 +47,12 @@ spec:
                   type: string
                 type: object
               backup:
-                description: BackupSpec defines parametes associated with the full
-                  and delta snapshots of etcd
+                description: BackupSpec defines parameters associated with the full
+                  and delta snapshots of etcd.
                 properties:
                   compactionResources:
-                    description: 'CompactionResources defines the compute Resources
-                      required by compaction job. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+                    description: 'CompactionResources defines compute Resources required
+                      by compaction job. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                     properties:
                       limits:
                         additionalProperties:
@@ -130,6 +130,19 @@ spec:
                   image:
                     description: Image defines the etcd container image and tag
                     type: string
+                  leaderElection:
+                    description: LeaderElection defines parameters related to the
+                      LeaderElection configuration.
+                    properties:
+                      etcdConnectionTimeout:
+                        description: EtcdConnectionTimeout defines the timeout duration
+                          for etcd client connection during leader election.
+                        type: string
+                      reelectionPeriod:
+                        description: ReelectionPeriod defines the Period after which
+                          leadership status of corresponding etcd is checked.
+                        type: string
+                    type: object
                   ownerCheck:
                     description: OwnerCheck defines parameters related to checking
                       if the cluster owner, as specified in the owner DNS record,
@@ -157,12 +170,12 @@ spec:
                     type: object
                   port:
                     description: Port define the port on which etcd-backup-restore
-                      server will exposed.
+                      server will be exposed.
                     format: int32
                     type: integer
                   resources:
-                    description: 'Resources defines the compute Resources required
-                      by backup-restore container. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+                    description: 'Resources defines compute Resources required by
+                      backup-restore container. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                     properties:
                       limits:
                         additionalProperties:
@@ -247,9 +260,12 @@ spec:
                             type: string
                         type: object
                       tlsCASecretRef:
-                        description: SecretReference represents a Secret Reference.
-                          It has enough information to retrieve secret in any namespace
+                        description: SecretReference defines a reference to a secret.
                         properties:
+                          dataKey:
+                            description: DataKey is the name of the key in the data
+                              map containing the credentials.
+                            type: string
                           name:
                             description: Name is unique within a namespace to reference
                               a secret resource.
@@ -292,6 +308,10 @@ spec:
                     description: EtcdDefragTimeout defines the timeout duration for
                       etcd defrag call
                     type: string
+                  heartbeatDuration:
+                    description: HeartbeatDuration defines the duration for members
+                      to send heartbeats. The default value is 10s.
+                    type: string
                   image:
                     description: Image defines the etcd container image and tag
                     type: string
@@ -369,9 +389,12 @@ spec:
                             type: string
                         type: object
                       tlsCASecretRef:
-                        description: SecretReference represents a Secret Reference.
-                          It has enough information to retrieve secret in any namespace
+                        description: SecretReference defines a reference to a secret.
                         properties:
+                          dataKey:
+                            description: DataKey is the name of the key in the data
+                              map containing the credentials.
+                            type: string
                           name:
                             description: Name is unique within a namespace to reference
                               a secret resource.
@@ -396,6 +419,7 @@ spec:
                   shall be used for the etcd pods.
                 type: string
               replicas:
+                format: int32
                 type: integer
               selector:
                 description: 'selector is a label query over pods that should match

diff --git a/go.mod b/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/Masterminds/sprig v2.22.0+incompatible
 	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.43.2
+	github.com/gardener/etcd-druid v0.8.0
+	github.com/gardener/gardener v1.44.0
 	github.com/gardener/machine-controller-manager v0.41.0
 	github.com/go-logr/logr v1.2.0
 	github.com/golang/mock v1.6.0
@@ -25,7 +25,7 @@ require (
 	k8s.io/apiextensions-apiserver v0.23.3
 	k8s.io/apimachinery v0.23.3
 	k8s.io/apiserver v0.23.3
-	k8s.io/autoscaler/vertical-pod-autoscaler v0.0.0-00010101000000-000000000000
+	k8s.io/autoscaler/vertical-pod-autoscaler v0.9.0
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
 	k8s.io/code-generator v0.23.3
 	k8s.io/component-base v0.23.3
@@ -50,3 +50,9 @@ replace (
 	k8s.io/helm => k8s.io/helm v2.13.1+incompatible
 	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.3
 )
+
+// workaround for https://github.com/gardener/hvpa-controller/issues/92, remove once it's fixed
+replace (
+	github.com/gardener/hvpa-controller => github.com/gardener/hvpa-controller v0.4.0
+	github.com/gardener/hvpa-controller/api => github.com/gardener/hvpa-controller/api v0.4.0
+)