Skip to content

Commit b7c8d8e

Browse files
committed
Fix build tags for generated conversion code
1 parent d94a842 commit b7c8d8e

File tree

7 files changed

+15
-13
lines changed

7 files changed

+15
-13
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@ generate-go-conversions-core-exp: $(CONVERSION_GEN) ## Generate conversions go c
460460
--input-dirs=./internal/apis/core/exp/v1alpha4 \
461461
--input-dirs=./internal/apis/core/exp/addons/v1alpha3 \
462462
--input-dirs=./internal/apis/core/exp/addons/v1alpha4 \
463+
--build-tag=ignore_autogenerated_core_exp \
463464
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \
464465
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \
465466
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
@@ -470,6 +471,7 @@ generate-go-conversions-core-exp-ipam: $(CONVERSION_GEN) ## Generate conversions
470471
$(MAKE) clean-generated-conversions SRC_DIRS="./$(EXP_DIR)/ipam/api/v1alpha1"
471472
$(CONVERSION_GEN) \
472473
--input-dirs=./$(EXP_DIR)/ipam/api/v1alpha1 \
474+
--build-tag=ignore_autogenerated_core_exp_ipam \
473475
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
474476
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
475477

@@ -479,7 +481,7 @@ generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions
479481
$(CONVERSION_GEN) \
480482
--input-dirs=./internal/runtime/test/v1alpha1 \
481483
--input-dirs=./internal/runtime/test/v1alpha2 \
482-
--build-tag=ignore_autogenerated_runtime \
484+
--build-tag=ignore_autogenerated_core_runtime \
483485
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
484486
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
485487

exp/ipam/api/v1alpha1/zz_generated.conversion.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/apis/core/exp/addons/v1alpha3/zz_generated.conversion.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/apis/core/exp/addons/v1alpha4/zz_generated.conversion.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/apis/core/exp/v1alpha3/zz_generated.conversion.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/apis/core/exp/v1alpha4/zz_generated.conversion.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/runtime/test/v1alpha1/zz_generated.conversion.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)