From 41c82ee6b447409f4cc6e711fb2f29bbdb11f848 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 9 Jul 2023 12:25:06 +0300 Subject: [PATCH] hack/update-expected.sh --- ...ster-us-test1-a-ha-gce-example-com_metadata_user-data} | 0 ...ster-us-test1-b-ha-gce-example-com_metadata_user-data} | 0 ...ster-us-test1-c-ha-gce-example-com_metadata_user-data} | 0 ..._template_nodes-ha-gce-example-com_metadata_user-data} | 0 tests/integration/update_cluster/ha_gce/kubernetes.tf | 8 ++++---- ...ter-us-test1-a-minimal-example-com_metadata_user-data} | 0 ...template_nodes-minimal-example-com_metadata_user-data} | 0 .../update_cluster/many-addons-gce/kubernetes.tf | 4 ++-- ...us-test1-a-minimal-gce-example-com_metadata_user-data} | 0 ...late_nodes-minimal-gce-example-com_metadata_user-data} | 0 .../integration/update_cluster/minimal_gce/kubernetes.tf | 4 ++-- ...us-test1-a-minimal-gce-example-com_metadata_user-data} | 0 ...late_nodes-minimal-gce-example-com_metadata_user-data} | 0 .../update_cluster/minimal_gce_dns-none/kubernetes.tf | 4 ++-- ...est1-a-minimal-gce-ilb-example-com_metadata_user-data} | 0 ..._nodes-minimal-gce-ilb-example-com_metadata_user-data} | 0 .../update_cluster/minimal_gce_ilb/kubernetes.tf | 4 ++-- ...ry-very-very-long-name-example-com_metadata_user-data} | 0 ...ry-very-very-long-name-example-com_metadata_user-data} | 0 .../minimal_gce_ilb_longclustername/kubernetes.tf | 4 ++-- ...ry-very-very-long-name-example-com_metadata_user-data} | 0 ...ry-very-very-long-name-example-com_metadata_user-data} | 0 .../minimal_gce_longclustername/kubernetes.tf | 4 ++-- ...est1-a-minimal-gce-plb-example-com_metadata_user-data} | 0 ..._nodes-minimal-gce-plb-example-com_metadata_user-data} | 0 .../update_cluster/minimal_gce_plb/kubernetes.tf | 4 ++-- ...-a-minimal-gce-private-example-com_metadata_user-data} | 0 ...es-minimal-gce-private-example-com_metadata_user-data} | 0 .../update_cluster/minimal_gce_private/kubernetes.tf | 4 ++-- 29 files changed, 20 insertions(+), 20 deletions(-) rename tests/integration/update_cluster/ha_gce/data/{google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script => google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/ha_gce/data/{google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script => google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/ha_gce/data/{google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script => google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/ha_gce/data/{google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script => google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/many-addons-gce/data/{google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script => google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/many-addons-gce/data/{google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script => google_compute_instance_template_nodes-minimal-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce/data/{google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script => google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce/data/{google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script => google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_dns-none/data/{google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script => google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_dns-none/data/{google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script => google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_ilb/data/{google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script => google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_ilb/data/{google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script => google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_ilb_longclustername/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 => google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/{google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script => google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_longclustername/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 => google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_longclustername/data/{google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script => google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_plb/data/{google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script => google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_plb/data/{google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_startup-script => google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_private/data/{google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script => google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data} (100%) rename tests/integration/update_cluster/minimal_gce_private/data/{google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script => google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data} (100%) diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script rename to tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script rename to tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script rename to tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script rename to tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-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 index 0d8e7732f9..65866369fa 100644 --- 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/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script rename to tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script rename to tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-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 index 0533ee3a19..74e5e4d947 100644 --- 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/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-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 index 2824591966..2a732636ea 100644 --- 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/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-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 index 9e25652912..6a6b663452 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf @@ -458,7 +458,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 { @@ -508,7 +508,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/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-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 index 7a6efb9874..c8b4fceb27 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf @@ -456,7 +456,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 { @@ -506,7 +506,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/tests/integration/update_cluster/minimal_gce_ilb_longclustername/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 b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/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 similarity index 100% rename from tests/integration/update_cluster/minimal_gce_ilb_longclustername/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 rename to tests/integration/update_cluster/minimal_gce_ilb_longclustername/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 diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-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 index 0105775dff..54fbd76201 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf @@ -456,7 +456,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 { @@ -506,7 +506,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/tests/integration/update_cluster/minimal_gce_longclustername/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 b/tests/integration/update_cluster/minimal_gce_longclustername/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 similarity index 100% rename from tests/integration/update_cluster/minimal_gce_longclustername/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 rename to tests/integration/update_cluster/minimal_gce_longclustername/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 diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-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 index 89471b248a..694af4bf33 100644 --- 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/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-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 index c2678c41e3..6278cacf87 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_plb/kubernetes.tf @@ -472,7 +472,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 { @@ -522,7 +522,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/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data similarity index 100% rename from tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script rename to tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-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 index 3379309742..5301819cab 100644 --- 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 {