chore: Fix gardener cluster deployment for load test (#888)

kyma-project · Mar 14, 2024 · ccf8600 · ccf8600
1 parent 98a106d
commit ccf8600
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/.env b/.env
@@ -17,3 +17,6 @@ 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
+ENV_GARDENER_MACHINE_TYPE=n1-standard-4
+ENV_GARDENER_MIN_NODES=1
+ENV_GARDENER_MAX_NODES=2
diff --git a/.github/workflows/pr-loadtest.yml b/.github/workflows/pr-loadtest.yml
@@ -61,6 +61,8 @@ jobs:
           GARDENER_SECRET_NAME: ${{ secrets.GARDENER_SECRET_NAME }}
           GARDENER_PROJECT: ${{ secrets.GARDENER_PROJECT }}
           GARDENER_SA_PATH: /tmp/gardener-sa.yaml
+          GARDENER_MIN_NODES: 2
+          GARDENER_MAX_NODES: 2
 
       - name: Deploy Telemetry
         run: hack/deploy-telemetry.sh

diff --git a/hack/make/provision.mk b/hack/make/provision.mk
@@ -25,6 +25,9 @@ GARDENER_K8S_VERSION ?= $(ENV_GARDENER_K8S_VERSION)
 GARDENER_OS_VERSION ?= $(ENV_GARDENER_OS_VERSION)
 # Cluster name is also set via load test. If its set then use that else use ci-XX
 GARDENER_CLUSTER_NAME ?= $(shell echo "ci-${GIT_COMMIT_SHA}-${GARDENER_K8S_VERSION}" | sed 's/\.//g')
+GARDENER_MACHINE_TYPE ?= $(ENV_GARDENER_MACHINE_TYPE)
+GARDENER_MIN_NODES ?= $(ENV_GARDENER_MIN_NODES)
+GARDENER_MAX_NODES ?= $(ENV_GARDENER_MAX_NODES)
 
 ifneq (,$(GARDENER_SA_PATH))
 GARDENER_K8S_VERSION_FULL=$(shell kubectl --kubeconfig=${GARDENER_SA_PATH} get cloudprofiles.core.gardener.cloud gcp -o go-template='{{range .spec.kubernetes.versions}}{{if and (eq .classification "supported") (lt .version "${GARDENER_K8S_VERSION}.a") (gt .version "${GARDENER_K8S_VERSION}")}}{{.version}}{{end}}{{end}}')
@@ -33,7 +36,17 @@ endif
 
 .PHONY: provision-gardener
 provision-gardener: kyma ## Provision gardener cluster with latest k8s version
-	${KYMA} provision gardener gcp --credentials ${GARDENER_SA_PATH} --name ${GARDENER_CLUSTER_NAME} --project ${GARDENER_PROJECT} --secret ${GARDENER_SECRET_NAME} --kube-version ${GARDENER_K8S_VERSION_FULL} --gardenlinux-version ${GARDENER_OS_VERSION} --hibernation-start="00 ${HIBERNATION_HOUR} * * ?"
+	${KYMA} provision gardener gcp \
+				--credentials ${GARDENER_SA_PATH} \
+				--name ${GARDENER_CLUSTER_NAME} \
+				--project ${GARDENER_PROJECT} \
+				--secret ${GARDENER_SECRET_NAME} \
+				--kube-version ${GARDENER_K8S_VERSION_FULL} \
+				--gardenlinux-version ${GARDENER_OS_VERSION} \
+				--hibernation-start="00 ${HIBERNATION_HOUR} * * ?" \
+				--type ${GARDENER_MACHINE_TYPE} \
+				--scaler-min ${GARDENER_MIN_NODES} \
+				--scaler-max ${GARDENER_MAX_NODES}
 
 .PHONY: deprovision-gardener
 deprovision-gardener: kyma ## Deprovision gardener cluster