Skip to content

Commit e4c5bcf

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #6542 from sbueringer/pr-upgrade-controller-tools
🌱 Upgrade controller-tools to v0.9.1
2 parents 001c327 + 7bc9968 commit e4c5bcf

27 files changed

+142
-217
lines changed

‎Makefile

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ SETUP_ENVTEST_BIN := setup-envtest
8383
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
8484
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
8585

86-
CONTROLLER_GEN_VER := v0.8.0
86+
CONTROLLER_GEN_VER := v0.9.1
8787
CONTROLLER_GEN_BIN := controller-gen
8888
CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER))
8989
CONTROLLER_GEN_PKG := sigs.k8s.io/controller-tools/cmd/controller-gen
@@ -212,6 +212,7 @@ generate-manifests: $(addprefix generate-manifests-,$(ALL_GENERATE_MODULES)) ##
212212

213213
.PHONY: generate-manifests-core
214214
generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.g. CRD, RBAC etc. for core
215+
$(MAKE) clean-generated-yaml SRC_DIRS="./config/crd/bases"
215216
$(CONTROLLER_GEN) \
216217
paths=./api/... \
217218
paths=./internal/controllers/... \
@@ -235,6 +236,7 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.
235236

236237
.PHONY: generate-manifests-kubeadm-bootstrap
237238
generate-manifests-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc. for kubeadm bootstrap
239+
$(MAKE) clean-generated-yaml SRC_DIRS="./bootstrap/kubeadm/config/crd/bases"
238240
$(CONTROLLER_GEN) \
239241
paths=./bootstrap/kubeadm/api/... \
240242
paths=./bootstrap/kubeadm/internal/controllers/... \
@@ -247,6 +249,7 @@ generate-manifests-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate manifests e.
247249

248250
.PHONY: generate-manifests-kubeadm-control-plane
249251
generate-manifests-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc. for kubeadm control plane
252+
$(MAKE) clean-generated-yaml SRC_DIRS="./controlplane/kubeadm/config/crd/bases"
250253
$(CONTROLLER_GEN) \
251254
paths=./controlplane/kubeadm/api/... \
252255
paths=./controlplane/kubeadm/internal/controllers/... \
@@ -260,6 +263,7 @@ generate-manifests-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate manifest
260263

261264
.PHONY: generate-manifests-capd
262265
generate-manifests-capd: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc. for capd provider
266+
$(MAKE) clean-generated-yaml SRC_DIRS="$(CAPD_DIR)/config/crd/bases"
263267
cd $(CAPD_DIR); $(CONTROLLER_GEN) \
264268
paths=./api/... \
265269
paths=./$(EXP_DIR)/api/... \
@@ -277,6 +281,7 @@ generate-go-deepcopy: ## Run all generate-go-deepcopy-* targets
277281

278282
.PHONY: generate-go-deepcopy-core
279283
generate-go-deepcopy-core: $(CONTROLLER_GEN) ## Generate deepcopy go code for core
284+
$(MAKE) clean-generated-deepcopy SRC_DIRS="./api,./$(EXP_DIR)/api,./$(EXP_DIR)/addons/api,./$(EXP_DIR)/runtime/api,./$(EXP_DIR)/runtime/hooks/api"
280285
$(CONTROLLER_GEN) \
281286
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
282287
paths=./api/... \
@@ -290,19 +295,22 @@ generate-go-deepcopy-core: $(CONTROLLER_GEN) ## Generate deepcopy go code for co
290295

291296
.PHONY: generate-go-deepcopy-kubeadm-bootstrap
292297
generate-go-deepcopy-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate deepcopy go code for kubeadm bootstrap
298+
$(MAKE) clean-generated-deepcopy SRC_DIRS="./bootstrap/kubeadm/api,./bootstrap/kubeadm/types"
293299
$(CONTROLLER_GEN) \
294300
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
295301
paths=./bootstrap/kubeadm/api/... \
296302
paths=./bootstrap/kubeadm/types/...
297303

298304
.PHONY: generate-go-deepcopy-kubeadm-control-plane
299305
generate-go-deepcopy-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate deepcopy go code for kubeadm control plane
306+
$(MAKE) clean-generated-deepcopy SRC_DIRS="./controlplane/kubeadm/api"
300307
$(CONTROLLER_GEN) \
301308
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
302309
paths=./controlplane/kubeadm/api/...
303310

304311
.PHONY: generate-go-deepcopy-capd
305312
generate-go-deepcopy-capd: $(CONTROLLER_GEN) ## Generate deepcopy go code for capd
313+
$(MAKE) clean-generated-deepcopy SRC_DIRS="$(CAPD_DIR)/api,$(CAPD_DIR)/$(EXP_DIR)/api"
306314
cd $(CAPD_DIR); $(CONTROLLER_GEN) \
307315
object:headerFile=../../../hack/boilerplate/boilerplate.generatego.txt \
308316
paths=./api/... \
@@ -928,6 +936,14 @@ clean-manifests:
928936
clean-release-git: ## Restores the git files usually modified during a release
929937
git restore ./*manager_image_patch.yaml ./*manager_pull_policy.yaml
930938

939+
.PHONY: clean-generated-yaml
940+
clean-generated-yaml: ## Remove files generated by conversion-gen from the mentioned dirs. Example SRC_DIRS="./api/v1alpha4"
941+
(IFS=','; for i in $(SRC_DIRS); do find $$i -type f -name '*.yaml' -exec rm -f {} \;; done)
942+
943+
.PHONY: clean-generated-deepcopy
944+
clean-generated-deepcopy: ## Remove files generated by conversion-gen from the mentioned dirs. Example SRC_DIRS="./api/v1alpha4"
945+
(IFS=','; for i in $(SRC_DIRS); do find $$i -type f -name 'zz_generated.deepcopy*' -exec rm -f {} \;; done)
946+
931947
.PHONY: clean-generated-conversions
932948
clean-generated-conversions: ## Remove files generated by conversion-gen from the mentioned dirs. Example SRC_DIRS="./api/v1alpha4"
933949
(IFS=','; for i in $(SRC_DIRS); do find $$i -type f -name 'zz_generated.conversion*' -exec rm -f {} \;; done)

‎bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.1
77
creationTimestamp: null
88
name: kubeadmconfigs.bootstrap.cluster.x-k8s.io
99
spec:
@@ -3082,9 +3082,3 @@ spec:
30823082
storage: true
30833083
subresources:
30843084
status: {}
3085-
status:
3086-
acceptedNames:
3087-
kind: ""
3088-
plural: ""
3089-
conditions: []
3090-
storedVersions: []

‎bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.1
77
creationTimestamp: null
88
name: kubeadmconfigtemplates.bootstrap.cluster.x-k8s.io
99
spec:
@@ -3069,9 +3069,3 @@ spec:
30693069
served: true
30703070
storage: true
30713071
subresources: {}
3072-
status:
3073-
acceptedNames:
3074-
kind: ""
3075-
plural: ""
3076-
conditions: []
3077-
storedVersions: []

‎cmd/clusterctl/config/crd/bases/clusterctl.cluster.x-k8s.io_metadata.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.1
77
creationTimestamp: null
88
name: metadata.clusterctl.cluster.x-k8s.io
99
spec:
@@ -52,9 +52,3 @@ spec:
5252
type: object
5353
served: true
5454
storage: true
55-
status:
56-
acceptedNames:
57-
kind: ""
58-
plural: ""
59-
conditions: []
60-
storedVersions: []

‎cmd/clusterctl/config/crd/bases/clusterctl.cluster.x-k8s.io_providers.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.1
77
creationTimestamp: null
88
name: providers.clusterctl.cluster.x-k8s.io
99
spec:
@@ -69,9 +69,3 @@ spec:
6969
served: true
7070
storage: true
7171
subresources: {}
72-
status:
73-
acceptedNames:
74-
kind: ""
75-
plural: ""
76-
conditions: []
77-
storedVersions: []

‎cmd/clusterctl/config/manifest/clusterctl-api.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.8.0
5+
controller-gen.kubebuilder.io/version: v0.9.1
66
creationTimestamp: null
77
name: providers.clusterctl.cluster.x-k8s.io
88
spec:
@@ -68,9 +68,3 @@ spec:
6868
served: true
6969
storage: true
7070
subresources: {}
71-
status:
72-
acceptedNames:
73-
kind: ""
74-
plural: ""
75-
conditions: []
76-
storedVersions: []

‎config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.1
77
creationTimestamp: null
88
name: clusterresourcesetbindings.addons.cluster.x-k8s.io
99
spec:
@@ -276,9 +276,3 @@ spec:
276276
storage: true
277277
subresources:
278278
status: {}
279-
status:
280-
acceptedNames:
281-
kind: ""
282-
plural: ""
283-
conditions: []
284-
storedVersions: []

‎config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.1
77
creationTimestamp: null
88
name: clusterresourcesets.addons.cluster.x-k8s.io
99
spec:
@@ -501,9 +501,3 @@ spec:
501501
storage: true
502502
subresources:
503503
status: {}
504-
status:
505-
acceptedNames:
506-
kind: ""
507-
plural: ""
508-
conditions: []
509-
storedVersions: []

‎config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.1
77
creationTimestamp: null
88
name: clusterclasses.cluster.x-k8s.io
99
spec:
@@ -93,6 +93,7 @@ spec:
9393
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
9494
type: string
9595
type: object
96+
x-kubernetes-map-type: atomic
9697
required:
9798
- ref
9899
type: object
@@ -158,6 +159,7 @@ spec:
158159
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
159160
type: string
160161
type: object
162+
x-kubernetes-map-type: atomic
161163
required:
162164
- ref
163165
type: object
@@ -205,6 +207,7 @@ spec:
205207
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
206208
type: string
207209
type: object
210+
x-kubernetes-map-type: atomic
208211
required:
209212
- ref
210213
type: object
@@ -282,6 +285,7 @@ spec:
282285
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
283286
type: string
284287
type: object
288+
x-kubernetes-map-type: atomic
285289
required:
286290
- ref
287291
type: object
@@ -336,6 +340,7 @@ spec:
336340
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
337341
type: string
338342
type: object
343+
x-kubernetes-map-type: atomic
339344
required:
340345
- ref
341346
type: object
@@ -470,6 +475,7 @@ spec:
470475
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
471476
type: string
472477
type: object
478+
x-kubernetes-map-type: atomic
473479
unhealthyConditions:
474480
description: UnhealthyConditions contains a list of the conditions
475481
that determine whether a node is considered unhealthy. The
@@ -548,6 +554,7 @@ spec:
548554
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
549555
type: string
550556
type: object
557+
x-kubernetes-map-type: atomic
551558
required:
552559
- ref
553560
type: object
@@ -613,6 +620,7 @@ spec:
613620
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
614621
type: string
615622
type: object
623+
x-kubernetes-map-type: atomic
616624
required:
617625
- ref
618626
type: object
@@ -660,6 +668,7 @@ spec:
660668
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
661669
type: string
662670
type: object
671+
x-kubernetes-map-type: atomic
663672
required:
664673
- ref
665674
type: object
@@ -1049,6 +1058,7 @@ spec:
10491058
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
10501059
type: string
10511060
type: object
1061+
x-kubernetes-map-type: atomic
10521062
unhealthyConditions:
10531063
description: UnhealthyConditions contains a list of
10541064
the conditions that determine whether a node is considered
@@ -1141,6 +1151,7 @@ spec:
11411151
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
11421152
type: string
11431153
type: object
1154+
x-kubernetes-map-type: atomic
11441155
required:
11451156
- ref
11461157
type: object
@@ -1195,6 +1206,7 @@ spec:
11951206
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
11961207
type: string
11971208
type: object
1209+
x-kubernetes-map-type: atomic
11981210
required:
11991211
- ref
12001212
type: object
@@ -1237,9 +1249,3 @@ spec:
12371249
served: true
12381250
storage: true
12391251
subresources: {}
1240-
status:
1241-
acceptedNames:
1242-
kind: ""
1243-
plural: ""
1244-
conditions: []
1245-
storedVersions: []

0 commit comments

Comments
 (0)