@@ -18,9 +18,9 @@ IMG := $(IMAGE_REPO):$(IMAGE_TAG)
18
18
# Define dependency versions (use go.mod if we also use Go code from dependency)
19
19
export CERT_MGR_VERSION := v1.9.0
20
20
export CATALOGD_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/catalogd)
21
- export KAPP_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/vmware-tanzu/carvel-kapp-controller)
22
- export RUKPAK_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/rukpak)
23
- export WAIT_TIMEOUT := 60s
21
+ export KAPP_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/vmware-tanzu/carvel-kapp-controller)
22
+ export RUKPAK_VERSION := $(shell go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/rukpak)
23
+ export WAIT_TIMEOUT := 60s
24
24
25
25
# By default setup-envtest will write to $XDG_DATA_HOME, or $HOME/.local/share if that is not defined.
26
26
# If $HOME is not set, we need to specify a binary directory to prevent an error in setup-envtest.
@@ -38,7 +38,7 @@ KIND_CLUSTER_NAME := operator-controller
38
38
# The KIND_NODE_VERSION is set by getting the version of the k8s.io/client-go dependency from the go.mod
39
39
# and sets major version to "1" and the patch version to "0". For example, a client-go version of v0.28.5
40
40
# will map to a KIND_NODE_VERSION of 1.28.0
41
- KIND_NODE_VERSION := $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\) \.[[:digit:]]\{1,\}$$/1.\1.0/')
41
+ KIND_NODE_VERSION := $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\) \.[[:digit:]]\{1,\}$$/1.\1.0/')
42
42
KIND_CLUSTER_IMAGE := kindest/node:v$(KIND_NODE_VERSION )
43
43
44
44
ifneq (, $(shell command -v docker 2>/dev/null) )
@@ -120,19 +120,19 @@ test: manifests generate fmt vet test-unit test-e2e #HELP Run all tests.
120
120
e2e : $(SETUP_ENVTEST ) # EXHELP Run the e2e tests.
121
121
go test -v ./test/e2e/...
122
122
123
- E2E_REGISTRY_NAME := docker-registry
123
+ E2E_REGISTRY_NAME := docker-registry
124
124
E2E_REGISTRY_NAMESPACE := operator-controller-e2e
125
- export REG_PKG_NAME := registry-operator
125
+ export REG_PKG_NAME := registry-operator
126
126
export PLAIN_PKG_NAME := plain-operator
127
- export CATALOG_IMG := $(E2E_REGISTRY_NAME ) .$(E2E_REGISTRY_NAMESPACE ) .svc:5000/test-catalog:e2e
127
+ export CATALOG_IMG := $(E2E_REGISTRY_NAME ) .$(E2E_REGISTRY_NAMESPACE ) .svc:5000/test-catalog:e2e
128
128
.PHONY : test-ext-dev-e2e
129
129
test-ext-dev-e2e : $(SETUP_ENVTEST ) $(OPERATOR_SDK ) $(KUSTOMIZE ) $(KIND ) # HELP Run extension create, upgrade and delete tests.
130
130
test/extension-developer-e2e/setup.sh $(OPERATOR_SDK ) $(CONTAINER_RUNTIME ) $(KUSTOMIZE ) $(KIND ) $(KIND_CLUSTER_NAME ) $(E2E_REGISTRY_NAMESPACE )
131
131
go test -v ./test/extension-developer-e2e/...
132
132
133
133
.PHONY : test-unit
134
134
ENVTEST_VERSION := $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\) \.[[:digit:]]\{1,\}$$/1.\1.x/')
135
- UNIT_TEST_DIRS := $(shell go list ./... | grep -v /test/)
135
+ UNIT_TEST_DIRS := $(shell go list ./... | grep -v /test/)
136
136
test-unit : $(SETUP_ENVTEST ) # HELP Run the unit tests
137
137
eval $$($(SETUP_ENVTEST ) use -p env $(ENVTEST_VERSION ) $(SETUP_ENVTEST_BIN_DIR_OVERRIDE ) ) && go test -count=1 -short $(UNIT_TEST_DIRS ) -coverprofile cover.out
138
138
@@ -208,9 +208,9 @@ endif
208
208
export CGO_ENABLED
209
209
210
210
export GO_BUILD_ASMFLAGS := all=-trimpath=$(PWD )
211
- export GO_BUILD_LDFLAGS := -s -w -X $(shell go list -m) /version.Version=$(VERSION )
212
- export GO_BUILD_GCFLAGS := all=-trimpath=$(PWD )
213
- export GO_BUILD_FLAGS :=
211
+ export GO_BUILD_LDFLAGS := -s -w -X $(shell go list -m) /version.Version=$(VERSION )
212
+ export GO_BUILD_GCFLAGS := all=-trimpath=$(PWD )
213
+ export GO_BUILD_FLAGS :=
214
214
215
215
BUILDCMD = go build $(GO_BUILD_FLAGS ) -ldflags '$(GO_BUILD_LDFLAGS ) ' -gcflags '$(GO_BUILD_GCFLAGS ) ' -asmflags '$(GO_BUILD_ASMFLAGS ) ' -o $(BUILDBIN ) /manager ./cmd/manager
216
216
@@ -241,7 +241,7 @@ ifeq ($(origin ENABLE_RELEASE_PIPELINE), undefined)
241
241
ENABLE_RELEASE_PIPELINE := false
242
242
endif
243
243
ifeq ($(origin GORELEASER_ARGS ) , undefined)
244
- GORELEASER_ARGS := --snapshot --clean
244
+ GORELEASER_ARGS := --snapshot --clean
245
245
endif
246
246
247
247
export ENABLE_RELEASE_PIPELINE
@@ -259,7 +259,7 @@ quickstart: $(KUSTOMIZE) manifests #EXHELP Generate the installation release man
259
259
260
260
# #@ Docs
261
261
262
- VENVDIR := $(abspath docs/.venv)
262
+ VENVDIR := $(abspath docs/.venv)
263
263
REQUIREMENTS_TXT := docs/requirements.txt
264
264
265
265
.PHONY : build-docs
0 commit comments