Skip to content

Commit 2dd66d6

Browse files
authored
Merge pull request #3749 from srm09/v1alpha4-types
⚠️ Generate v1alpha4 types
2 parents 36611d1 + e73e3d9 commit 2dd66d6

File tree

313 files changed

+11418
-3731
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

313 files changed

+11418
-3731
lines changed

Makefile

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,12 @@ generate-go-core: $(CONTROLLER_GEN) $(CONVERSION_GEN)
231231
paths=./$(EXP_DIR)/api/... \
232232
paths=./$(EXP_DIR)/addons/api/... \
233233
paths=./cmd/clusterctl/...
234+
$(MAKE) clean-generated-conversions SRC_DIRS="./api/v1alpha3,./$(EXP_DIR)/api/v1alpha3,./$(EXP_DIR)/addons/api/v1alpha3"
234235
$(CONVERSION_GEN) \
235-
--input-dirs=./api/v1alpha2 \
236+
--input-dirs=./api/v1alpha3 \
237+
--input-dirs=./$(EXP_DIR)/api/v1alpha3 \
238+
--input-dirs=./$(EXP_DIR)/addons/api/v1alpha3 \
239+
--build-tag=ignore_autogenerated_core_v1alpha3 \
236240
--output-file-base=zz_generated.conversion \
237241
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
238242

@@ -242,8 +246,11 @@ generate-go-kubeadm-bootstrap: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs Go re
242246
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
243247
paths=./bootstrap/kubeadm/api/... \
244248
paths=./bootstrap/kubeadm/types/...
249+
$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/api"
245250
$(CONVERSION_GEN) \
246-
--input-dirs=./bootstrap/kubeadm/api/v1alpha2 \
251+
--input-dirs=./bootstrap/kubeadm/api/v1alpha3 \
252+
--build-tag=ignore_autogenerated_kubeadm_bootstrap_v1alpha3 \
253+
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3 \
247254
--output-file-base=zz_generated.conversion \
248255
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
249256

@@ -252,6 +259,13 @@ generate-go-kubeadm-control-plane: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs G
252259
$(CONTROLLER_GEN) \
253260
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
254261
paths=./controlplane/kubeadm/api/...
262+
$(MAKE) clean-generated-conversions SRC_DIRS="./controlplane/kubeadm/api"
263+
$(CONVERSION_GEN) \
264+
--input-dirs=./controlplane/kubeadm/api/v1alpha3 \
265+
--build-tag=ignore_autogenerated_kubeadm_controlplane_v1alpha3 \
266+
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha3,sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3 \
267+
--output-file-base=zz_generated.conversion \
268+
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
255269

256270
.PHONY: generate-bindata
257271
generate-bindata: $(KUSTOMIZE) $(GOBINDATA) clean-bindata $(CLOUDINIT_GENERATED) ## Generate code for embedding the clusterctl api manifest
@@ -613,3 +627,6 @@ diagrams: ## Build proposal diagrams
613627
serve-book: ## Build and serve the book with live-reloading enabled
614628
$(MAKE) -C docs/book serve
615629

630+
.PHONY: clean-generated-conversions
631+
clean-generated-conversions: ## Remove files generated by conversion-gen from the mentioned dirs
632+
(IFS=','; for i in $(SRC_DIRS); do find $$i -type f -name 'zz_generated.conversion*' -exec rm -f {} \;; done)

PROJECT

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,32 @@ domain: x-k8s.io
33
repo: sigs.k8s.io/cluster-api
44
resources:
55
- group: cluster
6-
version: v1alpha2
6+
version: v1alpha3
77
kind: Cluster
88
- group: cluster
9-
version: v1alpha2
9+
version: v1alpha3
1010
kind: Machine
1111
- group: cluster
12-
version: v1alpha2
12+
version: v1alpha3
1313
kind: MachineSet
1414
- group: cluster
15-
version: v1alpha2
15+
version: v1alpha3
1616
kind: MachineDeployment
1717
- group: cluster
1818
version: v1alpha3
19+
kind: MachinePool
20+
- group: cluster
21+
version: v1alpha4
1922
kind: Cluster
2023
- group: cluster
21-
version: v1alpha3
24+
version: v1alpha4
2225
kind: Machine
2326
- group: cluster
24-
version: v1alpha3
27+
version: v1alpha4
2528
kind: MachineSet
2629
- group: cluster
27-
version: v1alpha3
30+
version: v1alpha4
2831
kind: MachineDeployment
2932
- group: cluster
30-
version: v1alpha3
33+
version: v1alpha4
3134
kind: MachinePool

api/v1alpha2/cluster_webhook.go

Lines changed: 0 additions & 31 deletions
This file was deleted.

api/v1alpha2/clusterlist_webhook.go

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)