From b6464658d470e0f945e55a3884f270d61a9afe2d Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 29 Jul 2021 05:27:10 +0300 Subject: [PATCH 1/2] Update containerd to v1.4.8 --- pkg/model/components/containerd.go | 2 +- .../cloudformation.json.extracted.yaml | 12 ++++++------ ...test-1a.masters.minimal.example.com_user_data | 4 ++-- ..._template_nodes.minimal.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...masters.bastionuserdata.example.com_user_data | 4 ++-- ...e_nodes.bastionuserdata.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...s3_bucket_object_nodeupconfig-bastion_content | 4 ++-- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../complex/cloudformation.json.extracted.yaml | 8 ++++---- ...test-1a.masters.complex.example.com_user_data | 4 ++-- ..._template_nodes.complex.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...est-1a.masters.compress.example.com_user_data | 4 ++-- ...template_nodes.compress.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 8 ++++---- .../cloudformation.json.extracted.yaml | 8 ++++---- ...1a.masters.existing-iam.example.com_user_data | 4 ++-- ...1b.masters.existing-iam.example.com_user_data | 4 ++-- ...1c.masters.existing-iam.example.com_user_data | 4 ++-- ...late_nodes.existing-iam.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...object_nodeupconfig-master-us-test-1b_content | 4 ++-- ...object_nodeupconfig-master-us-test-1c_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 8 ++++---- ...t-1a.masters.existingsg.example.com_user_data | 4 ++-- ...t-1b.masters.existingsg.example.com_user_data | 4 ++-- ...t-1c.masters.existingsg.example.com_user_data | 4 ++-- ...mplate_nodes.existingsg.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...object_nodeupconfig-master-us-test-1b_content | 4 ++-- ...object_nodeupconfig-master-us-test-1c_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 8 ++++---- ...t-1a.masters.externallb.example.com_user_data | 4 ++-- ...mplate_nodes.externallb.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...asters.externalpolicies.example.com_user_data | 4 ++-- ..._nodes.externalpolicies.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...r-us-test-1a.masters.ha.example.com_user_data | 4 ++-- ...r-us-test-1b.masters.ha.example.com_user_data | 4 ++-- ...r-us-test-1c.masters.ha.example.com_user_data | 4 ++-- ...aunch_template_nodes.ha.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...object_nodeupconfig-master-us-test-1b_content | 4 ++-- ...object_nodeupconfig-master-us-test-1c_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test1-a_content | 4 ++-- ...object_nodeupconfig-master-us-test1-b_content | 4 ++-- ...object_nodeupconfig-master-us-test1-c_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...-a-ha-gce-example-com_metadata_startup-script | 4 ++-- ...-b-ha-gce-example-com_metadata_startup-script | 4 ++-- ...-c-ha-gce-example-com_metadata_startup-script | 4 ++-- ...es-ha-gce-example-com_metadata_startup-script | 4 ++-- ...test-1a.masters.minimal.example.com_user_data | 4 ++-- ..._template_nodes.minimal.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...test-1a.masters.minimal.example.com_user_data | 4 ++-- ..._template_nodes.minimal.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 8 ++++---- .../cloudformation.json.extracted.yaml | 8 ++++---- ...test-1a.masters.minimal.example.com_user_data | 4 ++-- ..._template_nodes.minimal.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 8 ++++---- ...1a.masters.minimal-ipv6.example.com_user_data | 4 ++-- ...late_nodes.minimal-ipv6.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...1a.masters.minimal-json.example.com_user_data | 4 ++-- ...late_nodes.minimal-json.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...asters.minimal-warmpool.example.com_user_data | 4 ++-- ..._nodes.minimal-warmpool.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../minimal/cloudformation.json.extracted.yaml | 8 ++++---- ...test-1a.masters.minimal.example.com_user_data | 4 ++-- ..._template_nodes.minimal.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test1-a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...nimal-gce-example-com_metadata_startup-script | 4 ++-- ...nimal-gce-example-com_metadata_startup-script | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test1-a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...e-private-example-com_metadata_startup-script | 4 ++-- ...e-private-example-com_metadata_startup-script | 4 ++-- ...s-test-1a.masters.minimal.k8s.local_user_data | 4 ++-- ...ch_template_nodes.minimal.k8s.local_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 16 ++++++++-------- ....masters.mixedinstances.example.com_user_data | 4 ++-- ....masters.mixedinstances.example.com_user_data | 4 ++-- ....masters.mixedinstances.example.com_user_data | 4 ++-- ...te_nodes.mixedinstances.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...object_nodeupconfig-master-us-test-1b_content | 4 ++-- ...object_nodeupconfig-master-us-test-1c_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 16 ++++++++-------- ....masters.mixedinstances.example.com_user_data | 4 ++-- ....masters.mixedinstances.example.com_user_data | 4 ++-- ....masters.mixedinstances.example.com_user_data | 4 ++-- ...te_nodes.mixedinstances.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...object_nodeupconfig-master-us-test-1b_content | 4 ++-- ...object_nodeupconfig-master-us-test-1c_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 8 ++++---- ...masters.nthsqsresources.example.com_user_data | 4 ++-- ...e_nodes.nthsqsresources.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 8 ++++---- ...sters.private-shared-ip.example.com_user_data | 4 ++-- ...nodes.private-shared-ip.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...s.private-shared-subnet.example.com_user_data | 4 ++-- ...s.private-shared-subnet.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 8 ++++---- ...a.masters.privatecalico.example.com_user_data | 4 ++-- ...ate_nodes.privatecalico.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...1a.masters.privatecanal.example.com_user_data | 4 ++-- ...late_nodes.privatecanal.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 8 ++++---- ...a.masters.privatecilium.example.com_user_data | 4 ++-- ...ate_nodes.privatecilium.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- .../cloudformation.json.extracted.yaml | 8 ++++---- ...s.privateciliumadvanced.example.com_user_data | 4 ++-- ...s.privateciliumadvanced.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...-1a.masters.privatedns1.example.com_user_data | 4 ++-- ...plate_nodes.privatedns1.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...-1a.masters.privatedns2.example.com_user_data | 4 ++-- ...plate_nodes.privatedns2.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ....masters.privateflannel.example.com_user_data | 4 ++-- ...te_nodes.privateflannel.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...a.masters.privatekopeio.example.com_user_data | 4 ++-- ...ate_nodes.privatekopeio.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...1a.masters.privateweave.example.com_user_data | 4 ++-- ...late_nodes.privateweave.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...1a.masters.sharedsubnet.example.com_user_data | 4 ++-- ...late_nodes.sharedsubnet.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...st-1a.masters.sharedvpc.example.com_user_data | 4 ++-- ...emplate_nodes.sharedvpc.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...st-1a.masters.unmanaged.example.com_user_data | 4 ++-- ...emplate_nodes.unmanaged.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- ...test-1a.masters.minimal.example.com_user_data | 4 ++-- ..._template_nodes.minimal.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 4 ++-- ...s_s3_bucket_object_nodeupconfig-nodes_content | 4 ++-- upup/pkg/fi/cloudup/containerd.go | 4 ++++ 234 files changed, 475 insertions(+), 471 deletions(-) diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go index 01d0e3ea4b..2c6b1eb78d 100644 --- a/pkg/model/components/containerd.go +++ b/pkg/model/components/containerd.go @@ -47,7 +47,7 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error { // Set version based on Kubernetes version if fi.StringValue(containerd.Version) == "" { if b.IsKubernetesGTE("1.19") { - containerd.Version = fi.String("1.4.6") + containerd.Version = fi.String("1.4.8") } else { containerd.Version = fi.String("1.3.10") } diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index 3b282110d9..a691a32ca1 100644 --- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -163,7 +163,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: apiserver InstanceGroupRole: APIServer - NodeupConfigHash: iWrD5bIyJd86oWdSRDFwjcezKpalA0SeCY3CTvmTQjM= + NodeupConfigHash: jkS1VpRis8JHf0SBzPViuhBUP+xDHHhrzHaTXkG4LP8= __EOF_KUBE_ENV @@ -302,7 +302,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: fE9xUsSPcdxemjVPXtSyYmG7wKTkgSeGwY+1yfxBAR0= + NodeupConfigHash: 9TvJut2LkDRXMWLOwYIvkOJqEECkhFz8E7hZq9sqGDQ= __EOF_KUBE_ENV @@ -555,7 +555,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -587,7 +587,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: A0AyiJo03pbqluaXrVtbacjofP1NmBexAl0w2y4oS5o= + NodeupConfigHash: 266fTTSaZSr8z6qKYIfYZYZsoVPQFvzOObTJbHVlURU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index c117bfc46a..146a1f3c08 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Jrj9vv7+z3OZ1sQ2Eiu5D5KsVzxG30wKwu6pBrkK1IQ= +NodeupConfigHash: NIYVAo8LPjyiFGTNNTbyT4MMCp/WINRb4egsNvUR93M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data index 4226a693a3..c9a4b2c710 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: A0AyiJo03pbqluaXrVtbacjofP1NmBexAl0w2y4oS5o= +NodeupConfigHash: 266fTTSaZSr8z6qKYIfYZYZsoVPQFvzOObTJbHVlURU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content index 4515c3f766..40df118d11 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -24,7 +24,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 47d154887a..e30225b96d 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 674e8728ae..c6a89aad47 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data index 22482f8470..d7d37623b1 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 8msmO5jWeiVXllmXEgQVAcKNbequBsfWVF8cS+nCqB0= +NodeupConfigHash: tjagubyg9Ah3cskOiDjoiXpeWUrgt1228QwhF0bw1/E= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data index c4de39fe96..010baf2365 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data @@ -139,7 +139,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -171,7 +171,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: XE9IpKZd9oCrCv/x+HIIxysnlj82y2WpjG3iuknb0Mk= +NodeupConfigHash: 4NrGSqBOzuFuadwsdNsW7qTseLUbocizMQMH27emtw8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content index 0bffa9cb28..e200948075 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content index 93ab68985d..497b41d7a5 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-bastion_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -38,4 +38,4 @@ channels: - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 85db2565ec..e0322bfe94 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 12f0acc776..e0eed02158 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index a2ff76c3a2..9d09f6ea12 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml @@ -140,7 +140,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -260,7 +260,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: iZhNDx86xwMdykWKX6nKA7wT8fV4CljxcmQblLuHPFo= + NodeupConfigHash: NPa6cEWEOVkO5lvt7jr5LvyaWEcMHl5n8ZeGOsv0k18= __EOF_KUBE_ENV @@ -419,7 +419,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -451,7 +451,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: YhMDAtYXeVayMfXL+lAMRKJ5B1N2nmXjIEp3zx2O3SY= + NodeupConfigHash: Yhi9WSo4zX3cHWrQ+uj6D6QuUlyBDWKjsIXaf8b3wjk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data index a340fcf437..5d54248a1e 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data @@ -139,7 +139,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -259,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: iZhNDx86xwMdykWKX6nKA7wT8fV4CljxcmQblLuHPFo= +NodeupConfigHash: NPa6cEWEOVkO5lvt7jr5LvyaWEcMHl5n8ZeGOsv0k18= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data index 50400fba4e..2051d8be6f 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data @@ -139,7 +139,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -171,7 +171,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: YhMDAtYXeVayMfXL+lAMRKJ5B1N2nmXjIEp3zx2O3SY= +NodeupConfigHash: Yhi9WSo4zX3cHWrQ+uj6D6QuUlyBDWKjsIXaf8b3wjk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content index eb1c376607..6a2f46b751 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -37,7 +37,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index e6efbf22fc..c7f58a7b11 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -62,7 +62,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -264,7 +264,7 @@ channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/complex.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/complex.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 376e49157a..264cebe294 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data index f82951d504..623831953e 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data @@ -131,9 +131,9 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/+xWTXPbNhC961dgppPJJSbFxE1bTg5V5LRWY6WslI9eIWBFoQIBZgFQVn99ZwFSH47VTKfHdjxjW7uLxe7btw8S2gY5tWat6nLEGN+5N6+X0+XsBlUHSCbGwPCVBlmyNdcORow13PAalt4ir2GquXPgSuYxwEhY47kygItgvGqgZAeLPDolJda2voMOdMmUWdsRYx2gU9aUrMius5cjacU2leC2qp0Z57nW/TVgBO5br6zpa2cmaD0CL+RUB+cBHR2EDox3qYtD9hfZdVa8iG0o87hvG1YwqWZLwB4ErrXdVag6paEmKGIVjHFjzb6xwU2C3xwB4q2aBKnACIi3XzHKiAY8uMx1IpOw5kH7FJqumdpgfMkKsgW/saj+5NTg3Eoo2UTv+N5NqIwRYytl5ERKBOdKNs7iz4ixOMwKbackYEnDHA3Tm8hGOeqx0qFWpq/qHW/AtVzAnVqD2AsN0XynGuUX3NSA8TMVqARMhKAao6kixJwH4z9aHRq44yvQ0XOTWjtlx6n9vdWAsbElCGtkcs6D516Z+lDmJ1htrN1G50eulbzsfmclLMB5VILSRtsCnA0o4LdgPScQvJAJ5r7zjfetK/O8eP5dhK8or8fj4jzy1w4QlRxGmCc2ffPo0ecjxlTDayjZ9nuX1QIzZXOa+hVvlUtE6orseREnRQ4NvkJYAyIMw3y/b4fbZsYDGq5nVfx4a503vEnzeXN/4juuEdWA8DmA8xvgEjDSBWSccsrK6xqh5t7iw9g39x75bfyXqlL3w5HfrxbQWA9XMeLq4bmf0YY2nXt4ILoexn9wVHoDjx8hLy08iIBQWfQlu75+ES2nFJw5F4jhwyh4qzLVA5YJ27QEZgb3vGk1kOGLDL98erv8sJj9gxS5bcEomXdF/sdu644Ze8GZVXFjSlaMx9nLa6JGHmXGpU14zcUWjCwjw5LETK3xaLUGnEdFPUiN4B6I1tPZzcIdxcZ7LjY3QL8XtDxCaVjujagAlZUlK5qxuyQDIlVJGVOJP7xMJRZHJxGFBPtR/EQU2oAwpfQLGzyJ/qB4F7gvDh1eNX2LxyXQiXga4t4mJT6xHfo+Z3hwcK5HUwQJxiuuB6jo6grt/b78auNtWCR2Rh/1uek3bdj+kj39ke/c08tNtvGqk75O6qWApdiADDqN90IOd4j5d/j0wlJefptETWvZv+/M7Z2HRh7sC2t9yfKvsOjm3fKE58X4xGPjqzp8zIjL+vAK3cAq1LUy9S03UtP6Dz1Al9T7lqMsWQONxX3GO640nXtVjMdz9cxYCWt3Zn4yGBX9dT8hwKtvnzyLKH8ROljPYv9+5IRnYn7FCcW845hrtcp7oPNjwBdMNeB3Frfpxe13yyhyWDPn7nMA5GnHz0WD4GytnHOj1uB8fzF4kR+/ReRN73WjhhPSb/8f/H9t8PSy1vQlDHuFoX6Hef8FAAD//wEAAP//MYvDU9kLAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/+xWTXPbNhO+61dg5p1MLjEpJn7TlJNDFTmt1VgpK+WjVwhYUahAgFkAlNVf31mA1IdjNdPpsR3P2NbuYrH77LMPJLQNcmrNWtXliDG+c2/fLKfL2Q2qDpBMjIHhKw2yZGuuHYwYa7jhNSy9RV7DVHPnwJXMY4CRsMZzZQAXwXjVQMkOFnl0SkqsbX0HHeiSKbO2I8Y6QKesKVmRXWevRtKKbSrBbVU7M85zrftrwAjct15Z09fOTNB6BF7IqQ7OAzo6CB0Y71IXh+wvsuuseBHbUOZx3zasYFLNloA9CFxru6tQdUpDTVDEKhjjxpp9Y4ObBL85AsRbNQlSgREQb79ilBENeHCZ60QmYc2D9ik0XTO1wfiSFWQLfmNR/cGpwbmVULKJ3vG9m1AZI8ZWysiJlAjOlWycxZ8RY3GYFdpOScCShjkapjeRjXLUY6VDrUxf1XvegGu5gDu1BrEXGqL5TjXKL7ipAeNnKlAJmAhBNUZTRYg5D8Z/sjo0cMdXoKPnJrV2yo5T+werAWNjSxDWyOScB8+9MvWhzM+w2li7jc5PXCt52f3eSliA86gEpY22BTgbUMCvwXpOIHghE8x95xvvW1fmefH8uwhfUV6Px8V55C8dICo5jDBPbPrfo0efjxhTDa+hZNtXLqsFZsrmNPUr3iqXiNQV2fMiToocGnyFsAZEGIb5Yd8Ot82MBzRcz6r48dY6b3iT5vP2/sR3XCOqAeFLAOc3wCVgpAvIOOWUldc1Qs29xYexb+898tv4L1Wl7ocjv10toLEermLE1cNzP6ENbTr38EB0PYz/6Kj0Bh4/Ql5aeBABobLoS3Z9/SJaTik4cy4Qw4dR8FZlqgcsE7ZpCcwM7nnTaiDDVxl+/vxu+XEx+xspctuCUTLvivz33dYdM/aCM6vixpSsGI+zl9dEjTzKjEub8IaLLRhZRoYliZla49FqDTiPinqQGsE9EK2ns5uFO4qN91xsboB+L2h5hNKw3BtRASorS1Y0Y3dJBkSqkjKmEr9/mUosjk4iCgn2o/iJKLQBYUrpFzZ4Ev1B8S5wXxw6vGr6Fo9LoBPxNMS9TUp8Yjv0fc7w4OBcj6YIEoxXXA9Q0dUV2vt9+c3G27BI7Iw+6nPTb9qw/SV7+gPfuaeXm2zjVSd9ndRLAUuxARl0Gu+FHO4Q88/w6YWlvPw2iZrWsn/fmds7D4082BfW+pLl32DRzfvlCc+L8YnHxld1+JgRl/XhFbqBVahrZepbbqSm9R96gC6p9y1HWbIGGov7jHdcaTr3uhiP5+qZsRLW7sz8ZDAq+ut+RIDX/3/yLKL8VehgPYv965ETnon5FScU845jrtUq74HOjwFfMdWA31ncphe33y2jyGHNnLsvAZCnHT8XDYKztXLOjVqD8/3F4EV+/BaRN73XjRpOSL/7b/D/tsHTy1rTlzDsFYb6Heb9JwAAAP//AQAA///5ivnq2QsAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/1TOQUvEMBAF4Ht+Re7SLUIRN+DB3cWqta14kOJtSKYaSDIxk9j+fKmeen187/HOjop5TfRjDSYlYWFxpjDbzxMwKunRz6zqWrvCGRMfcAUfHR40+VqTjwl5F4qnwBmCxjZRiQP4bQS2blW4ysi5uoY9eiOHSvZ/SAxksMT/C4/AX0pOGW+adp2Otrnv5ufOlI/x9hhw1JeXd9vDQ3v6vqTmyvrlTvwCAAD//wEAAP//LSRhTM8AAAA=" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1TOzU6FMBAF4H2foi/AJf4stIkLL1FBIirqAndjGX5i26mdVnh8g3fF9uQ7J6cwlPqXQL9zj0FJWFgU5IZ5PAKjkhbtwCrPtUkcMfABV7De4EGTzTVZH5B3oagcR3AaHwIl34DdRmDrZomziByzM9ijlgwq+fSPREM9Jn+6UAJPSn6Ud527XQc+arg8p+r9+ufz4ksvb/X8+HpVfFfLZJ7vQ1t34434AwAA//8BAAD//1qRy1PPAAAA" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data index 7327787c87..5b71ba64e5 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data @@ -131,9 +131,9 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/3yS0W7bPAyF7/0UvCl601+2i/7BJvRiW7KhAZYuSJ6AsRhXiEymouQsbz/YTZplA3Zl+Bzah/zIJkh2U+Gtb20BgAf9+mU9Xc9n0fcUBwmAGDeBnIUtBqUCoEPGltZJIrY0DahKaiHFTEUjnNAzxVXm5Duy8K64i+mGHwdpv1NPwYLnrRQAPUX1whZq82AmhZNm99aC7vx+zpowhFPMLm9oGeXncbCbkDVRnM5nKwt1VZmPE1OZqqzrwdznFb1m0jR6XQHwIpoYO/rRU4zekYXbT3jQ2wLAd9iShd0HNW0TjZdySPpvP0b1tbmvTXXV+v3YSqA00mPhYydZP+f0csHVtFHy/kQU9KiJOveur0SShXKcQ7JbRum9GwrxoJfhZs/rt9kmD6YydfWbIx16tudXE6TBUJy3NqNNblvP7ROyCxTPewKg3jfJCz9hdBY66iQeDfbow/DdY11VC3/H4mirV/LNWfTDU79Fosf/b+5Gcn+VntWr2n+vYODZjAe5xIFi2WMsg9+UJ9DlpeCPTQAwpYPE3TLk1vMzjufHfjCEF6ivmSI6uhzKCLMqR5x7cQtkvyVNp2BKzRgWmRJp2Z1cLX4BAAD//wEAAP//GWuHvzUDAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/3ySwW7bMAyG734KXopeOtkuuqITetiWbGiApQuSJ2AsxhUik6koOcvbD3aTZtmAnQz/P+2f/MgmSHYT4Y1vbQGAe/32dTVZzabR9xQHCYAY14GchQ0GpQKgQ8aWVkkitjQJqEpqIcVMRSOc0DPFZebkO7Lwrriz6YYfB2l/UE/BgueNFAA9RfXCFmpzZx4KJ832rQXd+t2MNWEIx5htXtMiyq/DYDcha6I4mU2XFuqqMp/uTWWqsq4Hc5eX9JpJ0+h1BcCLaGLs6GdPMXpHFq4/416vCwDfYUsWtg9q2iYaL+WQ9GE3RvW1ua1NddH67dhKoDTSY+FDJ1m/5PRyxtW0UfLuSBT0oIk6964vRZKFcpxDsltE6b0bCnGv5+Gmz6u32e7vTGXq6g9HOvRsT68mSIOhOG1tSuvctp7bJ2QXKJ72BEC9b5IXfsLoLHTUSTwY7NGH4bvHuqrm/obF0UYv5KuT6Ienfo9Ejx+vbkZy/5Se1Iva/69g4NmMB7nAgWLZYyyDX5dH0OW54K9NADClvcTtIuTW8zOO58d+MITnqK+ZIjo6H8oIsypHnDtxc2S/IU3HYErNGBaZEmnZHV0tfgMAAP//AQAA//+gopmoNQMAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/1SNwUrEMBQA7/mK3IUGxSIGvFiktWKVghWPIXmt3SZ52bykW/brl2VPvcxh5jCVxWy+I66zgSi5OhGr0I/z9KoIJHfgRpJCaJspQaQCNuWChUKjExpdiEA7yd49JeU11BFz6JQDyT0aoH3o0YLkHRpgV+RwmzaK/iV/m5qtPD/V83N32I5N36ZyEHf+cfn6yOn351Mv93lYH3Ir/l7YBQAA//8BAAD//w/PoYLBAAAA" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1SNwWqEMBQA7/mKfIGCtgiBHmwoGilihUJ7DMmztU3yQp5Z3b9flj15mcPMYaTDbKeEl9VCElzvxCSGZf151QSCe/ALibI0LtMGiQo4tI8OCoO+NOhjAjpJpgJtOhjoEuY4ag+CB7RA5zCjA8FHtMDuyPEx7TX9Cl5/1tHqZpie1dt+lW5Q/dO3qr7g4/iflwitfK9i+9d0e/vCbgAAAP//AQAA//+V3Rm3wQAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content index 74a9d0c516..e80dd13913 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index e59e2a64fe..a0f99f5abc 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/compress.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/compress.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/compress.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-nodes_content index ee9c9deffb..f3bd3504a4 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/compress.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml index 8dd25fc18c..2417cb2048 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml @@ -139,7 +139,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti - http://HostIP2:Port2 docker.io: - https://registry-1.docker.io - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -253,7 +253,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 4AN9HYukMQu0+mrHF8CUs05e8/0r1nprqn/y8K/jB78= + NodeupConfigHash: nD0/aqr1kZByY0WKzD0Fipws+o6VPj6T3G9QOAPPtRs= __EOF_KUBE_ENV @@ -400,7 +400,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat - http://HostIP2:Port2 docker.io: - https://registry-1.docker.io - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -432,7 +432,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: ZYCe88bkLCotK0J/VSldr8XpzuA7qmdkQKAw8+Lxqt0= + NodeupConfigHash: /mYzJmhqQBbctmgAaygr7fF9O1tY1iVPK9lRatmBqL0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml index 22bbd33a44..52a5d3bafd 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: cGSf7Om5Za2gcDAqx3oLDY7p8rXxRRC/T1hWTHM6/o0= + NodeupConfigHash: /1MygA12Rnp38vFeiLjwnTx5UOVuERzX0GcJf2e1vYw= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: yNDHI151rlG9u+g2DApXbUdjHi3Ko/2WgbLZcK5oyP0= + NodeupConfigHash: ImRyXWiF1AN408P7mj/8UZK9QM5Bii8QA/5TsrDyXHE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data index b5e4e7cb17..ba6eb0367d 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: it2MpIrr4iIa72UsGmwgP1w/59JUVTv3GPRcIF5Y/jM= +NodeupConfigHash: 5AtGeutH/MZNXL8FwzJ4cXDCJMKl+7wiNSebZrdUuuM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data index b214d9e7a1..70ec25906b 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: it2MpIrr4iIa72UsGmwgP1w/59JUVTv3GPRcIF5Y/jM= +NodeupConfigHash: 5AtGeutH/MZNXL8FwzJ4cXDCJMKl+7wiNSebZrdUuuM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data index 4c605f0554..b32d5237ea 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: it2MpIrr4iIa72UsGmwgP1w/59JUVTv3GPRcIF5Y/jM= +NodeupConfigHash: 5AtGeutH/MZNXL8FwzJ4cXDCJMKl+7wiNSebZrdUuuM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data index f52d7371de..063c55de52 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: s7LyXyLYgQ6KZvt2Wye3i5GJgAGHX7h1kk9+Bi+GDXg= +NodeupConfigHash: j6m1b2ASba4Z4dCdpB7xrVswlST+AHDXUM1asX/hJ60= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content index 861bf75a35..5f1a9b9b09 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 765b7d4e9d..aa9292dfc3 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://tests/existing-iam.example.com/manifests/etcd/main.yaml - memfs://tests/existing-iam.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 765b7d4e9d..aa9292dfc3 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://tests/existing-iam.example.com/manifests/etcd/main.yaml - memfs://tests/existing-iam.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 765b7d4e9d..aa9292dfc3 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://tests/existing-iam.example.com/manifests/etcd/main.yaml - memfs://tests/existing-iam.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-nodes_content index a919920f27..f032a535e1 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml index 6ee80f1bc0..41060ae89f 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: M484KjV19wtMDGWwO7cf5eb6cEAQW2nh2IqShjgpbHU= + NodeupConfigHash: RJ8WjOxRhnhdfnXGHW18lzfzjH+MJrMtWW45YmRruHs= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: A0AyiJo03pbqluaXrVtbacjofP1NmBexAl0w2y4oS5o= + NodeupConfigHash: 266fTTSaZSr8z6qKYIfYZYZsoVPQFvzOObTJbHVlURU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data index 0092ff8c52..1514eed932 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: jPVRQK2SZU5tBWXmZWtbruWqJHsP6X6XbNooKZEXdbE= +NodeupConfigHash: ZwcKLtDjfKZIeIWMthUxBfswGA2ZKNHMcuZ2Ygoj2JM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data index d8c43ca9c9..1975d5dbf0 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: jPVRQK2SZU5tBWXmZWtbruWqJHsP6X6XbNooKZEXdbE= +NodeupConfigHash: ZwcKLtDjfKZIeIWMthUxBfswGA2ZKNHMcuZ2Ygoj2JM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data index b5b9a66f58..e07451a3b6 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: jPVRQK2SZU5tBWXmZWtbruWqJHsP6X6XbNooKZEXdbE= +NodeupConfigHash: ZwcKLtDjfKZIeIWMthUxBfswGA2ZKNHMcuZ2Ygoj2JM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data index 333a89f800..22dbc0c18a 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 6bY/YXtoKWx9A+emWACwbxUIT9KhmDtAxDcCfd8eeJA= +NodeupConfigHash: 57RbRTbctKuf8jie7Zha1Jx+rNdx130HbIY2GtYR+0U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content index f050737160..877ae3b448 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -23,7 +23,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 76f9da32c9..5b77f3a989 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 76f9da32c9..5b77f3a989 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 76f9da32c9..5b77f3a989 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 6eb5ad984f..f8b5bd6a12 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index 7b8e833991..a2720ab2e7 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: k4uyRQsOz4iZVA8ffKDLAk+NchjOQTXTiMAMPMJtOEE= + NodeupConfigHash: /e5Hphsd1UL0LxjH2NoQWr19kbPvibzWRFMgnJfQ1IE= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: bdjSOGEceYhBOW9P2HSJNSoQH3jEvW12Hag/2hr1e6E= + NodeupConfigHash: eBWArmVj/Cvz1bvhcL7UnXu9GQMA72qxiJkafuKL0AA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data index ad003983fd..b31f59ed8b 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: k4uyRQsOz4iZVA8ffKDLAk+NchjOQTXTiMAMPMJtOEE= +NodeupConfigHash: /e5Hphsd1UL0LxjH2NoQWr19kbPvibzWRFMgnJfQ1IE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data index bdb8b1ef98..1f30cdc02b 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: bdjSOGEceYhBOW9P2HSJNSoQH3jEvW12Hag/2hr1e6E= +NodeupConfigHash: eBWArmVj/Cvz1bvhcL7UnXu9GQMA72qxiJkafuKL0AA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content index dd6c7fd3fc..513a925c89 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 88209ce47a..f24a102f91 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/externallb.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/externallb.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-nodes_content index a1878c634c..ff74ee7a06 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data index 02523bcc07..d2ff0f93b6 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -246,7 +246,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: TLCXa+Xgj4szxQ3lAgUJb6T2GUUp7B9TxT34vNQ076U= +NodeupConfigHash: +YKxaPd/4UpztFhClkZ3AhHMbF0dWGZ3mBynvP4exvc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data index 353a78629d..b1d29aca27 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: XgwNnyqHBUSXCDvQ5csUiuiVDlTyrItmRWHAmyQqCfI= +NodeupConfigHash: cg82NOgzCJL/guqx5+qpaLQw9MapUd6wc5Jixhi9Y3g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content index de7838aaf1..f3dd7db3ab 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -28,7 +28,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index de070ae1b9..c82f503b73 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -58,7 +58,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -260,7 +260,7 @@ channels: - memfs://clusters.example.com/externalpolicies.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/externalpolicies.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/externalpolicies.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 43fddd0da8..7b290cf1b4 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/externalpolicies.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data index cb9a8e55d1..661f43c287 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: zD5Ld+aIiCYeucMaMg+yH1xQhBUNhINBvBP+gfXoWLE= +NodeupConfigHash: GpvwHEUmFXjvRlCOxDaaH3Op0FcfLGp+l1Abgvxm8to= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data index 59e04dd1b1..12d626769b 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: zD5Ld+aIiCYeucMaMg+yH1xQhBUNhINBvBP+gfXoWLE= +NodeupConfigHash: GpvwHEUmFXjvRlCOxDaaH3Op0FcfLGp+l1Abgvxm8to= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data index 32cc74620e..f314019615 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: zD5Ld+aIiCYeucMaMg+yH1xQhBUNhINBvBP+gfXoWLE= +NodeupConfigHash: GpvwHEUmFXjvRlCOxDaaH3Op0FcfLGp+l1Abgvxm8to= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data index bd1a4e2fed..33d3db7d11 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: +UE1BbfLcWfM7SXw54BSAqA9UKzf2/XlBZiZCLfPMWU= +NodeupConfigHash: +YiWevqfoe+UtL6c0n1k+knqLDy/spqzhCXlAfZvIQY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content index cc981244b3..c55a004fce 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 1ab7b9f768..fd4a4078b5 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://tests/ha.example.com/manifests/etcd/main.yaml - memfs://tests/ha.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 1ab7b9f768..fd4a4078b5 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://tests/ha.example.com/manifests/etcd/main.yaml - memfs://tests/ha.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 1ab7b9f768..fd4a4078b5 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://tests/ha.example.com/manifests/etcd/main.yaml - memfs://tests/ha.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 7961e43035..f2c28b44ae 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content index 2f9d9db754..12af9d3448 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: "1" docker: skipInstall: true diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content index 516990a129..a2afdd68de 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content @@ -57,7 +57,7 @@ Assets: - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - e4efdc6e7648078fbc35cb0e8855b57fa194087fe191338f820cfeda7f471f6a@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/mounter - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -261,7 +261,7 @@ channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://tests/ha-gce.example.com/manifests/etcd/main.yaml - memfs://tests/ha-gce.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content index 516990a129..a2afdd68de 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-b_content @@ -57,7 +57,7 @@ Assets: - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - e4efdc6e7648078fbc35cb0e8855b57fa194087fe191338f820cfeda7f471f6a@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/mounter - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -261,7 +261,7 @@ channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://tests/ha-gce.example.com/manifests/etcd/main.yaml - memfs://tests/ha-gce.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content index 516990a129..a2afdd68de 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-c_content @@ -57,7 +57,7 @@ Assets: - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - e4efdc6e7648078fbc35cb0e8855b57fa194087fe191338f820cfeda7f471f6a@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/mounter - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -261,7 +261,7 @@ channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://tests/ha-gce.example.com/manifests/etcd/main.yaml - memfs://tests/ha-gce.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content index ddb228d0c8..5c2be1cc57 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -4,7 +4,7 @@ Assets: - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - e4efdc6e7648078fbc35cb0e8855b57fa194087fe191338f820cfeda7f471f6a@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/mounter - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -65,4 +65,4 @@ channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 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_startup-script index 23f358b050..90e0cbf989 100644 --- 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_startup-script @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: 0Gp6DuBGOs41QKJEasGVWMiVxx6hxKn4TEMPdpll7so= +NodeupConfigHash: ur03E8/EJbA5DWusgkfofR3IX9osCwhx4meUMrd5yco= __EOF_KUBE_ENV 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_startup-script index 031a365596..fbe72e70f5 100644 --- 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_startup-script @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b InstanceGroupRole: Master -NodeupConfigHash: 0Gp6DuBGOs41QKJEasGVWMiVxx6hxKn4TEMPdpll7so= +NodeupConfigHash: ur03E8/EJbA5DWusgkfofR3IX9osCwhx4meUMrd5yco= __EOF_KUBE_ENV 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_startup-script index 2d9079030c..8829cc8da8 100644 --- 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_startup-script @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c InstanceGroupRole: Master -NodeupConfigHash: 0Gp6DuBGOs41QKJEasGVWMiVxx6hxKn4TEMPdpll7so= +NodeupConfigHash: ur03E8/EJbA5DWusgkfofR3IX9osCwhx4meUMrd5yco= __EOF_KUBE_ENV 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_startup-script index 8f0405a760..2aad2dd128 100644 --- 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_startup-script @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ZEB7fzVriu6fpqTrLQqLaLi/4xDmKlkaSYhNs3GGaac= +NodeupConfigHash: pdsQ/jqfuAk8RDfoHggR6pWuiFmiBWGVHOBe8ypuAog= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 92e9816502..0969ce28be 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: C89OMueOEcWqb4nE13FYNx0qqZ2XIM1/O4KuKmC6poc= +NodeupConfigHash: aCbGzeMwropvP1aRt6KWUARHEInGIwAYgFCLgk7vPZs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 53baa75b33..7307fd6d55 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: FHBXR/nZvBftgS8f9ASwir6J1ubIxIOyUj5weAiJkMQ= +NodeupConfigHash: EW3UahlGFis11EfYkbmsAEMfLurvb208dVHxJQMFnAc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index fd9439c942..5839f96bfe 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 878de57119..3f52125449 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet - a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 29f2a8d513..be4010ec1f 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet - a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 29afc56c0e..8109910945 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -131,7 +131,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -252,7 +252,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: tzQPjf+5I0XmVTzFmVY2zqQkbLzXCJzYV/+oiVRvtWE= +NodeupConfigHash: o13TMw+CW69fqcuHf+K06yi8saJn07Z+kv/2IPIHRW8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data index 00ee934722..71eded36a0 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -131,7 +131,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -165,7 +165,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: m9RoefjqnssINNuqti1CvJ5+nM9+qA3yWOJvkfgFKnc= +NodeupConfigHash: Aqq87RUJDxV+bUPrSD35xfKfEgrJYPd43ymxmIqWD6M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content index d669d4fee1..748481ecaf 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -35,7 +35,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index df596377b8..456a9024dd 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -262,7 +262,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-nodes_content index b98be55372..345c9b9022 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -64,4 +64,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml index 4ca560afff..2d16e5d549 100644 --- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -261,7 +261,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: TuBP909qe5EQyuHyJccAUhgGS6mRVolXyw8jkIe3iKo= + NodeupConfigHash: b3R8RfD3MjfdBnbsUDgiUhKZTndF77xEyx1gqSuwZG4= __EOF_KUBE_ENV @@ -400,7 +400,7 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -432,7 +432,7 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: LDevpa8cfuLNHz9S4syHz3JhFCuU5OppDWbYVPzPrWY= + NodeupConfigHash: LSWNMX0z/EdX9hwMYrgNdYxAJbWo3t5IQ2UccjtvwM4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml index 558f4b078f..88b1c8629e 100644 --- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -251,7 +251,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: M484KjV19wtMDGWwO7cf5eb6cEAQW2nh2IqShjgpbHU= + NodeupConfigHash: RJ8WjOxRhnhdfnXGHW18lzfzjH+MJrMtWW45YmRruHs= __EOF_KUBE_ENV @@ -390,7 +390,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -422,7 +422,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: A0AyiJo03pbqluaXrVtbacjofP1NmBexAl0w2y4oS5o= + NodeupConfigHash: 266fTTSaZSr8z6qKYIfYZYZsoVPQFvzOObTJbHVlURU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 391f67243e..20d370ad8c 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -250,7 +250,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: M484KjV19wtMDGWwO7cf5eb6cEAQW2nh2IqShjgpbHU= +NodeupConfigHash: RJ8WjOxRhnhdfnXGHW18lzfzjH+MJrMtWW45YmRruHs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data index 4226a693a3..c9a4b2c710 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: A0AyiJo03pbqluaXrVtbacjofP1NmBexAl0w2y4oS5o= +NodeupConfigHash: 266fTTSaZSr8z6qKYIfYZYZsoVPQFvzOObTJbHVlURU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content index 5adc68c2aa..6be6378890 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index baebea5ef4..bf34e55981 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 674e8728ae..c6a89aad47 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml index e554a2dee3..55f62f02a9 100644 --- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: LBhQKlzbc0dRTVBIEisV5FOXO+rs0V+86MzGZQ6QzpI= + NodeupConfigHash: v0USEzp+rTiOux3VAvtrMjv3TcHES7F8XjgVkBs+79A= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: 9TjWKlz9epkWB6OUxdBlnNn7bMXxCHk7y16oWDUVYLk= + NodeupConfigHash: WdzoMUPe6K8RP3nVIyDoaK4IguWOdu8kO8WhqHlHP9w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 9f804b5446..72ce700588 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: LBhQKlzbc0dRTVBIEisV5FOXO+rs0V+86MzGZQ6QzpI= +NodeupConfigHash: v0USEzp+rTiOux3VAvtrMjv3TcHES7F8XjgVkBs+79A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 94b49d275d..a6ea40ae01 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 9TjWKlz9epkWB6OUxdBlnNn7bMXxCHk7y16oWDUVYLk= +NodeupConfigHash: WdzoMUPe6K8RP3nVIyDoaK4IguWOdu8kO8WhqHlHP9w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content index 3adb1cbbeb..1f4307eb78 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index f349df08e0..d99af1364d 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 4010cfd044..cd7f95fda3 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data index 4a1ed9da24..5f561b1243 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data +++ b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-json.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: CW+ZdknYKMyHgiWKtr8jRK/rm/XEnTIi5qaWWPih61Y= +NodeupConfigHash: V5fkh1WkgH/NW3W68gXQRglGyS+WB89IdGpRPJKSIwM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data index 1d949e57ce..931fa8c0ec 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data +++ b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-json.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: fDrRmSIF+gluyzsbHJTYSQKg1PguiQ7IPAL227vKl8A= +NodeupConfigHash: 2Fj1Z+1UwlBoy6Qe4qaj/u8NfKGO6it72X33XuY0pI8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_cluster-completed.spec_content index 17f463926c..0319ca0124 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 37c8ac98a7..a45876e96f 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/minimal-json.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/minimal-json.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal-json.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 0ec2ffaa05..de7452b609 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal-json.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data index ef1770019e..cc3f6a528b 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data @@ -131,7 +131,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -253,7 +253,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: sR2GOS2tBNui0LjwkG2LMsJzbFsToDj31Fm6FJekS6I= +NodeupConfigHash: mREFYLtHjjD/iLjQzGRx0M6dqd+8un2Gw77Hbd6jhro= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data index 5c3fe516cf..db1b077b3e 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data @@ -131,7 +131,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -166,7 +166,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Y13x1Iql1eNPYAs3Ynsh1Y8q3Zqslmxl6KARj6Ys+90= +NodeupConfigHash: pFwbbL2Sqw1/0i1cJ0x9kPVjTnlKcDgDd+8T3/ulR48= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content index ba410351f9..09751e454c 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -21,7 +21,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 25e3e046dc..3ceab0a906 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -261,7 +261,7 @@ channels: - memfs://clusters.example.com/minimal-warmpool.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/minimal-warmpool.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal-warmpool.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 1e3cee26c8..73d18244dc 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -63,7 +63,7 @@ channels: - memfs://clusters.example.com/minimal-warmpool.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 warmPoolImages: - k8s.gcr.io/kube-proxy:v1.21.0 - k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.1.0 diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index 6ee80f1bc0..41060ae89f 100644 --- a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: M484KjV19wtMDGWwO7cf5eb6cEAQW2nh2IqShjgpbHU= + NodeupConfigHash: RJ8WjOxRhnhdfnXGHW18lzfzjH+MJrMtWW45YmRruHs= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: A0AyiJo03pbqluaXrVtbacjofP1NmBexAl0w2y4oS5o= + NodeupConfigHash: 266fTTSaZSr8z6qKYIfYZYZsoVPQFvzOObTJbHVlURU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index b3d9af62a3..b09bdf9a34 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: M484KjV19wtMDGWwO7cf5eb6cEAQW2nh2IqShjgpbHU= +NodeupConfigHash: RJ8WjOxRhnhdfnXGHW18lzfzjH+MJrMtWW45YmRruHs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data index 4226a693a3..c9a4b2c710 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: A0AyiJo03pbqluaXrVtbacjofP1NmBexAl0w2y4oS5o= +NodeupConfigHash: 266fTTSaZSr8z6qKYIfYZYZsoVPQFvzOObTJbHVlURU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content index e98a7b05d2..e4a48d009f 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index baebea5ef4..bf34e55981 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 674e8728ae..c6a89aad47 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content index 941d77e4f2..ab576c24ec 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: "1" docker: skipInstall: true diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content index bc399b98f2..014dd3bc55 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content @@ -57,7 +57,7 @@ Assets: - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - e4efdc6e7648078fbc35cb0e8855b57fa194087fe191338f820cfeda7f471f6a@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/mounter - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -261,7 +261,7 @@ channels: - memfs://tests/minimal-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://tests/minimal-gce.example.com/manifests/etcd/main.yaml - memfs://tests/minimal-gce.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content index dfd7d2737b..c3b067487b 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -4,7 +4,7 @@ Assets: - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - e4efdc6e7648078fbc35cb0e8855b57fa194087fe191338f820cfeda7f471f6a@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/mounter - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -65,4 +65,4 @@ channels: - memfs://tests/minimal-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 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_startup-script index e48b8fb169..7d5ff4f32c 100644 --- 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_startup-script @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: AWegxzP14RxOTihohmUjQ46syMVmeG/4hwALHk+70rM= +NodeupConfigHash: ERO0h0LkHJl31Nvgol3o7F6Jtmrqq8ruAsiScKo66AQ= __EOF_KUBE_ENV 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_startup-script index 8e8500e045..22b69e9d53 100644 --- 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_startup-script @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: IE+fF5I4YRf3fzWVe9DdLrJPpWx09wmpatw09fxBGeA= +NodeupConfigHash: yWkrPg4gqSlflQ1mugIVW+bq7xCl7rthSqd5DzZaZiM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content index f29ad35d56..c5af2d3fa8 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: "1" docker: skipInstall: true diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content index 20b0614f4a..fe5c23ee1b 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-master-us-test1-a_content @@ -57,7 +57,7 @@ Assets: - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - e4efdc6e7648078fbc35cb0e8855b57fa194087fe191338f820cfeda7f471f6a@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/mounter - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -261,7 +261,7 @@ channels: - memfs://tests/minimal-gce-private.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://tests/minimal-gce-private.example.com/manifests/etcd/main.yaml - memfs://tests/minimal-gce-private.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 213940e9db..3040b7badb 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -4,7 +4,7 @@ Assets: - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - e4efdc6e7648078fbc35cb0e8855b57fa194087fe191338f820cfeda7f471f6a@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/mounter - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -65,4 +65,4 @@ channels: - memfs://tests/minimal-gce-private.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 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_startup-script index e9797895b7..a13c393dd5 100644 --- 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_startup-script @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: 3o3CtM/i6YuFNoDBbOY3NRmdo3Au8jsauDIXF3bvieg= +NodeupConfigHash: hrbS0UlMgMXhNqePJUErcXpmFE0hv07fFIO9Ab7Uu+U= __EOF_KUBE_ENV 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_startup-script index ffbe5399e2..c4f636cede 100644 --- 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_startup-script @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: LNexRwBtiCUmbVGo0+v4lmzZJCyQcxYhmgGofuPjSEo= +NodeupConfigHash: 7vXi+clkt68sZGiHrHXLmwRJj5HnLsrVfKhvz/WBKrQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 91d3184fad..dd9d92acaa 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 2GMkkFNIWzq4VHn+OloVCzh61cGBa5nuCQjYOmfyH2I= +NodeupConfigHash: sHyc6KHIOfAKcg3uN5DRkEo8tJxOGvv98zrx95Ko7Gk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data index 922a3ad1ee..fc7e5f26f9 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2Fo4nPBO0R7diEUzoI1iTETi6ZRhyZQwhmUt4i3XcGs= +NodeupConfigHash: Ucd8cuhqw4hmFckEi6NeyIPymA8iSncWDex6UGws/Q4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content index 8c8c5eed48..09c526c906 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true etcdClusters: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 9e859c1af2..aa17fbb6a0 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/minimal.k8s.local/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/minimal.k8s.local/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.k8s.local/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-nodes_content index a4dfd240ad..9fb5c4e141 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -64,4 +64,4 @@ channels: - memfs://clusters.example.com/minimal.k8s.local/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml index 0dcb3f9a2d..34b1e41e61 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= + NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -498,7 +498,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= + NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV @@ -637,7 +637,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -751,7 +751,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= + NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV @@ -890,7 +890,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -922,7 +922,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: RsLEJr46Xcyh5F+aw+mv0cdok9gUDJHGcyoBzcorJd0= + NodeupConfigHash: 70XGgNmsIPB6D/eD6xTK5wu1z8ZOtWSaDQQu8LDLNqI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index ba872a0917..1a66f8ded8 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= +NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 28863537fe..a8a46f98cc 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= +NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 22f1cadfde..33300cd035 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= +NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index b437686eae..ff43db9029 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: RsLEJr46Xcyh5F+aw+mv0cdok9gUDJHGcyoBzcorJd0= +NodeupConfigHash: 70XGgNmsIPB6D/eD6xTK5wu1z8ZOtWSaDQQu8LDLNqI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content index 0d4a66061c..502a96147c 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 769d15ec03..37cf483b70 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 769d15ec03..37cf483b70 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 769d15ec03..37cf483b70 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 4e2c66d33c..e448e02a55 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml index 0dcb3f9a2d..34b1e41e61 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= + NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -498,7 +498,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= + NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV @@ -637,7 +637,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -751,7 +751,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= + NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV @@ -890,7 +890,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -922,7 +922,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: RsLEJr46Xcyh5F+aw+mv0cdok9gUDJHGcyoBzcorJd0= + NodeupConfigHash: 70XGgNmsIPB6D/eD6xTK5wu1z8ZOtWSaDQQu8LDLNqI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index ba872a0917..1a66f8ded8 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= +NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 28863537fe..a8a46f98cc 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= +NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 22f1cadfde..33300cd035 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: crCVosX6CaYU7sLRX3GIkbJlyyHTjPiHtobpMXU4NG0= +NodeupConfigHash: EXFXdYWeGgaysKkjq/xeqZPVyc29fc/dZxTMu79qJEw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index b437686eae..ff43db9029 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: RsLEJr46Xcyh5F+aw+mv0cdok9gUDJHGcyoBzcorJd0= +NodeupConfigHash: 70XGgNmsIPB6D/eD6xTK5wu1z8ZOtWSaDQQu8LDLNqI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content index 0d4a66061c..502a96147c 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 769d15ec03..37cf483b70 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content index 769d15ec03..37cf483b70 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1b_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content index 769d15ec03..37cf483b70 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1c_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 4e2c66d33c..e448e02a55 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml index 4a185d9ab5..e46441bf7d 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 2fX6J2P55RqdhJf92wPlt2vBg3fVyi7PbyOHmlQP+Mo= + NodeupConfigHash: +S011+yh+UI+vdBob1aaADaPfsy/PwQnKqweHhnmn2s= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourcesexamplecom.Properties.LaunchTe containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourcesexamplecom.Properties.LaunchTe ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: 2CPy/IUGbQipsUVs54c828IDu9GI5k0LwHH5XOOgcMU= + NodeupConfigHash: PGmyC1ddY5x2nQwtgs76zEuMqbQGUfntAWfAvuH2p8E= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data index 866a11e367..83c826d36f 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 2fX6J2P55RqdhJf92wPlt2vBg3fVyi7PbyOHmlQP+Mo= +NodeupConfigHash: +S011+yh+UI+vdBob1aaADaPfsy/PwQnKqweHhnmn2s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data index 301f1e94a7..54c243b552 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2CPy/IUGbQipsUVs54c828IDu9GI5k0LwHH5XOOgcMU= +NodeupConfigHash: PGmyC1ddY5x2nQwtgs76zEuMqbQGUfntAWfAvuH2p8E= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content index e9b5689b3e..56e4909680 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 88a9289939..2b220d63ff 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet - a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/nthsqsresources.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/nthsqsresources.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/nthsqsresources.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 29cd374f3f..09cd4eeae0 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet - a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/nthsqsresources.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml index 2ec6d6a13b..18ef0c4e0e 100644 --- a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml @@ -132,7 +132,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: ZsGJVepKqr/VOV7RxaTjcmSUr3d0tBwY8qHhFguLFcE= + NodeupConfigHash: wP7OUr/QVGW1DOXRtn4EnNcZK4uqB0OZqSglThzCbXc= __EOF_KUBE_ENV @@ -385,7 +385,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -417,7 +417,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: /5uEbdyeKsSyACGPnL3AcWr9dDFCMTIo6TsKFtZfQY8= + NodeupConfigHash: ckH+nA1A26VhUXI6O1rqeDXXfHD7rKFTjtXRaYR0JuQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data index e13923b89b..7484053d59 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ZsGJVepKqr/VOV7RxaTjcmSUr3d0tBwY8qHhFguLFcE= +NodeupConfigHash: wP7OUr/QVGW1DOXRtn4EnNcZK4uqB0OZqSglThzCbXc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data index 5cda802b1d..4f1d294781 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: /5uEbdyeKsSyACGPnL3AcWr9dDFCMTIo6TsKFtZfQY8= +NodeupConfigHash: ckH+nA1A26VhUXI6O1rqeDXXfHD7rKFTjtXRaYR0JuQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content index a6414f6152..536ea94f8b 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 1230183640..9fc37f2a5a 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/private-shared-ip.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/private-shared-ip.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 7d050a6a4f..787ff07272 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data index 5c759ef581..0b98da5cf1 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 9Azee4u/BNEHuotphRku24y3FU91wfJ+wTH0GcAsdSY= +NodeupConfigHash: y6xAf2AfHOBzZizzuF99BKv+N8CJ4C2Gg37gg8KgZfE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data index 1ed0a2139f..cab5edc2f8 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: YP3rs2Jt5ILuaCSX/nL4br+lJl3BkEt+mvo9S+CaqTM= +NodeupConfigHash: MEv1ErJ6shSbw2m3p4wpBxUCi8Dwne9Wp12f7DyI5pY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content index 44d56bc147..de0bba533d 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 3473ecc840..1363913842 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/private-shared-subnet.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/private-shared-subnet.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/private-shared-subnet.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 28413bcbd1..a6a0791b67 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/private-shared-subnet.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index 6521033bcc..1f4012b119 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml @@ -132,7 +132,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: eozThuCzAXmUKhJ6L+EDroFmE2fT6bJlINKiIMr1LZY= + NodeupConfigHash: C4IaUu3XZ1IDkxtiDFlnMCOvOWB4cHwpQjpfKvDAfqI= __EOF_KUBE_ENV @@ -385,7 +385,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -417,7 +417,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: /dVlBvSuPvaoTwJ1PQ4cH6r34yiqW7f0yqymzKljbm0= + NodeupConfigHash: I7TrCfPVMKQR8wZYgObTZFG8luakA+R7SvMM9SIiTTs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data index f92a2785e6..1d93029f6a 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: eozThuCzAXmUKhJ6L+EDroFmE2fT6bJlINKiIMr1LZY= +NodeupConfigHash: C4IaUu3XZ1IDkxtiDFlnMCOvOWB4cHwpQjpfKvDAfqI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data index 9b37442fe7..d9787fed27 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: /dVlBvSuPvaoTwJ1PQ4cH6r34yiqW7f0yqymzKljbm0= +NodeupConfigHash: I7TrCfPVMKQR8wZYgObTZFG8luakA+R7SvMM9SIiTTs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content index f3bb19524e..1733e4a957 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index f50ad73c20..de691f3263 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/privatecalico.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatecalico.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-nodes_content index f549c402c0..b4c56f5cdb 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data index 1c7b664c25..4c99249f5b 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: v1N4eudRwus0EICTZC3mwYVKoH2MjDNsSYVk376E5xU= +NodeupConfigHash: hY0YbRP23nEeWaE5H2lyWhPvkN2a350pb/tj3D8aH6c= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data index 8307a4954d..a25d6de4ef 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: o0QdJcl3FAZgJ3ZCQSGFMBOgpkBYKRjLl1wMCSQ9ptA= +NodeupConfigHash: Q4pOj4u1fQqdETMRUo7WQ8ZwIf/UnKuI9eJI3z99nec= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content index b79f64c4fb..e5dae9a4b8 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 59922a56ff..1918384bad 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/privatecanal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/privatecanal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatecanal.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-nodes_content index bbfc009b66..d7a87d9c85 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privatecanal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index 233a5f4c29..3152096843 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml @@ -132,7 +132,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -246,7 +246,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: sofU511JKWGzEsiD05ccBsIEi5QWxGcYjrexzAfEa0g= + NodeupConfigHash: bLwLThhWRzbJ6xWpj/YURTBHy69MOwX7VNcBmEea2P8= __EOF_KUBE_ENV @@ -385,7 +385,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -417,7 +417,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: +A3ynJBC/SEqeXU3Mzrq9NrWNYkoYI7qFtSbcymftlU= + NodeupConfigHash: I8kAysLQNKWOMTDgX5TS7trcL69mR3EDNPFzSAEZ+aI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 92b176f998..3e25320889 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: sofU511JKWGzEsiD05ccBsIEi5QWxGcYjrexzAfEa0g= +NodeupConfigHash: bLwLThhWRzbJ6xWpj/YURTBHy69MOwX7VNcBmEea2P8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data index 78553cf800..fd08c83862 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: +A3ynJBC/SEqeXU3Mzrq9NrWNYkoYI7qFtSbcymftlU= +NodeupConfigHash: I8kAysLQNKWOMTDgX5TS7trcL69mR3EDNPFzSAEZ+aI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content index 72aa64fc9d..902b58448a 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index cdf7cff829..1611947029 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content index b5c1989f37..859aae60b1 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index d77479d84d..9170f79f43 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml @@ -132,7 +132,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -249,7 +249,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 53jZqi5Hnv5UGz7e8/BAThXXq9aB8GR2w7OmJtFbS4w= + NodeupConfigHash: FYWwepQNMVF+ROHgdvGdrzhCVA7/2ot23rTaexNEIO8= __EOF_KUBE_ENV @@ -388,7 +388,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -421,7 +421,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: czTpqSQ5bmpp+T8VX/aNnI8P8VbGG6QFdeuJBgmkW+s= + NodeupConfigHash: 9xdTryAkGaPF/p+L/tEFuZeO/3VR2WfMa37yTFK7xjs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data index 2b09b15ce1..d0c98e13c9 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -247,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 53jZqi5Hnv5UGz7e8/BAThXXq9aB8GR2w7OmJtFbS4w= +NodeupConfigHash: FYWwepQNMVF+ROHgdvGdrzhCVA7/2ot23rTaexNEIO8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data index caf420348f..8d25c6604c 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -163,7 +163,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: czTpqSQ5bmpp+T8VX/aNnI8P8VbGG6QFdeuJBgmkW+s= +NodeupConfigHash: 9xdTryAkGaPF/p+L/tEFuZeO/3VR2WfMa37yTFK7xjs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content index 866f31378a..a17a8e6d17 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 35524d3291..371cbc5138 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -328,7 +328,7 @@ channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/privateciliumadvanced.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privateciliumadvanced.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-nodes_content index a6e5fdc09e..9646de9c51 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -84,4 +84,4 @@ channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data index 23c4aa4961..08e89956f6 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: //GLlUQJv8eCBVeejQIrJnfTYidbOfAZ2QZpHPXxF9Q= +NodeupConfigHash: SdKEvGMZvGgs6AWkDj+VknP4M8HZtgQJJE/75AFsfew= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data index 26f58f2637..2216896e24 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: l9fVqJeL3CDNZLBv62ahm8dguMFHhsnA+R5rSX1/VXk= +NodeupConfigHash: RikdpI9/PbA/2BPpFgLVdCN8qTrFM3oFAWDd31bxgTM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content index 1382ca11be..d723c64e0d 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -25,7 +25,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: internal.example.com docker: skipInstall: true diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 71c9be927c..4d0445fbdf 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/privatedns1.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/privatedns1.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatedns1.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 1e0763f001..e4779fa50b 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privatedns1.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data index 389d7a7c62..61f933df43 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: IeOEQU5HG8Es+x7nwjWfStssKfKs9caNT69egil2QZM= +NodeupConfigHash: vLdaOMCIh7sdhVYvY9iw2uQpLizjaTtRehEQ15CRGsY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data index aa4f390293..8b99da3823 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: szYwTm1enDV0ChP01yU1/V5mWnuT0wunImpNM+ifstk= +NodeupConfigHash: bBQpkDyXCbXCOVPXqcE5c0kV4o+IH5tD3+FcuQwOggk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content index 98850398c2..8084a8df45 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: private.example.com docker: skipInstall: true diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index bbe32e0647..2b37816bac 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/privatedns2.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/privatedns2.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatedns2.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-nodes_content index e79f660470..2cf3ff32d2 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privatedns2.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data index 3032406886..26414bc741 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: xiN5EpzbYaKIQKw2oDbv+TsTSPisN2lT+Sx9bZxNG+s= +NodeupConfigHash: tSXk2+JYJpLqOJFWwYNOIUNemTDPvChDNVH18n7itrQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data index a2491d4f65..8c155e3a7e 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: u6ZXQYhqRIXxxYcJ5XXoraXg+ZoMrjvrxtMT0HOUveY= +NodeupConfigHash: NBVe5WDXG5CGkNh26ZLIS7ztgz4KPpTXVsSCK2CU9/w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content index f004de8a6b..0983b959bd 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 8400bd4836..b93f09741d 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/privateflannel.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/privateflannel.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privateflannel.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-nodes_content index a8219cd128..087d2082ca 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privateflannel.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data index ead0a48351..c977b15288 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: kfnPTkBi9Q/g3mQ0EFIRPjl8c2eI63b5Age4+BfyuJg= +NodeupConfigHash: u0S3SAaJFR10YYV/d2OotUSagD6ChpwySRXDLcl5QdY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data index 7580bf8e96..2bb65bfa5a 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: yAFSdXLM+7m6ucG2sHmraf17wE2PKyh5zvy61ZBmT2Y= +NodeupConfigHash: 0JP6UpQZRNjPlx8zygWfxEXetszkBv1cwXSso/kQG30= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content index eb4b180274..6b42bfc2f0 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 35389a24f7..d396031f94 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/privatekopeio.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/privatekopeio.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatekopeio.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-nodes_content index d3e9ed8a6d..8dd0902d87 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privatekopeio.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data index 60761ca0eb..78eef55192 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: vFVekKeTJ4tLsUue3yIkwpMX4B4vIPmCZ5rYrm82sqY= +NodeupConfigHash: EGo3bjF8OjnrLoJ0RFj4n2Bn3h6A7etjkdQk9NViHac= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data index c970f7bb25..27eed16923 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: jrZ6kGuXzL2l7Ef5ebcuHNJU0QhGKTEwQYHa0teZrcE= +NodeupConfigHash: IZrjykmV1e8jpiiMAQeJlCDC4jrsO4G5vaoftCgiSkk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content index c4c99a5ab2..b72269e523 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 46abb489f1..f024e7d9bc 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/privateweave.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/privateweave.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privateweave.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 98b37189f4..8602caf9ee 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privateweave.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data index 4734621cfa..d6abfe4f78 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: V6bu0kutsaQZlLsoccRggcLZtbg6lK68wA9CGoEKJ1o= +NodeupConfigHash: Bm31FvSsrqwY9QRlF8n6HRmruuMD/0I2oKW5ErLsPGk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data index d9eb569a0d..1ae6538b86 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: aPWxlCRqf8wihVV20ZoFJOIsWvduBEOLJkxnBOhH7X0= +NodeupConfigHash: E1xsEc5naZXqZLKJp0e6RzQJG4TOoGDiO63zd26slkI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content index 91e4e54dbf..3e9ffcbc25 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 822cc02f9f..5b05b95a14 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/sharedsubnet.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/sharedsubnet.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/sharedsubnet.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 2b0a01da22..c7b6f1eda4 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/sharedsubnet.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data index 4d0dd4e8b7..edda2e01ae 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: +GxnAnYPu722dCDdKzaA1/cRGqVPkQKto9gPy+ov8Jk= +NodeupConfigHash: q/Elqv/kDZjcjSzU2x3BUwA5hOV5fMDWrAmXdeyYk2o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data index f0932f7a32..1a507dec49 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: qNrBFJAwMHFXNb+sdtcrH13LD/Nl6ZCUjk0mLkIaLqw= +NodeupConfigHash: /H2teMqIgGqMycHQyvkf02Eti6Klx5FYdKayVpsoEJ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content index 33b309684c..1540a30bb1 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 6afada9f4b..05804fa5f5 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/sharedvpc.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/sharedvpc.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/sharedvpc.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 54b3603bc0..2872b7b3e0 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/sharedvpc.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data index 1691c53655..30855fcfa2 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ipwCj3LXbHgLTJRumcXnaEk5rTSeFL5LxaFgcpabfEE= +NodeupConfigHash: P9MaG5gPP5mVP8BtbXGpeR+g3aNkgSH390+JKOXziJU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data index 3a47ae81fc..9db73bfdb9 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: hsQqx6uw6JmtLJmhz2c5qDfOi52GGdMJNbByR9JYEnI= +NodeupConfigHash: NzaYIuawhKeHrz/fwnRUN2veAgkUDt6Bva1Sxeo4GPo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content index 424920da0b..6e726afa93 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index dbd77191db..12a996bef6 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/unmanaged.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/unmanaged.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/unmanaged.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-nodes_content index c803796fe1..7b1f115fe6 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/unmanaged.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index c117bfc46a..146a1f3c08 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Jrj9vv7+z3OZ1sQ2Eiu5D5KsVzxG30wKwu6pBrkK1IQ= +NodeupConfigHash: NIYVAo8LPjyiFGTNNTbyT4MMCp/WINRb4egsNvUR93M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data index 4226a693a3..c9a4b2c710 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: A0AyiJo03pbqluaXrVtbacjofP1NmBexAl0w2y4oS5o= +NodeupConfigHash: 266fTTSaZSr8z6qKYIfYZYZsoVPQFvzOObTJbHVlURU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content index 76cc583e8c..907b2b9199 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.6 + version: 1.4.8 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 47d154887a..e30225b96d 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -56,7 +56,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: @@ -258,7 +258,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 674e8728ae..c6a89aad47 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,7 +3,7 @@ Assets: - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - - 6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238@https://github.com/containerd/containerd/releases/download/v1.4.6/cri-containerd-cni-1.4.6-linux-amd64.tar.gz + - 96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8@https://github.com/containerd/containerd/releases/download/v1.4.8/cri-containerd-cni-1.4.8-linux-amd64.tar.gz arm64: - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.6 + version: 1.4.8 diff --git a/upup/pkg/fi/cloudup/containerd.go b/upup/pkg/fi/cloudup/containerd.go index b2b83e75c8..bdccb570ad 100644 --- a/upup/pkg/fi/cloudup/containerd.go +++ b/upup/pkg/fi/cloudup/containerd.go @@ -186,9 +186,13 @@ func findAllContainerdHashesAmd64() map[string]string { "1.4.4": "96641849cb78a0a119223a427dfdc1ade88412ef791a14193212c8c8e29d447b", "1.4.5": "f8155278fd256526ca9804219e1ee46f5db11c6ddf455086b04c0887c868822a", "1.4.6": "6ae4763598c9583f8b50605f19d6c7e9ef93c216706465e73dfc84ee6b63a238", + "1.4.7": "daa14638344fe0772f645e190e4d8eb9549b52743364cb8000521490f9e410b8", + "1.4.8": "96e815c9ab664a02dd5be35e31d15890ea6bef04dfaa39f99f14676c3d6561e8", "1.5.0": "aee7b553ab88842fdafe43955757abe746b8e9995b2be55c603f0a236186ff9b", "1.5.1": "2fd97916b24396c13849cfcd89805170e1ef0265a2f7fce8e74ae044a6a6a169", "1.5.2": "e7adbb6c6f6e67639460579a8aa991e9ce4de2062ed36d3261e6e4865574d947", + "1.5.3": "32a9bf1b7ab2adbd9d2a16b17bf1aa6e61592938655adfb5114c40d527aa9be7", + "1.5.4": "591e4e087ea2f5007e6c64deb382df58d419b7b6922eab45a1923d843d57615f", } return hashes From b30890ffdc9cf9b36d02c3c08ababadbca2a5c01 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 29 Jul 2021 05:40:05 +0300 Subject: [PATCH 2/2] Update cfn-lint to v1.52.0 --- hack/verify-cloudformation.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/verify-cloudformation.sh b/hack/verify-cloudformation.sh index 3139a88315..b4e2fea769 100755 --- a/hack/verify-cloudformation.sh +++ b/hack/verify-cloudformation.sh @@ -20,7 +20,7 @@ set -o pipefail . "$(dirname "${BASH_SOURCE[0]}")/common.sh" -TAG=v0.48.3 +TAG=v0.52.0 IMAGE="cfn-python-lint:${TAG}" # There is no official docker image so build it locally