Update expected test output

tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml

@@ -9,8 +9,7 @@ spec:
   authorization:
     rbac: {}
   channel: stable
-  cloudConfig:
+  cloudConfig: {}
-    gceServiceAccount: default
   cloudProvider: gce
   configBase: memfs://tests/ha-gce.example.com
   etcdClusters:

tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script

@@ -123,7 +123,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
-  gceServiceAccount: default
   gcpPDCSIDriver:
     enabled: false
   manageStorageClasses: true

tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script

@@ -123,7 +123,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
-  gceServiceAccount: default
   gcpPDCSIDriver:
     enabled: false
   manageStorageClasses: true

tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script

@@ -123,7 +123,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
-  gceServiceAccount: default
   gcpPDCSIDriver:
     enabled: false
   manageStorageClasses: true

tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script

@@ -123,7 +123,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
-  gceServiceAccount: default
   gcpPDCSIDriver:
     enabled: false
   manageStorageClasses: true

tests/integration/update_cluster/ha_gce/kubernetes.tf

@@ -564,7 +564,7 @@ resource "google_compute_instance_template" "master-us-test1-a-ha-gce-example-co
     preemptible         = false
   }
   service_account {
-    email  = "default"
+    email  = "control-plane-ha-gce-ex-mr702t@testproject.iam.gserviceaccount.com"
     scopes = ["https://www.googleapis.com/auth/compute", "https://www.googleapis.com/auth/monitoring", "https://www.googleapis.com/auth/logging.write", "https://www.googleapis.com/auth/devstorage.read_write", "https://www.googleapis.com/auth/ndev.clouddns.readwrite"]
   }
   tags = ["ha-gce-example-com-k8s-io-role-master"]
@@ -610,7 +610,7 @@ resource "google_compute_instance_template" "master-us-test1-b-ha-gce-example-co
     preemptible         = false
   }
   service_account {
-    email  = "default"
+    email  = "control-plane-ha-gce-ex-mr702t@testproject.iam.gserviceaccount.com"
     scopes = ["https://www.googleapis.com/auth/compute", "https://www.googleapis.com/auth/monitoring", "https://www.googleapis.com/auth/logging.write", "https://www.googleapis.com/auth/devstorage.read_write", "https://www.googleapis.com/auth/ndev.clouddns.readwrite"]
   }
   tags = ["ha-gce-example-com-k8s-io-role-master"]
@@ -656,7 +656,7 @@ resource "google_compute_instance_template" "master-us-test1-c-ha-gce-example-co
     preemptible         = false
   }
   service_account {
-    email  = "default"
+    email  = "control-plane-ha-gce-ex-mr702t@testproject.iam.gserviceaccount.com"
     scopes = ["https://www.googleapis.com/auth/compute", "https://www.googleapis.com/auth/monitoring", "https://www.googleapis.com/auth/logging.write", "https://www.googleapis.com/auth/devstorage.read_write", "https://www.googleapis.com/auth/ndev.clouddns.readwrite"]
   }
   tags = ["ha-gce-example-com-k8s-io-role-master"]
@@ -702,7 +702,7 @@ resource "google_compute_instance_template" "nodes-ha-gce-example-com" {
     preemptible         = false
   }
   service_account {
-    email  = "default"
+    email  = "node-ha-gce-example-com@testproject.iam.gserviceaccount.com"
     scopes = ["https://www.googleapis.com/auth/compute", "https://www.googleapis.com/auth/monitoring", "https://www.googleapis.com/auth/logging.write", "https://www.googleapis.com/auth/devstorage.read_only"]
   }
   tags = ["ha-gce-example-com-k8s-io-role-node"]
@@ -720,6 +720,30 @@ resource "google_compute_subnetwork" "us-test1-ha-gce-example-com" {
   region        = "us-test1"
 }
 
+resource "google_project_iam_binding" "serviceaccount-control-plane" {
+  member  = "serviceAccount:control-plane-ha-gce-ex-mr702t@testproject.iam.gserviceaccount.com"
+  project = "testproject"
+  role    = "roles/container.serviceAgent"
+}
+
+resource "google_project_iam_binding" "serviceaccount-nodes" {
+  member  = "serviceAccount:node-ha-gce-example-com@testproject.iam.gserviceaccount.com"
+  project = "testproject"
+  role    = "roles/compute.viewer"
+}
+
+resource "google_service_account" "control-plane" {
+  account_id  = "control-plane-ha-gce-ex-mr702t"
+  description = "kubernetes control-plane instances"
+  project     = "testproject"
+}
+
+resource "google_service_account" "node" {
+  account_id  = "node-ha-gce-example-com"
+  description = "kubernetes worker nodes"
+  project     = "testproject"
+}
+
 terraform {
   required_version = ">= 0.15.0"
   required_providers {

tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script

@@ -123,7 +123,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
-  gceServiceAccount: default
   gcpPDCSIDriver:
     enabled: true
   manageStorageClasses: true

tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script

@@ -123,7 +123,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
-  gceServiceAccount: default
   gcpPDCSIDriver:
     enabled: true
   manageStorageClasses: true

tests/integration/update_cluster/minimal_gce/kubernetes.tf

@@ -460,7 +460,7 @@ resource "google_compute_instance_template" "master-us-test1-a-minimal-gce-examp
     preemptible         = false
   }
   service_account {
-    email  = "default"
+    email  = "control-plane-minimal-g-fu1mg6@testproject.iam.gserviceaccount.com"
     scopes = ["https://www.googleapis.com/auth/compute", "https://www.googleapis.com/auth/monitoring", "https://www.googleapis.com/auth/logging.write", "https://www.googleapis.com/auth/devstorage.read_write", "https://www.googleapis.com/auth/ndev.clouddns.readwrite"]
   }
   tags = ["minimal-gce-example-com-k8s-io-role-master"]
@@ -506,7 +506,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-example-com" {
     preemptible         = false
   }
   service_account {
-    email  = "default"
+    email  = "node-minimal-gce-example-com@testproject.iam.gserviceaccount.com"
     scopes = ["https://www.googleapis.com/auth/compute", "https://www.googleapis.com/auth/monitoring", "https://www.googleapis.com/auth/logging.write", "https://www.googleapis.com/auth/devstorage.read_only"]
   }
   tags = ["minimal-gce-example-com-k8s-io-role-node"]
@@ -524,6 +524,30 @@ resource "google_compute_subnetwork" "us-test1-minimal-gce-example-com" {
   region        = "us-test1"
 }
 
+resource "google_project_iam_binding" "serviceaccount-control-plane" {
+  member  = "serviceAccount:control-plane-minimal-g-fu1mg6@testproject.iam.gserviceaccount.com"
+  project = "testproject"
+  role    = "roles/container.serviceAgent"
+}
+
+resource "google_project_iam_binding" "serviceaccount-nodes" {
+  member  = "serviceAccount:node-minimal-gce-example-com@testproject.iam.gserviceaccount.com"
+  project = "testproject"
+  role    = "roles/compute.viewer"
+}
+
+resource "google_service_account" "control-plane" {
+  account_id  = "control-plane-minimal-g-fu1mg6"
+  description = "kubernetes control-plane instances"
+  project     = "testproject"
+}
+
+resource "google_service_account" "node" {
+  account_id  = "node-minimal-gce-example-com"
+  description = "kubernetes worker nodes"
+  project     = "testproject"
+}
+
 terraform {
   required_version = ">= 0.15.0"
   required_providers {

tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script

@@ -123,7 +123,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
-  gceServiceAccount: default
   gcpPDCSIDriver:
     enabled: false
   manageStorageClasses: true

tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script

@@ -123,7 +123,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
-  gceServiceAccount: default
   gcpPDCSIDriver:
     enabled: false
   manageStorageClasses: true

tests/integration/update_cluster/minimal_gce_private/kubernetes.tf

@@ -458,7 +458,7 @@ resource "google_compute_instance_template" "master-us-test1-a-minimal-gce-priva
     preemptible         = false
   }
   service_account {
-    email  = "default"
+    email  = "control-plane-minimal-g-sh4okp@testproject.iam.gserviceaccount.com"
     scopes = ["https://www.googleapis.com/auth/compute", "https://www.googleapis.com/auth/monitoring", "https://www.googleapis.com/auth/logging.write", "https://www.googleapis.com/auth/devstorage.read_write", "https://www.googleapis.com/auth/ndev.clouddns.readwrite"]
   }
   tags = ["minimal-gce-private-example-com-k8s-io-role-master"]
@@ -502,7 +502,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-private-example-c
     preemptible         = false
   }
   service_account {
-    email  = "default"
+    email  = "node-minimal-gce-privat-sh4okp@testproject.iam.gserviceaccount.com"
     scopes = ["https://www.googleapis.com/auth/compute", "https://www.googleapis.com/auth/monitoring", "https://www.googleapis.com/auth/logging.write", "https://www.googleapis.com/auth/devstorage.read_only"]
   }
   tags = ["minimal-gce-private-example-com-k8s-io-role-node"]
@@ -537,6 +537,30 @@ resource "google_compute_subnetwork" "us-test1-minimal-gce-private-example-com"
   region        = "us-test1"
 }
 
+resource "google_project_iam_binding" "serviceaccount-control-plane" {
+  member  = "serviceAccount:control-plane-minimal-g-sh4okp@testproject.iam.gserviceaccount.com"
+  project = "testproject"
+  role    = "roles/container.serviceAgent"
+}
+
+resource "google_project_iam_binding" "serviceaccount-nodes" {
+  member  = "serviceAccount:node-minimal-gce-privat-sh4okp@testproject.iam.gserviceaccount.com"
+  project = "testproject"
+  role    = "roles/compute.viewer"
+}
+
+resource "google_service_account" "control-plane" {
+  account_id  = "control-plane-minimal-g-sh4okp"
+  description = "kubernetes control-plane instances"
+  project     = "testproject"
+}
+
+resource "google_service_account" "node" {
+  account_id  = "node-minimal-gce-privat-sh4okp"
+  description = "kubernetes worker nodes"
+  project     = "testproject"
+}
+
 terraform {
   required_version = ">= 0.15.0"
   required_providers {