Skip to content

Commit cbffb33

Browse files
author
Mikalai Radchuk
committed
Remove Makefile vertical code alignment
Signed-off-by: Mikalai Radchuk <[email protected]>
1 parent 5985cce commit cbffb33

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Diff for: Makefile

+13-13
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ IMG := $(IMAGE_REPO):$(IMAGE_TAG)
1818
# Define dependency versions (use go.mod if we also use Go code from dependency)
1919
export CERT_MGR_VERSION := v1.9.0
2020
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
2424

2525
# By default setup-envtest will write to $XDG_DATA_HOME, or $HOME/.local/share if that is not defined.
2626
# 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
3838
# The KIND_NODE_VERSION is set by getting the version of the k8s.io/client-go dependency from the go.mod
3939
# and sets major version to "1" and the patch version to "0". For example, a client-go version of v0.28.5
4040
# 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/')
4242
KIND_CLUSTER_IMAGE := kindest/node:v$(KIND_NODE_VERSION)
4343

4444
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.
120120
e2e: $(SETUP_ENVTEST) #EXHELP Run the e2e tests.
121121
go test -v ./test/e2e/...
122122

123-
E2E_REGISTRY_NAME := docker-registry
123+
E2E_REGISTRY_NAME := docker-registry
124124
E2E_REGISTRY_NAMESPACE := operator-controller-e2e
125-
export REG_PKG_NAME := registry-operator
125+
export REG_PKG_NAME := registry-operator
126126
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
128128
.PHONY: test-ext-dev-e2e
129129
test-ext-dev-e2e: $(SETUP_ENVTEST) $(OPERATOR_SDK) $(KUSTOMIZE) $(KIND) #HELP Run extension create, upgrade and delete tests.
130130
test/extension-developer-e2e/setup.sh $(OPERATOR_SDK) $(CONTAINER_RUNTIME) $(KUSTOMIZE) $(KIND) $(KIND_CLUSTER_NAME) $(E2E_REGISTRY_NAMESPACE)
131131
go test -v ./test/extension-developer-e2e/...
132132

133133
.PHONY: test-unit
134134
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/)
136136
test-unit: $(SETUP_ENVTEST) #HELP Run the unit tests
137137
eval $$($(SETUP_ENVTEST) use -p env $(ENVTEST_VERSION) $(SETUP_ENVTEST_BIN_DIR_OVERRIDE)) && go test -count=1 -short $(UNIT_TEST_DIRS) -coverprofile cover.out
138138

@@ -208,9 +208,9 @@ endif
208208
export CGO_ENABLED
209209

210210
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 :=
214214

215215
BUILDCMD = go build $(GO_BUILD_FLAGS) -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/manager ./cmd/manager
216216

@@ -241,7 +241,7 @@ ifeq ($(origin ENABLE_RELEASE_PIPELINE), undefined)
241241
ENABLE_RELEASE_PIPELINE := false
242242
endif
243243
ifeq ($(origin GORELEASER_ARGS), undefined)
244-
GORELEASER_ARGS := --snapshot --clean
244+
GORELEASER_ARGS := --snapshot --clean
245245
endif
246246

247247
export ENABLE_RELEASE_PIPELINE
@@ -259,7 +259,7 @@ quickstart: $(KUSTOMIZE) manifests #EXHELP Generate the installation release man
259259

260260
##@ Docs
261261

262-
VENVDIR := $(abspath docs/.venv)
262+
VENVDIR := $(abspath docs/.venv)
263263
REQUIREMENTS_TXT := docs/requirements.txt
264264

265265
.PHONY: build-docs

0 commit comments

Comments
 (0)