Skip to content

Commit d7ba728

Browse files
committed
CARRY: Add downstream vendoring to Makefiles
In order to automate the vendoring updates for downstream CAPO, we need to run `go mod vendor`.
1 parent b802b61 commit d7ba728

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,10 @@ lint-fast: $(GOLANGCI_LINT) ## Run only faster linters to detect possible issues
274274
.PHONY: modules
275275
modules: ## Runs go mod to ensure proper vendoring.
276276
$(MAKE) -C $(REPO_ROOT)/orc modules
277-
go mod tidy
278-
cd $(TOOLS_DIR); go mod tidy
279-
cd $(REPO_ROOT)/hack/codegen; go work sync; go mod tidy
277+
$(MAKE) -C $(REPO_ROOT)/openshift modules
278+
go mod tidy && go mod vendor
279+
cd $(TOOLS_DIR); go mod tidy && go mod vendor
280+
cd $(REPO_ROOT)/hack/codegen; go mod tidy; GOWORK=off go mod vendor
280281

281282
.PHONY: generate
282283
generate: templates generate-orc generate-controller-gen generate-codegen generate-conversion-gen generate-go generate-manifests generate-api-docs ## Generate all generated code

hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/Makefile

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

orc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
4949

5050
.PHONY: modules
5151
modules:
52-
go mod tidy
53-
cd hack/codegen; go work sync; go mod tidy
52+
go mod tidy && go mod vendor
53+
cd hack/codegen; go mod tidy; GOWORK=off go mod vendor
5454

5555
.PHONY: generate
5656
generate: modules manifests generate-controller-gen generate-codegen

0 commit comments

Comments
 (0)