Skip to content

Commit de16e84

Browse files
sbueringersbueringer
committed
update
1 parent 0ae94c2 commit de16e84

File tree

25 files changed

+246
-6361
lines changed

25 files changed

+246
-6361
lines changed

‎Makefile

Lines changed: 43 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ OBSERVABILITY_DIR := hack/observability
7070

7171
export PATH := $(abspath $(TOOLS_BIN_DIR)):$(PATH)
7272

73-
# Set --output-base for conversion-gen if we are not within GOPATH
73+
# Set --output-dir for conversion-gen if we are not within GOPATH
7474
ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/sigs.k8s.io/cluster-api)
75-
CONVERSION_GEN_OUTPUT_BASE := --output-base=$(ROOT_DIR)
76-
CONVERSION_GEN_OUTPUT_BASE_CAPD := --output-base=$(ROOT_DIR)/$(CAPD_DIR)
75+
CONVERSION_GEN_OUTPUT_BASE := --output-dir=$(ROOT_DIR)
76+
CONVERSION_GEN_OUTPUT_BASE_CAPD := --output-dir=$(ROOT_DIR)/$(CAPD_DIR)
7777
else
7878
export GOPATH := $(shell go env GOPATH)
7979
endif
@@ -184,6 +184,7 @@ IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss
184184
CONVERSION_VERIFIER_BIN := conversion-verifier
185185
CONVERSION_VERIFIER := $(abspath $(TOOLS_BIN_DIR)/$(CONVERSION_VERIFIER_BIN))
186186

187+
# OPENAPI_GEN_VER := dc4e619 # main branch as of 22.04.2024 FIXME: try again
187188
OPENAPI_GEN_VER := 70dd376
188189
OPENAPI_GEN_BIN := openapi-gen
189190
# We are intentionally using the binary without version suffix, to avoid the version
@@ -447,90 +448,82 @@ generate-go-conversions-core: ## Run all generate-go-conversions-core-* targets
447448
generate-go-conversions-core-api: $(CONVERSION_GEN) ## Generate conversions go code for core api
448449
$(MAKE) clean-generated-conversions SRC_DIRS="./internal/apis/core/v1alpha3,./internal/apis/core/v1alpha4"
449450
$(CONVERSION_GEN) \
450-
--input-dirs=./internal/apis/core/v1alpha3 \
451-
--input-dirs=./internal/apis/core/v1alpha4 \
452-
--build-tag=ignore_autogenerated_core \
453-
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
454-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
451+
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
452+
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
453+
./internal/apis/core/v1alpha3 \
454+
./internal/apis/core/v1alpha4
455455

456456
.PHONY: generate-go-conversions-core-exp
457457
generate-go-conversions-core-exp: $(CONVERSION_GEN) ## Generate conversions go code for core exp
458458
$(MAKE) clean-generated-conversions SRC_DIRS="./internal/apis/core/exp/v1alpha3,./internal/apis/core/exp/addons/v1alpha3,./internal/apis/core/exp/v1alpha4,./internal/apis/core/exp/addons/v1alpha4"
459459
$(CONVERSION_GEN) \
460-
--input-dirs=./internal/apis/core/exp/v1alpha3 \
461-
--input-dirs=./internal/apis/core/exp/v1alpha4 \
462-
--input-dirs=./internal/apis/core/exp/addons/v1alpha3 \
463-
--input-dirs=./internal/apis/core/exp/addons/v1alpha4 \
464-
--build-tag=ignore_autogenerated_core_exp \
465460
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \
466461
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \
467-
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
468-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
462+
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
463+
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
464+
./internal/apis/core/exp/v1alpha3 \
465+
./internal/apis/core/exp/v1alpha4 \
466+
./internal/apis/core/exp/addons/v1alpha3 \
467+
./internal/apis/core/exp/addons/v1alpha4
469468

470469
.PHONY: generate-go-conversions-core-exp-ipam
471470
generate-go-conversions-core-exp-ipam: $(CONVERSION_GEN) ## Generate conversions go code for core exp IPAM
472471
$(MAKE) clean-generated-conversions SRC_DIRS="./$(EXP_DIR)/ipam/api/v1alpha1"
473472
$(CONVERSION_GEN) \
474-
--input-dirs=./$(EXP_DIR)/ipam/api/v1alpha1 \
475-
--build-tag=ignore_autogenerated_core_exp_ipam \
476-
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
477-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
473+
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
474+
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
475+
./$(EXP_DIR)/ipam/api/v1alpha1
478476

479477
.PHONY: generate-go-conversions-core-runtime
480478
generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions go code for core runtime
481479
$(MAKE) clean-generated-conversions SRC_DIRS="./internal/runtime/test/v1alpha1,./internal/runtime/test/v1alpha2"
482480
$(CONVERSION_GEN) \
483-
--input-dirs=./internal/runtime/test/v1alpha1 \
484-
--input-dirs=./internal/runtime/test/v1alpha2 \
485-
--build-tag=ignore_autogenerated_core_runtime \
486-
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
487-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
481+
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
482+
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
483+
./internal/runtime/test/v1alpha1 \
484+
./internal/runtime/test/v1alpha2
488485

489486
.PHONY: generate-go-conversions-kubeadm-bootstrap
490487
generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm bootstrap
491488
$(MAKE) clean-generated-conversions SRC_DIRS="./internal/apis/bootstrap/kubeadm"
492489
$(CONVERSION_GEN) \
493-
--input-dirs=./internal/apis/bootstrap/kubeadm/v1alpha3 \
494-
--input-dirs=./internal/apis/bootstrap/kubeadm/v1alpha4 \
495-
--build-tag=ignore_autogenerated_kubeadm_bootstrap \
496490
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \
497491
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \
498-
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
499-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
492+
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
493+
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
494+
./internal/apis/bootstrap/kubeadm/v1alpha3 \
495+
./internal/apis/bootstrap/kubeadm/v1alpha4
500496
$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/types/upstreamv1beta2,./bootstrap/kubeadm/types/upstreamv1beta3"
501497
$(CONVERSION_GEN) \
502-
--input-dirs=./bootstrap/kubeadm/types/upstreamv1beta2 \
503-
--input-dirs=./bootstrap/kubeadm/types/upstreamv1beta3 \
504-
--build-tag=ignore_autogenerated_kubeadm_types \
505-
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
506-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
498+
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
499+
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
500+
./bootstrap/kubeadm/types/upstreamv1beta2 \
501+
./bootstrap/kubeadm/types/upstreamv1beta3
507502

508503
.PHONY: generate-go-conversions-kubeadm-control-plane
509504
generate-go-conversions-kubeadm-control-plane: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm control plane
510505
$(MAKE) clean-generated-conversions SRC_DIRS="./internal/apis/controlplane/kubeadm"
511506
$(CONVERSION_GEN) \
512-
--input-dirs=./internal/apis/controlplane/kubeadm/v1alpha3 \
513-
--input-dirs=./internal/apis/controlplane/kubeadm/v1alpha4 \
514-
--build-tag=ignore_autogenerated_kubeadm_controlplane \
515-
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \
516-
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \
517-
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3 \
518-
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4 \
519-
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
520-
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
507+
--extra-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \
508+
--extra-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \
509+
--extra-dirs=sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3 \
510+
--extra-dirs=sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4 \
511+
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
512+
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
513+
./internal/apis/controlplane/kubeadm/v1alpha3 \
514+
./internal/apis/controlplane/kubeadm/v1alpha4
521515

522516
.PHONY: generate-go-conversions-docker-infrastructure
523517
generate-go-conversions-docker-infrastructure: $(CONVERSION_GEN) ## Generate conversions go code for docker infrastructure provider
524518
cd $(CAPD_DIR); $(CONVERSION_GEN) \
525-
--input-dirs=./api/v1alpha3 \
526-
--input-dirs=./api/v1alpha4 \
527-
--input-dirs=./$(EXP_DIR)/api/v1alpha3 \
528-
--input-dirs=./$(EXP_DIR)/api/v1alpha4 \
529-
--build-tag=ignore_autogenerated_capd \
530519
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \
531520
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \
532-
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE_CAPD) \
533-
--go-header-file=../../../hack/boilerplate/boilerplate.generatego.txt
521+
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE_CAPD) \
522+
--go-header-file=../../../hack/boilerplate/boilerplate.generatego.txt \
523+
./api/v1alpha3 \
524+
./api/v1alpha4 \
525+
./$(EXP_DIR)/api/v1alpha3 \
526+
./$(EXP_DIR)/api/v1alpha4
534527

535528
.PHONY: generate-go-conversions-in-memory-infrastructure
536529
generate-go-conversions-in-memory-infrastructure: $(CONVERSION_GEN) ## Generate conversions go code for in-memory infrastructure provider

0 commit comments

Comments
 (0)