kubecdl: use label filter to find the exact cluster

According to https://cloud.google.com/sdk/gcloud/reference/topic/filters#Operator-Terms The operators `=` and `:` are deprecated. If we want to test equality, we should use `key <= value AND key >= value`. Signed-off-by: JenTing Hsiao <[email protected]>
cmcc-ict · Nov 2, 2022 · 546df5c · 546df5c
1 parent e24616b
commit 546df5c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/dev/kubecdl/main.go b/dev/kubecdl/main.go
@@ -127,7 +127,7 @@ func getNodeName(clusterName, project string) (nodeName, zone string, err error)
 		Zone string `json:"zone"`
 	}
 
-	out, err := exec.Command("gcloud", "compute", "instances", "list", "--format=json", "--quiet", "--project", project, "--filter=name~server-ws-.*"+clusterName).CombinedOutput()
+	out, err := exec.Command("gcloud", "compute", "instances", "list", "--format=json", "--quiet", "--project", project, "--filter", "labels.cluster-name>=ws-"+clusterName+" AND labels.cluster-name<=ws-"+clusterName).CombinedOutput()
 	if err != nil {
 		return "", "", fmt.Errorf("failed to describe node instances: %s: %w", string(out), err)
 	}