Merge pull request #15607 from hakman/gce_cloud-init

gce: Use `user-data` instead of `startup-script` metadata key
kubernetes · Jul 15, 2023 · 141a040 · 141a040
2 parents 343d8cd + 41c82ee
commit 141a040
Show file tree

Hide file tree

Showing 32 changed files with 34 additions and 43 deletions.
diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go
@@ -1710,7 +1710,7 @@ func (i *integrationTest) runTestTerraformGCE(t *testing.T) {
 	expectedFilenames := i.expectTerraformFilenames
 
 	expectedFilenames = append(expectedFilenames,
-		"google_compute_instance_template_nodes-"+gce.SafeClusterName(i.clusterName)+"_metadata_startup-script",
+		"google_compute_instance_template_nodes-"+gce.SafeClusterName(i.clusterName)+"_metadata_user-data",
 		"aws_s3_object_cluster-completed.spec_content",
 		"aws_s3_object_etcd-cluster-spec-events_content",
 		"aws_s3_object_etcd-cluster-spec-main_content",
@@ -1732,7 +1732,7 @@ func (i *integrationTest) runTestTerraformGCE(t *testing.T) {
 		expectedFilenames = append(expectedFilenames, "aws_s3_object_manifests-etcdmanager-events-master-"+zone+"_content")
 		expectedFilenames = append(expectedFilenames, "aws_s3_object_manifests-etcdmanager-main-master-"+zone+"_content")
 		expectedFilenames = append(expectedFilenames, "aws_s3_object_nodeupconfig-master-"+zone+"_content")
-		expectedFilenames = append(expectedFilenames, prefix+"startup-script")
+		expectedFilenames = append(expectedFilenames, prefix+"user-data")
 	}
 
 	i.runTest(t, ctx, h, expectedFilenames, "", "", nil)

diff --git a/pkg/model/gcemodel/autoscalinggroup.go b/pkg/model/gcemodel/autoscalinggroup.go
@@ -109,8 +109,9 @@ func (b *AutoscalingGroupModelBuilder) buildInstanceTemplate(c *fi.CloudupModelB
 				},
 			}
 
+			// Use "user-data" instead of "startup-script", for compatibility with cloud-init
 			if startupScript != nil {
-				t.Metadata["startup-script"] = startupScript
+				t.Metadata["user-data"] = startupScript
 			}
 
 			if ig.Spec.Role == kops.InstanceGroupRoleNode {

diff --git a/...a-gce-example-com_metadata_startup-script → ...1-a-ha-gce-example-com_metadata_user-data b/...a-gce-example-com_metadata_startup-script → ...1-a-ha-gce-example-com_metadata_user-data
diff --git a/...a-gce-example-com_metadata_startup-script → ...1-b-ha-gce-example-com_metadata_user-data b/...a-gce-example-com_metadata_startup-script → ...1-b-ha-gce-example-com_metadata_user-data
diff --git a/...a-gce-example-com_metadata_startup-script → ...1-c-ha-gce-example-com_metadata_user-data b/...a-gce-example-com_metadata_startup-script → ...1-c-ha-gce-example-com_metadata_user-data
diff --git a/...a-gce-example-com_metadata_startup-script → ...des-ha-gce-example-com_metadata_user-data b/...a-gce-example-com_metadata_startup-script → ...des-ha-gce-example-com_metadata_user-data
diff --git a/tests/integration/update_cluster/ha_gce/kubernetes.tf b/tests/integration/update_cluster/ha_gce/kubernetes.tf
@@ -589,7 +589,7 @@ resource "google_compute_instance_template" "master-us-test1-a-ha-gce-example-co
     "cluster-name"                    = "ha-gce.example.com"
     "kops-k8s-io-instance-group-name" = "master-us-test1-a"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data")
   }
   name_prefix = "master-us-test1-a-ha-gce--ke5ah6-"
   network_interface {
@@ -641,7 +641,7 @@ resource "google_compute_instance_template" "master-us-test1-b-ha-gce-example-co
     "cluster-name"                    = "ha-gce.example.com"
     "kops-k8s-io-instance-group-name" = "master-us-test1-b"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data")
   }
   name_prefix = "master-us-test1-b-ha-gce--c8u7qq-"
   network_interface {
@@ -693,7 +693,7 @@ resource "google_compute_instance_template" "master-us-test1-c-ha-gce-example-co
     "cluster-name"                    = "ha-gce.example.com"
     "kops-k8s-io-instance-group-name" = "master-us-test1-c"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data")
   }
   name_prefix = "master-us-test1-c-ha-gce--3unp7l-"
   network_interface {
@@ -745,7 +745,7 @@ resource "google_compute_instance_template" "nodes-ha-gce-example-com" {
     "kops-k8s-io-instance-group-name" = "nodes"
     "kube-env"                        = "AUTOSCALER_ENV_VARS: os_distribution=ubuntu;arch=amd64;os=linux"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data")
   }
   name_prefix = "nodes-ha-gce-example-com-"
   network_interface {

diff --git a/...nimal-example-com_metadata_startup-script → ...-a-minimal-example-com_metadata_user-data b/...nimal-example-com_metadata_startup-script → ...-a-minimal-example-com_metadata_user-data
diff --git a/...nimal-example-com_metadata_startup-script → ...es-minimal-example-com_metadata_user-data b/...nimal-example-com_metadata_startup-script → ...es-minimal-example-com_metadata_user-data
diff --git a/tests/integration/update_cluster/many-addons-gce/kubernetes.tf b/tests/integration/update_cluster/many-addons-gce/kubernetes.tf
@@ -477,7 +477,7 @@ resource "google_compute_instance_template" "master-us-test1-a-minimal-example-c
     "cluster-name"                    = "minimal.example.com"
     "kops-k8s-io-instance-group-name" = "master-us-test1-a"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data")
   }
   name_prefix = "master-us-test1-a-minimal-e8ua4m-"
   network_interface {
@@ -529,7 +529,7 @@ resource "google_compute_instance_template" "nodes-minimal-example-com" {
     "kops-k8s-io-instance-group-name" = "nodes"
     "kube-env"                        = "AUTOSCALER_ENV_VARS: os_distribution=ubuntu;arch=amd64;os=linux"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data")
   }
   name_prefix = "nodes-minimal-example-com-"
   network_interface {

diff --git a/...l-gce-example-com_metadata_startup-script → ...inimal-gce-example-com_metadata_user-data b/...l-gce-example-com_metadata_startup-script → ...inimal-gce-example-com_metadata_user-data
diff --git a/...l-gce-example-com_metadata_startup-script → ...inimal-gce-example-com_metadata_user-data b/...l-gce-example-com_metadata_startup-script → ...inimal-gce-example-com_metadata_user-data
diff --git a/tests/integration/update_cluster/minimal_gce/kubernetes.tf b/tests/integration/update_cluster/minimal_gce/kubernetes.tf
@@ -453,7 +453,7 @@ resource "google_compute_instance_template" "master-us-test1-a-minimal-gce-examp
     "cluster-name"                    = "minimal-gce.example.com"
     "kops-k8s-io-instance-group-name" = "master-us-test1-a"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data")
   }
   name_prefix = "master-us-test1-a-minimal-do16cp-"
   network_interface {
@@ -505,7 +505,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-example-com" {
     "kops-k8s-io-instance-group-name" = "nodes"
     "kube-env"                        = "AUTOSCALER_ENV_VARS: os_distribution=ubuntu;arch=amd64;os=linux"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data")
   }
   name_prefix = "nodes-minimal-gce-example-com-"
   network_interface {

diff --git a/...l-gce-example-com_metadata_startup-script → ...inimal-gce-example-com_metadata_user-data b/...l-gce-example-com_metadata_startup-script → ...inimal-gce-example-com_metadata_user-data
diff --git a/...l-gce-example-com_metadata_startup-script → ...inimal-gce-example-com_metadata_user-data b/...l-gce-example-com_metadata_startup-script → ...inimal-gce-example-com_metadata_user-data
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf
@@ -526,7 +526,7 @@ resource "google_compute_instance_template" "master-us-test1-a-minimal-gce-examp
     "cluster-name"                    = "minimal-gce.example.com"
     "kops-k8s-io-instance-group-name" = "master-us-test1-a"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data")
   }
   name_prefix = "master-us-test1-a-minimal-do16cp-"
   network_interface {
@@ -576,7 +576,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-example-com" {
     "kops-k8s-io-instance-group-name" = "nodes"
     "kube-env"                        = "AUTOSCALER_ENV_VARS: os_distribution=ubuntu;arch=amd64;os=linux"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data")
   }
   name_prefix = "nodes-minimal-gce-example-com-"
   network_interface {

diff --git a/...e-ilb-example-com_metadata_startup-script → ...al-gce-ilb-example-com_metadata_user-data b/...e-ilb-example-com_metadata_startup-script → ...al-gce-ilb-example-com_metadata_user-data
diff --git a/...e-ilb-example-com_metadata_startup-script → ...al-gce-ilb-example-com_metadata_user-data b/...e-ilb-example-com_metadata_startup-script → ...al-gce-ilb-example-com_metadata_user-data
diff --git a/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf
@@ -499,7 +499,7 @@ resource "google_compute_instance_template" "master-us-test1-a-minimal-gce-ilb-e
     "cluster-name"                    = "minimal-gce-ilb.example.com"
     "kops-k8s-io-instance-group-name" = "master-us-test1-a"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data")
   }
   name_prefix = "master-us-test1-a-minimal-k0i8ah-"
   network_interface {
@@ -549,7 +549,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-ilb-example-com"
     "kops-k8s-io-instance-group-name" = "nodes"
     "kube-env"                        = "AUTOSCALER_ENV_VARS: os_distribution=ubuntu;arch=amd64;os=linux"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data")
   }
   name_prefix = "nodes-minimal-gce-ilb-exa-mk47iu-"
   network_interface {

diff --git a/...-name-example-com_metadata_startup-script → ...-long-name-example-com_metadata_user-data b/...-name-example-com_metadata_startup-script → ...-long-name-example-com_metadata_user-data
diff --git a/...-name-example-com_metadata_startup-script → ...-long-name-example-com_metadata_user-data b/...-name-example-com_metadata_startup-script → ...-long-name-example-com_metadata_user-data
diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf
@@ -499,7 +499,7 @@ resource "google_compute_instance_template" "master-us-test1-a-minimal-gce-with-
     "cluster-name"                    = "minimal-gce-with-a-very-very-very-very-very-long-name.example.com"
     "kops-k8s-io-instance-group-name" = "master-us-test1-a"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data")
   }
   name_prefix = "master-us-test1-a-minimal-ivl9ll-"
   network_interface {
@@ -549,7 +549,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-with-a-very-very-
     "kops-k8s-io-instance-group-name" = "nodes"
     "kube-env"                        = "AUTOSCALER_ENV_VARS: os_distribution=ubuntu;arch=amd64;os=linux"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data")
   }
   name_prefix = "nodes-minimal-gce-with-a--k0ql96-"
   network_interface {

diff --git a/...-name-example-com_metadata_startup-script → ...-long-name-example-com_metadata_user-data b/...-name-example-com_metadata_startup-script → ...-long-name-example-com_metadata_user-data
diff --git a/...-name-example-com_metadata_startup-script → ...-long-name-example-com_metadata_user-data b/...-name-example-com_metadata_startup-script → ...-long-name-example-com_metadata_user-data
diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf
@@ -453,7 +453,7 @@ resource "google_compute_instance_template" "master-us-test1-a-minimal-gce-with-
     "cluster-name"                    = "minimal-gce-with-a-very-very-very-very-very-long-name.example.com"
     "kops-k8s-io-instance-group-name" = "master-us-test1-a"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data")
   }
   name_prefix = "master-us-test1-a-minimal-ivl9ll-"
   network_interface {
@@ -505,7 +505,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-with-a-very-very-
     "kops-k8s-io-instance-group-name" = "nodes"
     "kube-env"                        = "AUTOSCALER_ENV_VARS: os_distribution=ubuntu;arch=amd64;os=linux"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data")
   }
   name_prefix = "nodes-minimal-gce-with-a--k0ql96-"
   network_interface {

diff --git a/...e-plb-example-com_metadata_startup-script → ...al-gce-plb-example-com_metadata_user-data b/...e-plb-example-com_metadata_startup-script → ...al-gce-plb-example-com_metadata_user-data
diff --git a/...e-plb-example-com_metadata_startup-script → ...al-gce-plb-example-com_metadata_user-data b/...e-plb-example-com_metadata_startup-script → ...al-gce-plb-example-com_metadata_user-data
diff --git a/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf
@@ -483,7 +483,7 @@ resource "google_compute_instance_template" "master-us-test1-a-minimal-gce-plb-e
     "cluster-name"                    = "minimal-gce-plb.example.com"
     "kops-k8s-io-instance-group-name" = "master-us-test1-a"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data")
   }
   name_prefix = "master-us-test1-a-minimal-b9uem4-"
   network_interface {
@@ -533,7 +533,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-plb-example-com"
     "kops-k8s-io-instance-group-name" = "nodes"
     "kube-env"                        = "AUTOSCALER_ENV_VARS: os_distribution=ubuntu;arch=amd64;os=linux"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data")
   }
   name_prefix = "nodes-minimal-gce-plb-exa-7p2hv9-"
   network_interface {

diff --git a/...ivate-example-com_metadata_startup-script → ...ce-private-example-com_metadata_user-data b/...ivate-example-com_metadata_startup-script → ...ce-private-example-com_metadata_user-data
diff --git a/...ivate-example-com_metadata_startup-script → ...ce-private-example-com_metadata_user-data b/...ivate-example-com_metadata_startup-script → ...ce-private-example-com_metadata_user-data
diff --git a/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf
@@ -453,7 +453,7 @@ resource "google_compute_instance_template" "master-us-test1-a-minimal-gce-priva
     "cluster-name"                    = "minimal-gce-private.example.com"
     "kops-k8s-io-instance-group-name" = "master-us-test1-a"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data")
   }
   name_prefix = "master-us-test1-a-minimal-asf34c-"
   network_interface {
@@ -503,7 +503,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-private-example-c
     "kops-k8s-io-instance-group-name" = "nodes"
     "kube-env"                        = "AUTOSCALER_ENV_VARS: os_distribution=ubuntu;arch=amd64;os=linux"
     "ssh-keys"                        = "admin: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ=="
-    "startup-script"                  = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script")
+    "user-data"                       = file("${path.module}/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data")
   }
   name_prefix = "nodes-minimal-gce-private-4aopo5-"
   network_interface {