Merge pull request #371 from jingyuanliang/nodename

install-cni: rename env var NODE_NAME to CURRENT_NODE_NAME
GoogleCloudPlatform · Oct 10, 2024 · 6b53517 · 6b53517
2 parents e1f8e9c + 3f8de61
commit 6b53517
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)