chore: Fix variables in release script (#879)

Co-authored-by: Mostafa Shorim <[email protected]>

.env

@@ -3,16 +3,17 @@
 ENV_ENVTEST_K8S_VERSION=1.27.1 # ENVTEST_K8S_VERSION refers to the version of Kubebuilder assets to be downloaded by envtest binary.
 ENV_IMG=europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:1.11.0 # Image URL to use all building/pushing image targets
 
-## Gardener 
+## Gardener
 ENV_GARDENER_K8S_VERSION=1.27
 ENV_GARDENER_OS_VERSION="Not Defined"
 
 ## Dependencies
 ENV_CONTROLLER_TOOLS_VERSION=v0.11.3
 ENV_GINKGO_VERSION=v2.15.0
 ENV_GO_TEST_COVERAGE_VERSION=v2.8.2
-ENV_GOLANGCI-LINT_VERSION=latest
+ENV_GOLANGCI_LINT_VERSION=latest
 ENV_ISTIO_VERSION=1.3.2
 ENV_K3D_VERSION=v5.4.7
 ENV_KUSTOMIZE_VERSION=v5.0.1
 ENV_TABLE_GEN_VERSION=v0.0.0-20230523174756-3dae9f177ffd
+ENV_GORELEASER_VERSION=v1.23.0

Makefile

@@ -52,15 +52,15 @@ help: ## Display this help.
 
 ##@ Development
 lint-autofix: golangci-lint ## Autofix all possible linting errors.
-	${GOLANGCI-LINT} run --fix
+	${GOLANGCI_LINT} run --fix
 
 lint-manifests:
 	hack/lint-manifests.sh
 
 lint: golangci-lint lint-manifests
 	go version
-	${GOLANGCI-LINT} version
-	GO111MODULE=on ${GOLANGCI-LINT} run
+	${GOLANGCI_LINT} version
+	GO111MODULE=on ${GOLANGCI_LINT} run
 
 .PHONY: crd-docs-gen
 crd-docs-gen: tablegen ## Generates CRD spec into docs folder

hack/make/dependencies.mk

@@ -10,7 +10,7 @@ TABLE_GEN ?= $(LOCALBIN)/table-gen
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 ENVTEST ?= $(LOCALBIN)/setup-envtest
 GINKGO ?= $(LOCALBIN)/ginkgo
-GOLANGCI-LINT ?= $(LOCALBIN)/golangci-lint
+GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 GO_TEST_COVERAGE ?= $(LOCALBIN)/go-test-coverage
 K3D ?= $(LOCALBIN)/k3d
 KYMA ?= $(LOCALBIN)/kyma-$(KYMA_STABILITY)
@@ -21,7 +21,7 @@ TABLE_GEN_VERSION ?= $(ENV_TABLE_GEN_VERSION)
 CONTROLLER_TOOLS_VERSION ?= $(ENV_CONTROLLER_TOOLS_VERSION)
 K3D_VERSION ?= $(ENV_K3D_VERSION)
 GINKGO_VERSION ?= $(ENV_GINKGO_VERSION)
-GOLANGCI-LINT_VERSION ?= $(ENV_GOLANGCI-LINT_VERSION)
+GOLANGCI_LINT_VERSION ?= $(ENV_GOLANGCI_LINT_VERSION)
 GO_TEST_COVERAGE_VERSION ?= $(ENV_GO_TEST_COVERAGE_VERSION)
 
 .PHONY: dependencies
@@ -59,9 +59,9 @@ $(TABLE_GEN): $(LOCALBIN)
 
 ## golangci-lint
 .PHONY: golangci-lint
-golangci-lint: $(GOLANGCI-LINT) ## Download golangci-lint locally if necessary.
-$(GOLANGCI-LINT): $(LOCALBIN)
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(LOCALBIN) $(GOLANGCI-LINT_VERSION)
+golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
+$(GOLANGCI_LINT): $(LOCALBIN)
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(LOCALBIN) $(GOLANGCI_LINT_VERSION)
 
 ## ginkgo
 .PHONY: ginkgo

hack/release.sh

@@ -8,7 +8,7 @@ set -E          # needs to be set if we want the ERR trap
 set -o pipefail # prevents errors in a pipeline from being masked
 
 readonly LOCALBIN=${LOCALBIN:-$(pwd)/bin}
-readonly KUSTOMIZE=${KUSTOMIZE:-$(LOCALBIN)/kustomize}
+readonly KUSTOMIZE=${KUSTOMIZE:-$LOCALBIN/kustomize}
 readonly GORELEASER_VERSION="${GORELEASER_VERSION:-$ENV_GORELEASER_VERSION}"
 readonly IMG="${IMG:-$ENV_IMG}"