From 588637f9b756899db5b732fe95f03488a29ffb65 Mon Sep 17 00:00:00 2001 From: Muhammad Faizan Date: Thu, 20 Jun 2024 21:04:05 +0200 Subject: [PATCH] fixed gardener provisioning make target to use correct env (#585) --- hack/ci/Makefile | 4 ++-- scripts/gardener/aws/provision.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/ci/Makefile b/hack/ci/Makefile index f3370e90..153bdbf9 100644 --- a/hack/ci/Makefile +++ b/hack/ci/Makefile @@ -3,7 +3,7 @@ KYMA_CLI ?= "${PROJECT_ROOT}/${KYMA}" CLUSTER_NAME ?= kyma REGISTRY_PORT ?= 5001 K3D_VERSION ?= 1.28.4 -GARDENER_KUBE_VERSION ?= 1.28.4 +GARDENER_CLUSTER_VERSION ?= 1.28.4 .PHONY: create-kyma-system-ns create-kyma-system-ns: ## Create kyma-system namespace. @@ -80,7 +80,7 @@ wait-api-gateway-cr-ready: .PHONY: provision-gardener-cluster provision-gardener-cluster: - GARDENER_CLUSTER_VERSION="${GARDENER_KUBE_VERSION}" PROJECT_ROOT="${PROJECT_ROOT}" ${PROJECT_ROOT}/scripts/gardener/aws/provision.sh + GARDENER_CLUSTER_VERSION="${GARDENER_CLUSTER_VERSION}" PROJECT_ROOT="${PROJECT_ROOT}" ${PROJECT_ROOT}/scripts/gardener/aws/provision.sh .PHONY: deprovision-gardener-cluster deprovision-gardener-cluster: diff --git a/scripts/gardener/aws/provision.sh b/scripts/gardener/aws/provision.sh index a94d124c..50ba4414 100755 --- a/scripts/gardener/aws/provision.sh +++ b/scripts/gardener/aws/provision.sh @@ -35,7 +35,7 @@ gardener::validate_and_default() { utils::check_required_vars "${requiredVars[@]}" # validations - if [ "${#CLUSTER_NAME}" -gt 9 ]; then + if [ "${CLUSTER_NAME}" -gt 9 ]; then log::error "Provided cluster name is too long" return 1 fi