NODE-5888 Use node group instead of node uuid

wallarm · Nov 13, 2024 · 0ee344e · 0ee344e
1 parent 5b0e795
commit 0ee344e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -157,7 +157,7 @@ jobs:
           DOCKERHUB_USER: ${{ steps.secrets.outputs.user }}
           DOCKERHUB_PASSWORD: ${{ steps.secrets.outputs.password }}
           INJECTION_STRATEGY: ${{ matrix.INJECTION_STRATEGY }}
-          WALLARM_API_TOKEN: ${{ steps.secrets.outputs.api_token }}
+          WALLARM_API_TOKEN: ${{ steps.secrets.outputs.user_token }}
           WALLARM_API_HOST: ${{ steps.secrets.outputs.api_host }}
           WALLARM_API_PRESET: ${{ steps.secrets.outputs.api_preset }}
           USER_TOKEN: ${{ steps.secrets.outputs.user_token }}

diff --git a/Makefile b/Makefile
@@ -84,7 +84,8 @@ clean-all:
 ### Helm routines
 ###
 HELMARGS := --set "config.wallarm.api.token=$(WALLARM_API_TOKEN)" \
-			--set "config.wallarm.api.host=$(WALLARM_API_HOST)"
+			--set "config.wallarm.api.host=$(WALLARM_API_HOST)"   \
+			--set "config.wallarm.api.nodeGroup=$(NODE_GROUP_NAME)"   \
 
 helm-template:
 	@$(HELM) template wallarm-sidecar ./helm -f ./helm/values.dev.yaml $(HELMARGS) --debug

diff --git a/test/smoke/functions.sh b/test/smoke/functions.sh
@@ -18,6 +18,7 @@ function check_mandatory_vars() {
       WEBHOOK_UUID
       SMOKE_REGISTRY_TOKEN
       SMOKE_REGISTRY_SECRET
+      NODE_GROUP_NAME
     )
 
     env_list=""

diff --git a/test/smoke/run.sh b/test/smoke/run.sh
@@ -24,6 +24,7 @@ export WALLARM_API_CA_VERIFY="${WALLARM_API_CA_VERIFY:-true}"
 export SMOKE_IMAGE_NAME="${SMOKE_IMAGE_NAME:-dkr.wallarm.com/tests/smoke-tests}"
 export SMOKE_IMAGE_TAG="${SMOKE_IMAGE_TAG:-latest}"
 export INJECTION_STRATEGY="${INJECTION_STRATEGY:-single}"
+export NODE_GROUP_NAME="github-sidecar-$(tr -dc A-Za-z0-9 </dev/urandom | head -c 12; echo)"
 
 K8S_VERSION=${K8S_VERSION:-1.28.7}
 
@@ -138,6 +139,7 @@ config:
     api:
       token: ${WALLARM_API_TOKEN}
       host: ${WALLARM_API_HOST}
+      nodeGroup: ${NODE_GROUP_NAME}
   injectionStrategy:
     schema: ${INJECTION_STRATEGY}
 controller: