Skip to content

Commit c19ca28

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#10502 from sbueringer/pr-fix-conv
🐛 Fix conversion-gen outside of GOPATH
2 parents 7755426 + 094c57f commit c19ca28

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

‎Makefile

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@ OBSERVABILITY_DIR := hack/observability
7070

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

73-
# Set --output-dir for conversion-gen if we are not within GOPATH
74-
ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/sigs.k8s.io/cluster-api)
75-
CONVERSION_GEN_OUTPUT_BASE := --output-dir=$(ROOT_DIR)
76-
CONVERSION_GEN_OUTPUT_BASE_CAPD := --output-dir=$(ROOT_DIR)/$(CAPD_DIR)
77-
else
78-
export GOPATH := $(shell go env GOPATH)
79-
endif
80-
8173
#
8274
# Ginkgo configuration.
8375
#
@@ -447,7 +439,7 @@ generate-go-conversions-core: ## Run all generate-go-conversions-core-* targets
447439
generate-go-conversions-core-api: $(CONVERSION_GEN) ## Generate conversions go code for core api
448440
$(MAKE) clean-generated-conversions SRC_DIRS="./internal/apis/core/v1alpha3,./internal/apis/core/v1alpha4"
449441
$(CONVERSION_GEN) \
450-
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
442+
--output-file=zz_generated.conversion.go \
451443
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
452444
./internal/apis/core/v1alpha3 \
453445
./internal/apis/core/v1alpha4
@@ -458,7 +450,7 @@ generate-go-conversions-core-exp: $(CONVERSION_GEN) ## Generate conversions go c
458450
$(CONVERSION_GEN) \
459451
--extra-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \
460452
--extra-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \
461-
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
453+
--output-file=zz_generated.conversion.go \
462454
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
463455
./internal/apis/core/exp/v1alpha3 \
464456
./internal/apis/core/exp/v1alpha4 \
@@ -469,15 +461,15 @@ generate-go-conversions-core-exp: $(CONVERSION_GEN) ## Generate conversions go c
469461
generate-go-conversions-core-exp-ipam: $(CONVERSION_GEN) ## Generate conversions go code for core exp IPAM
470462
$(MAKE) clean-generated-conversions SRC_DIRS="./$(EXP_DIR)/ipam/api/v1alpha1"
471463
$(CONVERSION_GEN) \
472-
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
464+
--output-file=zz_generated.conversion.go \
473465
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
474466
./$(EXP_DIR)/ipam/api/v1alpha1
475467

476468
.PHONY: generate-go-conversions-core-runtime
477469
generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions go code for core runtime
478470
$(MAKE) clean-generated-conversions SRC_DIRS="./internal/runtime/test/v1alpha1,./internal/runtime/test/v1alpha2"
479471
$(CONVERSION_GEN) \
480-
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
472+
--output-file=zz_generated.conversion.go \
481473
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
482474
./internal/runtime/test/v1alpha1 \
483475
./internal/runtime/test/v1alpha2
@@ -486,13 +478,13 @@ generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions
486478
generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm bootstrap
487479
$(MAKE) clean-generated-conversions SRC_DIRS="./internal/apis/bootstrap/kubeadm"
488480
$(CONVERSION_GEN) \
489-
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
481+
--output-file=zz_generated.conversion.go \
490482
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
491483
./internal/apis/bootstrap/kubeadm/v1alpha3 \
492484
./internal/apis/bootstrap/kubeadm/v1alpha4
493485
$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/types/upstreamv1beta2,./bootstrap/kubeadm/types/upstreamv1beta3"
494486
$(CONVERSION_GEN) \
495-
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
487+
--output-file=zz_generated.conversion.go \
496488
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
497489
./bootstrap/kubeadm/types/upstreamv1beta2 \
498490
./bootstrap/kubeadm/types/upstreamv1beta3
@@ -505,15 +497,15 @@ generate-go-conversions-kubeadm-control-plane: $(CONVERSION_GEN) ## Generate con
505497
--extra-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4 \
506498
--extra-dirs=sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3 \
507499
--extra-dirs=sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4 \
508-
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE) \
500+
--output-file=zz_generated.conversion.go \
509501
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
510502
./internal/apis/controlplane/kubeadm/v1alpha3 \
511503
./internal/apis/controlplane/kubeadm/v1alpha4
512504

513505
.PHONY: generate-go-conversions-docker-infrastructure
514506
generate-go-conversions-docker-infrastructure: $(CONVERSION_GEN) ## Generate conversions go code for docker infrastructure provider
515507
cd $(CAPD_DIR); $(CONVERSION_GEN) \
516-
--output-file=zz_generated.conversion.go $(CONVERSION_GEN_OUTPUT_BASE_CAPD) \
508+
--output-file=zz_generated.conversion.go \
517509
--go-header-file=../../../hack/boilerplate/boilerplate.generatego.txt \
518510
./api/v1alpha3 \
519511
./api/v1alpha4 \

0 commit comments

Comments
 (0)