diff --git a/tests/integration/update_cluster/ha_gce/kubernetes.tf b/tests/integration/update_cluster/ha_gce/kubernetes.tf index 77ca359cb1..f0efa3f978 100644 --- a/tests/integration/update_cluster/ha_gce/kubernetes.tf +++ b/tests/integration/update_cluster/ha_gce/kubernetes.tf @@ -716,6 +716,7 @@ resource "google_compute_instance_template" "nodes-ha-gce-example-com" { metadata = { "cluster-name" = "ha-gce.example.com" "kops-k8s-io-instance-group-name" = "nodes" + "kube-env" = "AUTOSCALER_ENV_VARS: os_distribution=cos;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") } diff --git a/tests/integration/update_cluster/many-addons-gce/kubernetes.tf b/tests/integration/update_cluster/many-addons-gce/kubernetes.tf index c415961dbb..7fb5450939 100644 --- a/tests/integration/update_cluster/many-addons-gce/kubernetes.tf +++ b/tests/integration/update_cluster/many-addons-gce/kubernetes.tf @@ -516,6 +516,7 @@ resource "google_compute_instance_template" "nodes-minimal-example-com" { metadata = { "cluster-name" = "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") } diff --git a/tests/integration/update_cluster/minimal_gce/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal_gce/in-v1alpha2.yaml index 669f9b8974..a6d148564d 100644 --- a/tests/integration/update_cluster/minimal_gce/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal_gce/in-v1alpha2.yaml @@ -55,7 +55,7 @@ metadata: kops.k8s.io/cluster: minimal-gce.example.com name: master-us-test1-a spec: - image: cos-cloud/cos-stable-57-9202-64-0 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20221018 machineType: n1-standard-1 maxSize: 1 minSize: 1 @@ -75,7 +75,7 @@ metadata: kops.k8s.io/cluster: minimal-gce.example.com name: nodes spec: - image: cos-cloud/cos-stable-57-9202-64-0 + image: ubuntu-os-cloud/ubuntu-2004-focal-v20221018 machineType: n1-standard-2 maxSize: 2 minSize: 2 diff --git a/tests/integration/update_cluster/minimal_gce/kubernetes.tf b/tests/integration/update_cluster/minimal_gce/kubernetes.tf index 27eb8c0d93..573f35e5ba 100644 --- a/tests/integration/update_cluster/minimal_gce/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce/kubernetes.tf @@ -432,7 +432,7 @@ resource "google_compute_instance_template" "master-us-test1-a-minimal-gce-examp interface = "" mode = "READ_WRITE" source = "" - source_image = "https://www.googleapis.com/compute/v1/projects/cos-cloud/global/images/cos-stable-57-9202-64-0" + source_image = "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221018" type = "PERSISTENT" } labels = { @@ -480,7 +480,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-example-com" { interface = "" mode = "READ_WRITE" source = "" - source_image = "https://www.googleapis.com/compute/v1/projects/cos-cloud/global/images/cos-stable-57-9202-64-0" + source_image = "https://www.googleapis.com/compute/v1/projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221018" type = "PERSISTENT" } labels = { @@ -492,6 +492,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-example-com" { metadata = { "cluster-name" = "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") } diff --git a/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf index 6124e4ac50..cbcfd707ee 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_ilb/kubernetes.tf @@ -485,6 +485,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-ilb-example-com" metadata = { "cluster-name" = "minimal-gce-ilb.example.com" "kops-k8s-io-instance-group-name" = "nodes" + "kube-env" = "AUTOSCALER_ENV_VARS: os_distribution=cos;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") } 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 794cd5ce2f..1b105d93b4 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/kubernetes.tf @@ -493,6 +493,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-with-a-very-very- metadata = { "cluster-name" = "minimal-gce-with-a-very-very-very-very-very-long-name.example.com" "kops-k8s-io-instance-group-name" = "nodes" + "kube-env" = "AUTOSCALER_ENV_VARS: os_distribution=cos;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") } diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf index 163c03507b..dc4e12ae42 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_longclustername/kubernetes.tf @@ -492,6 +492,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-with-a-very-very- metadata = { "cluster-name" = "minimal-gce-with-a-very-very-very-very-very-long-name.example.com" "kops-k8s-io-instance-group-name" = "nodes" + "kube-env" = "AUTOSCALER_ENV_VARS: os_distribution=cos;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") } diff --git a/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf b/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf index a8e1fa7d66..f9fe602baf 100644 --- a/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_gce_private/kubernetes.tf @@ -482,6 +482,7 @@ resource "google_compute_instance_template" "nodes-minimal-gce-private-example-c metadata = { "cluster-name" = "minimal-gce-private.example.com" "kops-k8s-io-instance-group-name" = "nodes" + "kube-env" = "AUTOSCALER_ENV_VARS: os_distribution=cos;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") }