kubecdl: filter the instance-type = control-plane

jenting · roboquat · commit 0459b5be8750 · 2022-11-02T14:16:07.000+01:00
Add one more criteria to filter the control plane nodes only

Signed-off-by: JenTing Hsiao &lt;hsiaoairplane@gmail.com&gt;
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", "labels.cluster-name>=ws-"+clusterName+" AND labels.cluster-name<=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+" AND labels.instance-type>=control-plane AND labels.instance-type<=control-plane").CombinedOutput()
 	if err != nil {
 		return "", "", fmt.Errorf("failed to describe node instances: %s: %w", string(out), err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func getNodeName(clusterName, project string) (nodeName, zone string, err error)`
`127`	`127`	Zone string `json:"zone"`
`128`	`128`	`}`
`129`	`129`
`130`		`- 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()`
	`130`	`+ 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+" AND labels.instance-type>=control-plane AND labels.instance-type<=control-plane").CombinedOutput()`
`131`	`131`	`if err != nil {`
`132`	`132`	`return "", "", fmt.Errorf("failed to describe node instances: %s: %w", string(out), err)`
`133`	`133`	`}`