Skip to content

Commit f204146

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2853 from kubernetes-sigs/master
🌱 : update branch release-3.6 with the latest changes made on master to prepare it for the next release
2 parents 151b19a + 5c949c2 commit f204146

File tree

26 files changed

+54
-104
lines changed

26 files changed

+54
-104
lines changed

‎docs/book/src/component-config-tutorial/testdata/project/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ $(KUSTOMIZE): $(LOCALBIN)
124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
126126
$(CONTROLLER_GEN): $(LOCALBIN)
127-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
127+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
128128

129129
.PHONY: envtest
130130
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
131131
$(ENVTEST): $(LOCALBIN)
132-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
132+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

‎docs/book/src/cronjob-tutorial/testdata/project/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ $(KUSTOMIZE): $(LOCALBIN)
124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
126126
$(CONTROLLER_GEN): $(LOCALBIN)
127-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
127+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
128128

129129
.PHONY: envtest
130130
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
131131
$(ENVTEST): $(LOCALBIN)
132-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
132+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

‎docs/book/src/migration/manually_migration_guide_v2_v3.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,12 +481,12 @@ $(KUSTOMIZE): $(LOCALBIN)
481481
.PHONY: controller-gen
482482
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
483483
$(CONTROLLER_GEN): $(LOCALBIN)
484-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
484+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
485485
486486
.PHONY: envtest
487487
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
488488
$(ENVTEST): $(LOCALBIN)
489-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
489+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
490490
```
491491

492492
And then, to make your project use the `kustomize` version defined in the Makefile, replace all usage of `kustomize` with `$(KUSTOMIZE)`

‎docs/book/src/multiversion-tutorial/deployment.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ controller-manager deployment) onto the cluster.
4343

4444
## Testing
4545

46-
Once all of the bits are up an running on the cluster with conversion enabled, we can test out our
46+
Once all of the bits are up and running on the cluster with conversion enabled, we can test out our
4747
conversion by requesting different versions.
4848

4949
We'll make a v2 version based on our v1 version (put it under `config/samples`)

‎docs/book/src/multiversion-tutorial/testdata/project/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ $(KUSTOMIZE): $(LOCALBIN)
124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
126126
$(CONTROLLER_GEN): $(LOCALBIN)
127-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
127+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
128128

129129
.PHONY: envtest
130130
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
131131
$(ENVTEST): $(LOCALBIN)
132-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
132+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

‎pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,13 @@ var _ = Describe("{{ .Resource.Kind }} controller", func() {
135135
}
136136
137137
err = k8sClient.Create(ctx, {{ lower .Resource.Kind }})
138-
if err != nil {
139-
Expect(err).To(Not(HaveOccurred()))
140-
}
138+
Expect(err).To(Not(HaveOccurred()))
141139
}
142140
143141
By("Checking if the custom resource was successfully created")
144142
Eventually(func() error {
145143
found := &{{ .Resource.ImportAlias }}.{{ .Resource.Kind }}{}
146-
err = k8sClient.Get(ctx, typeNamespaceName, found)
147-
if err != nil {
148-
return err
149-
}
150-
return nil
144+
return k8sClient.Get(ctx, typeNamespaceName, found)
151145
}, time.Minute, time.Second).Should(Succeed())
152146
153147
By("Reconciling the custom resource created")
@@ -164,11 +158,7 @@ var _ = Describe("{{ .Resource.Kind }} controller", func() {
164158
By("Checking if Deployment was successfully created in the reconciliation")
165159
Eventually(func() error {
166160
found := &appsv1.Deployment{}
167-
err = k8sClient.Get(ctx, typeNamespaceName, found)
168-
if err != nil {
169-
return err
170-
}
171-
return nil
161+
return k8sClient.Get(ctx, typeNamespaceName, found)
172162
}, time.Minute, time.Second).Should(Succeed())
173163
})
174164
})

‎pkg/plugins/golang/v2/scaffolds/internal/templates/makefile.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,5 +178,5 @@ $(KUSTOMIZE): $(LOCALBIN)
178178
.PHONY: controller-gen
179179
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
180180
$(CONTROLLER_GEN): $(LOCALBIN)
181-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
181+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
182182
`

‎pkg/plugins/golang/v3/scaffolds/internal/templates/makefile.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ $(KUSTOMIZE): $(LOCALBIN)
183183
.PHONY: controller-gen
184184
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
185185
$(CONTROLLER_GEN): $(LOCALBIN)
186-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
186+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
187187
188188
.PHONY: envtest
189189
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
190190
$(ENVTEST): $(LOCALBIN)
191-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
191+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
192192
`

‎pkg/plugins/optional/grafana/v1alpha/scaffolds/internal/templates/runtime.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const controllerRuntimeTemplate = `{
105105
},
106106
{
107107
"datasource": "${DS_PROMETHEUS}",
108-
"description": "Total number of reconciliation per controller",
108+
"description": "Total number of reconciliations per controller",
109109
"fieldConfig": {
110110
"defaults": {
111111
"color": {
@@ -187,7 +187,7 @@ const controllerRuntimeTemplate = `{
187187
"refId": "A"
188188
}
189189
],
190-
"title": "Reconciliation Total Count Per Controller",
190+
"title": "Total Reconciliation Count Per Controller",
191191
"type": "timeseries"
192192
},
193193
{

‎testdata/project-v2/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ $(KUSTOMIZE): $(LOCALBIN)
122122
.PHONY: controller-gen
123123
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
124124
$(CONTROLLER_GEN): $(LOCALBIN)
125-
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
125+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)

0 commit comments

Comments
 (0)