Skip to content

Commit 99161da

Browse files
committed
Drop obsolete vgopath usage
1 parent b0de862 commit 99161da

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ check: $(GOIMPORTS) $(GOLANGCI_LINT) $(HELM) $(YQ)
8080
@bash $(GARDENER_HACK_DIR)/check-charts.sh ./charts
8181

8282
.PHONY: generate
83-
generate: $(CONTROLLER_GEN) $(EXTENSION_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(KUSTOMIZE) $(MOCKGEN) $(YQ) $(VGOPATH)
84-
@VGOPATH=$(VGOPATH) REPO_ROOT=$(REPO_ROOT) GARDENER_HACK_DIR=$(GARDENER_HACK_DIR) hack/update-codegen.sh
85-
@VGOPATH=$(VGOPATH) REPO_ROOT=$(REPO_ROOT) GARDENER_HACK_DIR=$(GARDENER_HACK_DIR) bash $(GARDENER_HACK_DIR)/generate-sequential.sh ./charts/... ./cmd/... ./example/... ./pkg/... ./test/...
83+
generate: $(CONTROLLER_GEN) $(EXTENSION_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(KUSTOMIZE) $(MOCKGEN) $(YQ)
84+
@REPO_ROOT=$(REPO_ROOT) GARDENER_HACK_DIR=$(GARDENER_HACK_DIR) hack/update-codegen.sh
85+
@REPO_ROOT=$(REPO_ROOT) GARDENER_HACK_DIR=$(GARDENER_HACK_DIR) bash $(GARDENER_HACK_DIR)/generate-sequential.sh ./charts/... ./cmd/... ./example/... ./pkg/... ./test/...
8686
@$(MAKE) format
8787

8888
.PHONY: format

hack/update-codegen.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@ set -o pipefail
1111

1212
PROJECT_ROOT="$(dirname $0)"/..
1313

14-
# setup virtual GOPATH
15-
source "$GARDENER_HACK_DIR"/vgopath-setup.sh
16-
14+
go mod download k8s.io/code-generator
1715
CODE_GEN_DIR=$(go list -m -f '{{.Dir}}' k8s.io/code-generator)
1816
source "${CODE_GEN_DIR}/kube_codegen.sh"
1917

20-
rm -f $GOPATH/bin/*-gen
21-
2218
kube::codegen::gen_helpers \
2319
--boilerplate "${GARDENER_HACK_DIR}/LICENSE_BOILERPLATE.txt" \
2420
--extra-peer-dir k8s.io/apimachinery/pkg/apis/meta/v1 \

0 commit comments

Comments
 (0)