Skip to content

Commit bd49501

Browse files
committed
fix: update conversion-gen input params
Moving from v1.28.x to v1.31.x changed some of the inputs for the conversion-gen tool. Couldn't find change log, but here is the current supported args list https://github.com/dinhxuanvu/kubernetes/blob/917aa9a8c4658a5cf870ab7e629a73534e3a1808/staging/src/k8s.io/code-generator/cmd/conversion-gen/args/args.go#L35-L63
1 parent 42119ed commit bd49501

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

Makefile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,16 @@ manifests: $(CONTROLLER_GEN) ## Generate WebhookConfiguration, ClusterRole and C
140140
generate: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
141141
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..." paths="./exp/api/..."
142142
$(CONVERSION_GEN) \
143-
--input-dirs=./api/v1beta1 \
144143
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
145-
--build-tag=ignore_autogenerated_conversions \
146-
--output-file-base=zz_generated.conversion \
147-
--go-header-file=hack/boilerplate.go.txt $(OUTPUT_BASE)
144+
--output-file=zz_generated.conversion.go \
145+
--go-header-file=hack/boilerplate.go.txt \
146+
./api/v1beta1
148147
$(CONVERSION_GEN) \
149-
--input-dirs=./exp/api/v1beta1 \
150148
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
151149
--extra-peer-dirs=github.com/oracle/cluster-api-provider-oci/api/v1beta1 \
152-
--build-tag=ignore_autogenerated_conversions \
153-
--output-file-base=zz_generated.conversion \
154-
--go-header-file=hack/boilerplate.go.txt $(OUTPUT_BASE)
150+
--output-file=zz_generated.conversion.go \
151+
--go-header-file=hack/boilerplate.go.txt \
152+
./exp/api/v1beta1
155153

156154
fmt: ## Run go fmt against code.
157155
go fmt ./...

api/v1beta1/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.

api/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exp/api/v1beta1/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.

exp/api/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)