Skip to content

Commit 5b2eb97

Browse files
committed
Regenerate scratch env go mod file
1 parent 14d2e06 commit 5b2eb97

File tree

3 files changed

+1479
-287
lines changed

3 files changed

+1479
-287
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/golangci-lint)
4141
GO_APIDIFF := $(TOOLS_BIN_DIR)/go-apidiff
4242
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
4343
ENVTEST_DIR := $(abspath tools/setup-envtest)
44+
SCRATCH_ENV_DIR := $(abspath examples/scratch-env)
4445

4546
# The help will print out all targets with their descriptions organized bellow their categories. The categories are represented by `##@` and the target descriptions by `##`.
4647
# The awk commands is responsible to read the entire set of makefiles included in this invocation, looking for lines of the file as xyz: ## something, and then pretty-format the target and help. Then, if there's a line with ##@ something, that gets pretty-printed as a category.
@@ -99,6 +100,7 @@ modules: ## Runs go mod to ensure modules are up to date.
99100
go mod tidy
100101
cd $(TOOLS_DIR); go mod tidy
101102
cd $(ENVTEST_DIR); go mod tidy
103+
cd $(SCRATCH_ENV_DIR); go mod tidy
102104

103105
.PHONY: generate
104106
generate: $(CONTROLLER_GEN) ## Runs controller-gen for internal types for config file
@@ -118,7 +120,7 @@ clean-bin: ## Remove all generated binaries.
118120

119121
.PHONY: verify-modules
120122
verify-modules: modules ## Verify go modules are up to date
121-
@if !(git diff --quiet HEAD -- go.sum go.mod $(TOOLS_DIR)/go.mod $(TOOLS_DIR)/go.sum $(ENVTEST_DIR)/go.mod $(ENVTEST_DIR)/go.sum); then \
123+
@if !(git diff --quiet HEAD -- go.sum go.mod $(TOOLS_DIR)/go.mod $(TOOLS_DIR)/go.sum $(ENVTEST_DIR)/go.mod $(ENVTEST_DIR)/go.sum $(SCRATCH_ENV_DIR)/go.sum); then \
122124
git diff; \
123125
echo "go module files are out of date, please run 'make modules'"; exit 1; \
124126
fi

examples/scratch-env/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.15
44

55
require (
66
github.com/spf13/pflag v1.0.5
7+
go.uber.org/zap v1.24.0
78
sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000
89
)
910

0 commit comments

Comments
 (0)