From 3f8de61f70896023b80d1a0761473838d9ccba44 Mon Sep 17 00:00:00 2001 From: Jingyuan Liang Date: Thu, 10 Oct 2024 00:26:14 +0000 Subject: [PATCH] install-cni: rename env var NODE_NAME to CURRENT_NODE_NAME This is to match the existing usage in netlink_metrics. The version with NODE_NAME naming was never released. --- scripts/install-cni.sh | 2 +- scripts/testcase/testcase-nodename.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install-cni.sh b/scripts/install-cni.sh index 554a8a9d..d5f1f142 100755 --- a/scripts/install-cni.sh +++ b/scripts/install-cni.sh @@ -115,7 +115,7 @@ fetch_node_object() { fi local token - local node_url="https://${host}:${KUBERNETES_SERVICE_PORT}/api/v1/nodes?watch=true&timeoutSeconds=${timeout}&fieldSelector=metadata.name=${NODE_NAME:-${HOSTNAME}}" + local node_url="https://${host}:${KUBERNETES_SERVICE_PORT}/api/v1/nodes?watch=true&timeoutSeconds=${timeout}&fieldSelector=metadata.name=${CURRENT_NODE_NAME:-${HOSTNAME}}" for ((i=1; i<=attempts; i++)); do log "Watching attempt #${i} at ${node_url}" diff --git a/scripts/testcase/testcase-nodename.sh b/scripts/testcase/testcase-nodename.sh index 5844761d..1e644252 100644 --- a/scripts/testcase/testcase-nodename.sh +++ b/scripts/testcase/testcase-nodename.sh @@ -6,7 +6,7 @@ export ENABLE_CILIUM_PLUGIN=false export ENABLE_MASQUERADE=false export ENABLE_IPV6=false -export NODE_NAME=gke-my-cluster-default-pool-128bc25d-9c94 +export CURRENT_NODE_NAME=gke-my-cluster-default-pool-128bc25d-9c94 export HOSTNAME=unexpected CNI_SPEC_TEMPLATE=$(cat testdata/spec-template.json)