diff --git a/cmd/kops/test/edit_instance_group.yaml b/cmd/kops/test/edit_instance_group.yaml index f653a14951..945f275583 100644 --- a/cmd/kops/test/edit_instance_group.yaml +++ b/cmd/kops/test/edit_instance_group.yaml @@ -7,6 +7,7 @@ metadata: kops.k8s.io/cluster: test.k8s.io name: nodes spec: + image: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20220404 maxSize: 10 role: Node subnets: diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json b/tests/integration/update_cluster/containerd-custom/cloudformation.json index ce3ee97629..9141ccd087 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json @@ -236,7 +236,7 @@ "Ref": "AWSIAMInstanceProfilemasterscontainerdexamplecom" } }, - "ImageId": "ami-11400000", + "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.containerd.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", "MetadataOptions": { @@ -378,7 +378,7 @@ "Ref": "AWSIAMInstanceProfilenodescontainerdexamplecom" } }, - "ImageId": "ami-11400000", + "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.containerd.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", "MetadataOptions": { diff --git a/tests/integration/update_cluster/containerd/cloudformation.json b/tests/integration/update_cluster/containerd/cloudformation.json index ce3ee97629..9141ccd087 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json +++ b/tests/integration/update_cluster/containerd/cloudformation.json @@ -236,7 +236,7 @@ "Ref": "AWSIAMInstanceProfilemasterscontainerdexamplecom" } }, - "ImageId": "ami-11400000", + "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.containerd.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", "MetadataOptions": { @@ -378,7 +378,7 @@ "Ref": "AWSIAMInstanceProfilenodescontainerdexamplecom" } }, - "ImageId": "ami-11400000", + "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.containerd.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", "MetadataOptions": { diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json b/tests/integration/update_cluster/docker-custom/cloudformation.json index a61217ba91..fcd9fc399b 100644 --- a/tests/integration/update_cluster/docker-custom/cloudformation.json +++ b/tests/integration/update_cluster/docker-custom/cloudformation.json @@ -236,7 +236,7 @@ "Ref": "AWSIAMInstanceProfilemastersdockerexamplecom" } }, - "ImageId": "ami-11400000", + "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.docker.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", "MetadataOptions": { @@ -378,7 +378,7 @@ "Ref": "AWSIAMInstanceProfilenodesdockerexamplecom" } }, - "ImageId": "ami-11400000", + "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.docker.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", "MetadataOptions": { diff --git a/tests/integration/update_cluster/existing_iam/kubernetes.tf b/tests/integration/update_cluster/existing_iam/kubernetes.tf index b7bb1ebde6..a4d563a636 100644 --- a/tests/integration/update_cluster/existing_iam/kubernetes.tf +++ b/tests/integration/update_cluster/existing_iam/kubernetes.tf @@ -454,7 +454,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-existing-iam-example-c iam_instance_profile { name = "kops-custom-master-role" } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "m3.medium" key_name = aws_key_pair.kubernetes-existing-iam-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { @@ -540,7 +540,7 @@ resource "aws_launch_template" "master-us-test-1b-masters-existing-iam-example-c iam_instance_profile { name = "kops-custom-master-role" } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "m3.medium" key_name = aws_key_pair.kubernetes-existing-iam-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { @@ -626,7 +626,7 @@ resource "aws_launch_template" "master-us-test-1c-masters-existing-iam-example-c iam_instance_profile { name = "kops-custom-master-role" } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "m3.medium" key_name = aws_key_pair.kubernetes-existing-iam-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { @@ -708,7 +708,7 @@ resource "aws_launch_template" "nodes-existing-iam-example-com" { iam_instance_profile { name = "kops-custom-node-role" } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "t2.medium" key_name = aws_key_pair.kubernetes-existing-iam-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json b/tests/integration/update_cluster/private-shared-ip/cloudformation.json index fb9adf7fc2..62a28db4a8 100644 --- a/tests/integration/update_cluster/private-shared-ip/cloudformation.json +++ b/tests/integration/update_cluster/private-shared-ip/cloudformation.json @@ -276,7 +276,7 @@ "Ref": "AWSIAMInstanceProfilebastionsprivatesharedipexamplecom" } }, - "ImageId": "ami-11400000", + "ImageId": "ami-12345678", "InstanceType": "t2.micro", "KeyName": "kubernetes.private-shared-ip.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", "MetadataOptions": { @@ -397,7 +397,7 @@ "Ref": "AWSIAMInstanceProfilemastersprivatesharedipexamplecom" } }, - "ImageId": "ami-11400000", + "ImageId": "ami-12345678", "InstanceType": "m3.medium", "KeyName": "kubernetes.private-shared-ip.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", "MetadataOptions": { @@ -539,7 +539,7 @@ "Ref": "AWSIAMInstanceProfilenodesprivatesharedipexamplecom" } }, - "ImageId": "ami-11400000", + "ImageId": "ami-12345678", "InstanceType": "t2.medium", "KeyName": "kubernetes.private-shared-ip.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57", "MetadataOptions": { diff --git a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf index 2cd3238a5c..11cc18d68b 100644 --- a/tests/integration/update_cluster/private-shared-ip/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-ip/kubernetes.tf @@ -465,7 +465,7 @@ resource "aws_launch_template" "bastion-private-shared-ip-example-com" { iam_instance_profile { name = aws_iam_instance_profile.bastions-private-shared-ip-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "t2.micro" key_name = aws_key_pair.kubernetes-private-shared-ip-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { @@ -541,7 +541,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-private-shared-ip-exam iam_instance_profile { name = aws_iam_instance_profile.masters-private-shared-ip-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "m3.medium" key_name = aws_key_pair.kubernetes-private-shared-ip-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { @@ -623,7 +623,7 @@ resource "aws_launch_template" "nodes-private-shared-ip-example-com" { iam_instance_profile { name = aws_iam_instance_profile.nodes-private-shared-ip-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "t2.medium" key_name = aws_key_pair.kubernetes-private-shared-ip-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { diff --git a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf index fcc45ef4c3..4d79c79c7f 100644 --- a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf @@ -460,7 +460,7 @@ resource "aws_launch_template" "bastion-private-shared-subnet-example-com" { iam_instance_profile { name = aws_iam_instance_profile.bastions-private-shared-subnet-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "t2.micro" key_name = aws_key_pair.kubernetes-private-shared-subnet-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { @@ -536,7 +536,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-private-shared-subnet- iam_instance_profile { name = aws_iam_instance_profile.masters-private-shared-subnet-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "m3.medium" key_name = aws_key_pair.kubernetes-private-shared-subnet-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { @@ -618,7 +618,7 @@ resource "aws_launch_template" "nodes-private-shared-subnet-example-com" { iam_instance_profile { name = aws_iam_instance_profile.nodes-private-shared-subnet-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "t2.medium" key_name = aws_key_pair.kubernetes-private-shared-subnet-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { diff --git a/tests/integration/update_cluster/privatekopeio/kubernetes.tf b/tests/integration/update_cluster/privatekopeio/kubernetes.tf index 07281d1f0c..94aefcf22f 100644 --- a/tests/integration/update_cluster/privatekopeio/kubernetes.tf +++ b/tests/integration/update_cluster/privatekopeio/kubernetes.tf @@ -494,7 +494,7 @@ resource "aws_launch_template" "bastion-privatekopeio-example-com" { iam_instance_profile { name = aws_iam_instance_profile.bastions-privatekopeio-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "t2.micro" key_name = aws_key_pair.kubernetes-privatekopeio-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { @@ -570,7 +570,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-privatekopeio-example- iam_instance_profile { name = aws_iam_instance_profile.masters-privatekopeio-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "m3.medium" key_name = aws_key_pair.kubernetes-privatekopeio-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { @@ -652,7 +652,7 @@ resource "aws_launch_template" "nodes-privatekopeio-example-com" { iam_instance_profile { name = aws_iam_instance_profile.nodes-privatekopeio-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "t2.medium" key_name = aws_key_pair.kubernetes-privatekopeio-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { diff --git a/tests/integration/update_cluster/unmanaged/kubernetes.tf b/tests/integration/update_cluster/unmanaged/kubernetes.tf index a02f5f0b9c..19319bcbd1 100644 --- a/tests/integration/update_cluster/unmanaged/kubernetes.tf +++ b/tests/integration/update_cluster/unmanaged/kubernetes.tf @@ -465,7 +465,7 @@ resource "aws_launch_template" "bastion-unmanaged-example-com" { iam_instance_profile { name = aws_iam_instance_profile.bastions-unmanaged-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "t2.micro" key_name = aws_key_pair.kubernetes-unmanaged-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { @@ -541,7 +541,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-unmanaged-example-com" iam_instance_profile { name = aws_iam_instance_profile.masters-unmanaged-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "m3.medium" key_name = aws_key_pair.kubernetes-unmanaged-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle { @@ -623,7 +623,7 @@ resource "aws_launch_template" "nodes-unmanaged-example-com" { iam_instance_profile { name = aws_iam_instance_profile.nodes-unmanaged-example-com.id } - image_id = "ami-11400000" + image_id = "ami-12345678" instance_type = "t2.medium" key_name = aws_key_pair.kubernetes-unmanaged-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id lifecycle {