Merge pull request #84174 from Random-Liu/upgrade-all-node-pools

Upgrade all node pools for gke upgrade test.

test/e2e/framework/nodes_util.go

@@ -230,6 +230,12 @@ func nodeUpgradeGCE(rawV, img string, enableKubeProxyDaemonSet bool) error {
 
 func nodeUpgradeGKE(v string, img string) error {
 	Logf("Upgrading nodes to version %q and image %q", v, img)
+	nps, err := nodePoolsGKE()
+	if err != nil {
+		return err
+	}
+	Logf("Found node pools %v", nps)
+	for _, np := range nps {
 		args := []string{
 			"container",
 			"clusters",
@@ -237,23 +243,44 @@ func nodeUpgradeGKE(v string, img string) error {
 			locationParamGKE(),
 			"upgrade",
 			TestContext.CloudConfig.Cluster,
+			fmt.Sprintf("--node-pool=%s", np),
 			fmt.Sprintf("--cluster-version=%s", v),
 			"--quiet",
 		}
 		if len(img) > 0 {
 			args = append(args, fmt.Sprintf("--image-type=%s", img))
 		}
-	_, _, err := RunCmd("gcloud", appendContainerCommandGroupIfNeeded(args)...)
+		_, _, err = RunCmd("gcloud", appendContainerCommandGroupIfNeeded(args)...)
 
 		if err != nil {
 			return err
 		}
 
 		waitForSSHTunnels()
-
+	}
 	return nil
 }
 
+func nodePoolsGKE() ([]string, error) {
+	args := []string{
+		"container",
+		"node-pools",
+		fmt.Sprintf("--project=%s", TestContext.CloudConfig.ProjectID),
+		locationParamGKE(),
+		"list",
+		fmt.Sprintf("--cluster=%s", TestContext.CloudConfig.Cluster),
+		`--format="get(name)"`,
+	}
+	stdout, _, err := RunCmd("gcloud", appendContainerCommandGroupIfNeeded(args)...)
+	if err != nil {
+		return nil, err
+	}
+	if len(strings.TrimSpace(stdout)) == 0 {
+		return []string{}, nil
+	}
+	return strings.Fields(stdout), nil
+}
+
 // MigTemplate (GCE-only) returns the name of the MIG template that the
 // nodes of the cluster use.
 func MigTemplate() (string, error) {