From 6a60823b3404f417fffd16549e4545f73b266082 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 18 Nov 2021 07:07:18 +0200 Subject: [PATCH 1/2] Update containerd to v1.4.12 --- pkg/model/components/containerd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go index 5f49624fbb..6b40b94231 100644 --- a/pkg/model/components/containerd.go +++ b/pkg/model/components/containerd.go @@ -49,7 +49,7 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error { if b.IsKubernetesGTE("1.23") { containerd.Version = fi.String("1.6.0-beta.2") } else if b.IsKubernetesGTE("1.19") { - containerd.Version = fi.String("1.4.11") + containerd.Version = fi.String("1.4.12") } else { containerd.Version = fi.String("1.3.10") } From 7d34232b4ce7e1df5a7f388527859274590c6038 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Thu, 18 Nov 2021 07:07:29 +0200 Subject: [PATCH 2/2] Run hack/update-expected.sh --- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...object_nodeupconfig-master-us-test-1a_content | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../cloudformation.json.extracted.yaml | 8 ++++---- .../cloudformation.json.extracted.yaml | 8 ++++---- ...-us-test-1a.masters.123.example.com_user_data | 4 ++-- ...unch_template_nodes.123.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...object_nodeupconfig-master-us-test-1b_content | 6 +++--- ...object_nodeupconfig-master-us-test-1c_content | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...object_nodeupconfig-master-us-test-1b_content | 6 +++--- ...object_nodeupconfig-master-us-test-1c_content | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...object_nodeupconfig-master-us-test-1b_content | 6 +++--- ...object_nodeupconfig-master-us-test-1c_content | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test1-a_content | 6 +++--- ...object_nodeupconfig-master-us-test1-b_content | 6 +++--- ...object_nodeupconfig-master-us-test1-c_content | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...-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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test1-a_content | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...object_nodeupconfig-master-us-test-1b_content | 6 +++--- ...object_nodeupconfig-master-us-test-1c_content | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...object_nodeupconfig-master-us-test-1b_content | 6 +++--- ...object_nodeupconfig-master-us-test-1c_content | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../cloudformation.json.extracted.yaml | 8 ++++---- ...sources.longclustername.example.com_user_data | 4 ++-- ...sources.longclustername.example.com_user_data | 4 ++-- ..._bucket_object_cluster-completed.spec_content | 2 +- ...object_nodeupconfig-master-us-test-1a_content | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../nvidia/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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- .../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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...-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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...-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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ....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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- ...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 | 6 +++--- ...s_s3_bucket_object_nodeupconfig-nodes_content | 6 +++--- 276 files changed, 663 insertions(+), 663 deletions(-) diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index e751225ab0..ba66a5d735 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.11 + version: 1.4.12 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: ibfeoFZlebuojxrJv9vE9XNiuiE7pnf2iP9eodm0+K0= + NodeupConfigHash: csGbJpNLSgbfCyF1qss04FAzaX+mB0ekZCcECqvmwlE= __EOF_KUBE_ENV @@ -302,7 +302,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -415,7 +415,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: nB3wN4ezsgELqmkcSfp203g1PJwvvlhsjMO2IdRIvZ4= + NodeupConfigHash: Bi3zwqdeHSTZHFXK5RQFdKNx6W3wc0Aha0ZFx7ugDWs= __EOF_KUBE_ENV @@ -554,7 +554,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -586,7 +586,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: /xc0hHryd87G4ro46rYwe9mCe7j9bWZRSru2pMpqqNs= + NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= __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 ba967280b4..a30c69771a 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: lO1CPOIzR707mdRTd3CuVEdeC/DB0u4G/iZaoBZNcVQ= +NodeupConfigHash: mRNx2d1ys4aKviHY7yRCTvfI0BcX3VQ/MJwoa+QaDoQ= __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 30e3880a4a..1944c2ff28 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: /xc0hHryd87G4ro46rYwe9mCe7j9bWZRSru2pMpqqNs= +NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= __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 1454e395d0..c6305a04de 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.11 + version: 1.4.12 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 4b03116956..86b7f98adb 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 a6c20a5053..6d95ccbc59 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 733056163f..b12c47e8cf 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: T8sAxBbmRvVthUwO10P/qXLLrRi9TVFRaF7+XW7htMY= +NodeupConfigHash: 3ji1nBS4aogmeEaD5IkZ1Fsj28JOtGvwsXCrLfCyuqI= __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 81bb255d4c..57e8e31b7c 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -171,7 +171,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: k43gDK6G/ti14EhHeET/KnHTe+nnyfvza0RRCZdYm4I= +NodeupConfigHash: +vVWcTsf0ptTszB0sTo8BTvSwlYjyrNRYoZJs7R263U= __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 adacb02901..f7c431da29 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.11 + version: 1.4.12 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 ccc03a3a8d..c9705a4a7b 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: {} ClusterName: bastionuserdata.example.com Hooks: @@ -38,4 +38,4 @@ channels: - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 12a34733bb..e28653670d 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 84b9442e46..d28b9949b0 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index 3cc8e963a2..6c318cbfbf 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -259,7 +259,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: fqM+horNPzSjAlyshqJt02zzi4cPuixfQJ51ZW8gKXI= + NodeupConfigHash: B555I6UHCjDaE0IsuMy9GwGzFXA+LaW80jgXXYs1PoY= __EOF_KUBE_ENV @@ -418,7 +418,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -450,7 +450,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: xSAbgi63cWrp1euxBeEVxhM+T8D5yzlxOs502lfjXag= + NodeupConfigHash: HqDhnUiEz686tkOlrTceIOdDoT5PTV8kkVWtcODt1+o= __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 2f90edbe68..e0e606a080 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -258,7 +258,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: fqM+horNPzSjAlyshqJt02zzi4cPuixfQJ51ZW8gKXI= +NodeupConfigHash: B555I6UHCjDaE0IsuMy9GwGzFXA+LaW80jgXXYs1PoY= __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 c4b2942a75..3090d652ed 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -171,7 +171,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: xSAbgi63cWrp1euxBeEVxhM+T8D5yzlxOs502lfjXag= +NodeupConfigHash: HqDhnUiEz686tkOlrTceIOdDoT5PTV8kkVWtcODt1+o= __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 73c822a940..b94092a847 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 @@ -39,7 +39,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 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 e0d9f8308b..54dc0e1ce6 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 @@ -61,14 +61,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -263,7 +263,7 @@ channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 2361c4253d..78f2ae77a7 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 97a418b2c3..736922d907 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/+xWT5Pbtg+9+1Nw5jeZXGLJSvaXtpoc6thp1028de2k6ZUmYZk1RSogKa/76TsgJf/ZXTfT6bGdzGRXAAgCDw+PK7QNcmLNRlXlgDG+d+/eriar2RRVC0gmxsDwtQZZsg3XDgaM1dzwClbeIq9gorlz4ErmMcBAWOO5MoDLYLyqoWRHizw5JSXWtvoALeiSKbOxA8ZaQKesKVmR3WRFMZBW7FINbqeamXGea93dA0bgofHKmq54ZoLWA/BCTnRwHtDRQWjBeJfaOKZ/RelfxT6Uedq3C2sYL2YrwA4FrrXdL1C1SkNFWMQqGOPGmkNtgxsHvz0hxBs1DlKBERBvHzLKiAY8uMy1IpOw4UH7FJqumdhgfMkKsgW/taj+4NTg3Eoo2Vjv+cGNqYwBY2tl5FhKBOdKNsrivwFjcZoLtK2SgCVNc9CPbyxr5ajHhQ6VMl1Vd7wG13ABH9QGxEFoiOYPqlZ+yU0FGL+pQCVgLATVGE3T1MA5Cc7tH60GjOWvQFgjk3MePPfKVMdiPsN6a+0uOn/lWsnr7jsrYQnOoxKUNtqW4GxAAb8E6zm16oVMYHb9bb1vXJnnxctvIkhFeTMaFZeRP7eAqGQ/qDxx5n9PHn05YEzVvIKS7b51WSUwUzan2Q55o1yiS1tkL4s4D3Jo8AuEDSBCP7KPh6a/bWY8oOF6toift9Z5w+s0hXf3Z77TtlANCF8COL8FLgEjKUDGWaasvKoQKu4tPox9d++R38ZfqSp13x/5bbiE2noYxojhw3M/og1NOvfwQHQ9jP/kqPQanj5CXlprEAFhYdGX7ObmVbScE23mXCAe96PgjcpUB1gmbN0QmBnc87rRQIZHGX76/H71aTn7Gyly24BRMm+L/Pf9zp0ydrIyW8S9KFkxGmWvb4gaeRQTlzbhLRc7MLKMDEtCMrHGo9UacB6F8ygognsgWk9m06U7SYr3XGynQP8vaXmE0rA6GLEAVFaWrKhH7tqyi1QlZUwlfvc6lVicnEQU0uUn8RNRTgPChNIvbfCk7b2uXeG+OHY4rLsWT0ugE/E0xL1NentmO/Z9yfDg4FJ1JggSjFdc91DR1Qu094fyq403YZnYGX3U57bbtH77S/b8e753z6832cSrzvo6q5cCVmILMug03is53DHmn+HTCUt5/QUSFa1l94wzd3Aeanm0L631Jcu/wqLp3eqM58XozGPj29l/ZsRlfXxrprAOVaVMdcuN1LT+fQ/QJvW+5ShLVkNt8ZDxlitN594Uo9FcvTBWwsZdmJ/1RkU/3Q8I8Ob/z15ElB+F9taL2L8eOeGZmL/ghGLecsy1Wucd0Pkp4BFTDfi9xV16V7vdMooc1sy5+xIAedrxS9EgOBsr59yoDTjfXQxe5Ke/FfK687pBzQnp9/8N/t82eHpZK0VodwpD/fbz/hMAAP//AQAA///A3MigwAsAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/+xWT5Pbtg+9+1Nw5jeZXGLJ2uwvbTU51LHTrps4de2k6ZUmYZk1RSogKa/76TsgJf/ZXTfT6bGdzGRXAAgCDw+PK7QNcmLNRlXlgDG+d2/frCar2RRVC0gmxsDwtQZZsg3XDgaM1dzwClbeIq9gorlz4ErmMcBAWOO5MoDLYLyqoWRHizw5JSXWtnoPLeiSKbOxA8ZaQKesKVmR3WbFzUBasUs1uJ1qZsZ5rnV3DxiBh8Yra7rimQlaD8ALOdHBeUBHB6EF411q45j+JaV/GftQ5mnfLqxhvJitADsUuNZ2v0DVKg0VYRGrYIwbaw61DW4c/PaEEG/UOEgFRkC8fcgoIxrw4DLXikzChgftU2i6ZmKD8SUryBb81qL6g1ODcyuhZGO95wc3pjIGjK2VkWMpEZwr2SiL/waMxWku0LZKApY0zUE/vrGslaMeFzpUynRVfeA1uIYLeK82IA5CQzS/V7XyS24qwPhNBSoBYyGoxmiapgbOSXBu/2g1YCx/BcIamZzz4LlXpjoW8xnWW2t30fkr10ped3+wEpbgPCpBaaNtCc4GFPBLsJ5Tq17IBGbX39b7xpV5Xtx8E0EqytvRqLiM/LkFRCX7QeWJM/978ujNgDFV8wpKtvvWZZXATNmcZjvkjXKJLm2R3RRxHuTQ4BcIG0CEfmQfD01/28x4QMP1bBE/76zzhtdpCm/vz3ynbaEaEL4EcH4LXAJGUoCMs0xZeVUhVNxbfBj79t4jv4u/UlXqvj/y23AJtfUwjBHDh+d+RBuadO7hgeh6GP/JUek1PH2EvLTWIALCwqIv2e3ty2g5J9rMuUA87kfBG5WpDrBM2LohMDO453WjgQyPMvz0+d3q03L2N1LktgGjZN4W+e/7nTtl7GRltoh7UbJiNMpe3RI18igmLm3CGy52YGQZGZaEZGKNR6s14DwK51FQBPdAtJ7Mpkt3khTvudhOgf5f0vIIpWF1MGIBqKwsWVGP3LVlF6lKyphK/O5VKrE4OYkopMtP4ieinAaECaVf2uBJ23tdu8J9cexwWHctnpZAJ+JpiHub9PbMduz7kuHBwaXqTBAkGK+47qGiqxdo7w/lVxtvwjKxM/qoz223af32l+z593zvnl9vsolXnfV1Vi8FrMQWZNBpvFdyuGPMP8OnE5by+gskKlrL7hln7uA81PJoX1rrS5Z/hUXTD6sznhejM4+Nb2f/mRGX9fGtmcI6VJUy1R03UtP69z1Am9T7jqMsWQ21xUPGW640nXtdjEZz9cJYCRt3YX7WGxX9dD8gwOv/P3sRUX4U2lsvYv965IRnYv6CE4p5yzHXap13QOengEdMNeD3FnfpXe12yyhyWDPn7ksA5GnHL0WD4GysnHOjNuB8dzF4kZ/+VsjrzusGNSek3/03+H/b4OllrRSh3SkM9dvP+08AAAD//wEAAP//kmdU7MALAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/1TOQU+EMBAF4Ht/Rf8Ay26yq7tNvEgMmCAiIXIe2wFJWqZ2WvTnG/TE9eV7L6+wlEwbaJ0NBiXhm0VByzhPj8CopEM3sspzbRNHDHzAH3De4kGTyzU5H5B3oXheOMKisQyUfANuG4GtmyXOInLMTrBHHVlU8uUPiYYMJv9/oQL+VLItp8tw5f52V7vb9b5PH1+ns3lbq9oM9bF57Sxd4OndnNPxQfwCAAD//wEAAP//rSr2M88AAAA=" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1TOwU7DMBAE0Lu/wj+QuggOlSUuLaKtRAKKoojr4mzAws4ar02cv0ehp1xHb0ZzcpSHt0i/dsCoJcwsTjSN9vMIjFp69CNrpYzLnDDyDgv44HBnyCtDPkTkTSiuEyeYDJ4j5dCAX0dg7VaZq4ScqjvYopYcaln/I9HQgDncLlyAv7Rc9paLeSnL9b5rX/fP5XxRH92hL+N8tEv9XtzcHuxP//Tw/Sj+AAAA//8BAAD///+TVvHPAAAA" | 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 c52f4f3cde..88f155e381 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/3ySwW7bMAyG734KXopeOtkuumITetiWbGiApQuSJ2AsxhUik6koOcvbD3aTZtmAngz/P+2f/MgmSHYT4Y1vbQGAe/3+bTVZzabR9xQHCYAY14GchQ0GpQKgQ8aWVkkitjQJqEpqIcVMRSOc0DPFZebkO7Lwpriz6YYfB2l/Uk/BgueNFAA9RfXCFmpzZ+q6cNJsX3vQrd/NWBOGcMzZ5jUtovw+DHYTsiaKk9l0aaGuKvP53lSmKut6MHd5SS+ZNI1eVwA8iybGjn71FKN3ZOH6C+71ugDwHbZkYftJTdtE46Uckj7sxqi+Nre1qS56vx1bCZRGfCx86CTr15yez7yaNkreHZGCHjRR5970pUiyUI5zSHaLKL13QyHu9Tzc9Gn1Otv9nalMXf3lSIee7enVBGkwFKe1TWmd29Zz+4jsAsXTogCo903ywo8YnYWOOokHgz36MHz3UFfV3N+wONrohXx1Ev3w1B+R6OHj1c1I7r/Sk3pR+/4KBp7NeJELHCiWPcYy+HV5BF2eC/7ZBABT2kvcLkJuPT/heH/sB0N4jvqSKaKj86GMMKtyxLkTN0f2G9J0DKbUjGGRKZGW3dHV4g8AAAD//wEAAP//AW5cjzYDAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/3yS0W7bPAyF7/0UvCl601+2g/7FJvRiW7KhAZYuSJ6AsRhXiEymouQsbz/YTZplA3Zl+Bzah/zIJkh2U+Gtb20BgAf9+mU9Xc9n0fcUBwmAGDeBnIUtBqUCoEPGltZJIrY0DahKaiHFTEUjnNAzxVXm5Duy8K64i+mGHwdpv1NPwYLnrRQAPUX1whZqc2/qSeGk2b31oDu/n7MmDOGUs8sbWkb5eRzsJmRNFKfz2cpCXVXm44OpTFXW9WDu84peM2kava4AeBFNjB396ClG78jC7Sc86G0B4DtsycLug5q2icZLOST9tx+j+tpMalNd9T4ZWwmURnwsfOwk6+ecXi68mjZK3p+Qgh41Uefe9ZVIslCOc0h2yyi9d0MhHvQy3Ox5/Tbbw72pTF395kiHnu351QRpMBTntc1ok9vWc/uE7ALF86IAqPdN8sJPGJ2FjjqJR4M9+jB891hX1cLfsTja6pV8cxb98NRvkejx/5u7kdxfpWf1qvbfKxh4NuNFLnGgWPYYy+A35Ql0eSn4YxMATOkgcbcMufX8jOP9sR8M4QXqa6aIji6HMsKsyhHnXtwC2W9J0ymYUjOGRaZEWnYnV4tfAAAA//8BAAD//1u51GY2AwAA" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/1SNMWuEMBhA9/yK7AVDQSgEuqjFOhism91C8tnmTPKFfOZO7tcfx00ub3hveK3HYqeMV2chS65vxFqMq/trNIHkAcJKUgjjC+2QqYJDh+ShMhiEwZAy0EmyIdKuo4E+Y0lKB5A8ogU6hxk9SK7QAnuipNf0W9O/5Pfh142XemmcGj62TuHciXo79D6+f/U2NMtU3pKnw/0sn+wBAAD//wEAAP///JnzXMEAAAA=" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1SNO26EMBQAe5/CJwAUKYpkKU0oAgKh/KCgc+xHANl+lh+OvXv61WormilmiqkNRv0R8H/TEASXiViNbtn+3iSB4BbsQqIslYl0QKACsrTeQKHQlgqtD0AnyVpHh3QK3gNGP0gLgjvUQOfwhQYEH1ADuyP6x7SRtAr+9JvHb191U9ybeCST1mm/pjz2+RJ+5pd+el4+527Nc9W+shsAAAD//wEAAP//KucQDMEAAAA=" | 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 0c97fa2c47..c7a1b7769c 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.11 + version: 1.4.12 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 d13e973ab8..247cf3da63 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/compress.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 60f937049a..cd06ea1f36 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/compress.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 b9b20fd70f..70023e405c 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -252,7 +252,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: BjufEQTSe/SpshEhyWlZ3trLSHnWjDzb9D7IR7oyA7U= + NodeupConfigHash: 4vo47eNSe01dc3RxahoGhdS/2XnUukVydc2YqiP7mtk= __EOF_KUBE_ENV @@ -399,7 +399,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat - http://HostIP2:Port2 docker.io: - https://registry-1.docker.io - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -431,7 +431,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: fTdjCZvuJqYvuMnCtWDXPXF9pdps6HB7xS1H9b2/9NE= + NodeupConfigHash: Nkqz0R7A8wEqke/cdPQkaMNMmc6XS6JM9Z4jxZiUhdQ= __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 c51e9d0cc1..aef8f9153f 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: DVc3zp2YARyi7E1/LNgg0Tjty2vyIyZpzlLUZN05Hho= + NodeupConfigHash: FlBXgNaArFbjvH0MXbWqPPbmNVd8144Nc2CLdVnOojw= __EOF_KUBE_ENV @@ -383,7 +383,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -415,7 +415,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: vscYAvq4K7o8691Oo79Ku8j+ub7XNpiWjVhRvk5unn8= + NodeupConfigHash: cL6FBQfZen0Zy8f1+22s4jf4DBzzhvq3wSbUuH2/IHg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data index f77e7aed2a..e26b5dcaa0 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: W8pk08C/d6rydZQgpOHfU11fNOdqthKvfp8hNtLjk5I= +NodeupConfigHash: Nu/twRK/S/NV+WYjVsl7qA+EC5bGObWBdnNV3ZscgPY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data index 358582f396..49987d5c39 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ImSghcIn/q+K7WMpIn0TylA8rbxNAjegHtWKQ/K3vLo= +NodeupConfigHash: /XqNQCwTAsGPA457H3gue7DUaw92pxypjiENRiz6tU0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content index d64ea90c20..24a9119c63 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 527b4b9e76..14822dfd45 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/123.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 etcdManifests: - memfs://clusters.example.com/123.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/123.example.com/manifests/etcd/events.yaml diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 41e55e8e5c..3cc630b939 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/123.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 8efb61a38c..004c1219d1 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: zFoRpAWppXg69FIbYS5We7cXeHgBEQw5qBFSeKzsLDY= +NodeupConfigHash: LLPSaZ7yQjVg0VFNYU9xbeyDt7qh+9NduadeyjaUew0= __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 0d2922c319..75e474b610 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: zFoRpAWppXg69FIbYS5We7cXeHgBEQw5qBFSeKzsLDY= +NodeupConfigHash: LLPSaZ7yQjVg0VFNYU9xbeyDt7qh+9NduadeyjaUew0= __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 97485913a3..ed2354f170 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: zFoRpAWppXg69FIbYS5We7cXeHgBEQw5qBFSeKzsLDY= +NodeupConfigHash: LLPSaZ7yQjVg0VFNYU9xbeyDt7qh+9NduadeyjaUew0= __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 67fec0caa9..e54bfc794e 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: o5Y5ZyV/WwzBIzO48BkxoDhK4EbrSkryi5kC0bp7gU0= +NodeupConfigHash: 64JNwyLOJ9K8+oMKNwaC867rWRd9HljX5+2+nvRtxaU= __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 d08be98246..c5209d2ccc 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.11 + version: 1.4.12 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 fe47c37a34..0067f8318c 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 fe47c37a34..0067f8318c 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 fe47c37a34..0067f8318c 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 b9f28c5fb2..6f27e86348 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 51a9e4cec1..f44ade264b 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: W80rsOsSg9anEDGL5fL40gNx08rzxsiXwJo/qjhA6jA= + NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= __EOF_KUBE_ENV @@ -383,7 +383,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -415,7 +415,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: /xc0hHryd87G4ro46rYwe9mCe7j9bWZRSru2pMpqqNs= + NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= __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 109047ff34..6fedec5f4f 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ijbeYKhhuMxpC9cikisQn9VbPtpESOoHKCp87FWsCPY= +NodeupConfigHash: mGHcQjjdpQvWRo+opMWRtdHNKUm/Gs26dDU/XkA/Iio= __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 1f0eb55040..00078e8ba3 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: ijbeYKhhuMxpC9cikisQn9VbPtpESOoHKCp87FWsCPY= +NodeupConfigHash: mGHcQjjdpQvWRo+opMWRtdHNKUm/Gs26dDU/XkA/Iio= __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 41b2aa435c..76672bc1df 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: ijbeYKhhuMxpC9cikisQn9VbPtpESOoHKCp87FWsCPY= +NodeupConfigHash: mGHcQjjdpQvWRo+opMWRtdHNKUm/Gs26dDU/XkA/Iio= __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 d59787f82d..fdca62bbd0 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: F+W+FLu+LYWj7fYGVitsqdvI7qM08r6I0kKk+iriMys= +NodeupConfigHash: Y6r7TcwG5dFQwHZ5V7ESid8cuKzXvaYR3gkI7AGE9dk= __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 cc96b3d1b1..8b2db52751 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.11 + version: 1.4.12 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 d6a62853e7..923fa82173 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 d6a62853e7..923fa82173 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 d6a62853e7..923fa82173 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 81abe425a2..580028ff3d 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/external_dns/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/external_dns/cloudformation.json.extracted.yaml index 51a9e4cec1..f44ade264b 100644 --- a/tests/integration/update_cluster/external_dns/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/external_dns/cloudformation.json.extracted.yaml @@ -131,7 +131,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: W80rsOsSg9anEDGL5fL40gNx08rzxsiXwJo/qjhA6jA= + NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= __EOF_KUBE_ENV @@ -383,7 +383,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -415,7 +415,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: /xc0hHryd87G4ro46rYwe9mCe7j9bWZRSru2pMpqqNs= + NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 56df06d10a..f0570fac88 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: W80rsOsSg9anEDGL5fL40gNx08rzxsiXwJo/qjhA6jA= +NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data index 30e3880a4a..1944c2ff28 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: /xc0hHryd87G4ro46rYwe9mCe7j9bWZRSru2pMpqqNs= +NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content index bc6ef51a55..91d0090d5c 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index e78d0e0a3c..5bf5fbcfd4 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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/external_dns/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-nodes_content index a6c20a5053..6d95ccbc59 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ba967280b4..a30c69771a 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: lO1CPOIzR707mdRTd3CuVEdeC/DB0u4G/iZaoBZNcVQ= +NodeupConfigHash: mRNx2d1ys4aKviHY7yRCTvfI0BcX3VQ/MJwoa+QaDoQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 30e3880a4a..1944c2ff28 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: /xc0hHryd87G4ro46rYwe9mCe7j9bWZRSru2pMpqqNs= +NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index 2d704a9961..6812ce1046 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -20,7 +20,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 4b03116956..86b7f98adb 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content index a6c20a5053..6d95ccbc59 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index 51cb14a084..c0008b5acc 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: MjpqXNUPPY+8wiyG6I0/OppX6MUGBUylm1rSHN0N3v0= + NodeupConfigHash: f3DY46c9S34SlQUCLoLIIOAfN1HNaSqb5pvYu2TIhcA= __EOF_KUBE_ENV @@ -383,7 +383,7 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -415,7 +415,7 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: U5LMg1C1GUdZeRY8EM/gYrkN4VEaGHZ7pjOleYbMRio= + NodeupConfigHash: MHi9NAsIuHM2xEIMETmwjHUKTsj94fcLDuyKPPLSiYI= __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 2ac73fe56a..ae6b22fda1 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: MjpqXNUPPY+8wiyG6I0/OppX6MUGBUylm1rSHN0N3v0= +NodeupConfigHash: f3DY46c9S34SlQUCLoLIIOAfN1HNaSqb5pvYu2TIhcA= __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 ba8dc3693d..671b9ef891 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: U5LMg1C1GUdZeRY8EM/gYrkN4VEaGHZ7pjOleYbMRio= +NodeupConfigHash: MHi9NAsIuHM2xEIMETmwjHUKTsj94fcLDuyKPPLSiYI= __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 d49c9b8dc6..70ceb4fb35 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.11 + version: 1.4.12 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 9470cf17b4..e7674c88df 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 5bbaceef61..d98f4096e5 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 1f2bcfa872..c8324b4c3a 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: WZd+YCuyUnnG70Cr4Eir/qFxWI/yr89RunNyqcLQ+Pw= +NodeupConfigHash: JBKy48m7b0wLCLpCzDcJu1n4J1wYCcyiIYUnWNgqYn0= __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 b35105eb75..75f497aec7 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 4aja/g5TzVlWGIhjjOXElOpjaVZLJBSvLfLvMtfZo84= +NodeupConfigHash: illm8WGdSwct6x84JSe/8i1yuNLZNm2HpIAVYbeFPuw= __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 28627b78fa..fd3bad89e8 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.11 + version: 1.4.12 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 3554478352..597614edd2 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 @@ -57,14 +57,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -259,7 +259,7 @@ channels: - memfs://clusters.example.com/externalpolicies.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 4d521c5ccd..37fd40df80 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/externalpolicies.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 938fcfb7da..5a49db4b92 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: FKo7/ybWpcMVpFB2C9/OBxu4h44/IRuQVPupacPPST8= +NodeupConfigHash: lMg7OJXkMgVJcncnaHKX2zo9BvLAJ793ZztMB2MYHZY= __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 51736845c3..f93f3b573e 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: FKo7/ybWpcMVpFB2C9/OBxu4h44/IRuQVPupacPPST8= +NodeupConfigHash: lMg7OJXkMgVJcncnaHKX2zo9BvLAJ793ZztMB2MYHZY= __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 10bff63d01..da30aff793 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: FKo7/ybWpcMVpFB2C9/OBxu4h44/IRuQVPupacPPST8= +NodeupConfigHash: lMg7OJXkMgVJcncnaHKX2zo9BvLAJ793ZztMB2MYHZY= __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 aac2c09b62..6b43fa5b3a 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: DRmTpXj9wd6iR1OWTtMnq2YG7HAr48J1pbtJnvkoiXQ= +NodeupConfigHash: Vm253bVe7Fr2SZJf/0LxdZ0+Gmz6OvB73hYKCJWQm0g= __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 2d0430eb37..09e9c6b28c 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.11 + version: 1.4.12 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 2f5ac5916e..49afe15b39 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 2f5ac5916e..49afe15b39 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 2f5ac5916e..49afe15b39 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 331d972175..296e2036ba 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 71eb5e7c3a..46a7fa2fbf 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.11 + version: 1.4.12 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 c4db340e71..e263b36820 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 @@ -56,7 +56,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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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,7 +64,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - 50c7e22cfbc3dbb4dde80840645c1482259ab25a13cfe821c7380446e6997e54@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/mounter - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -260,7 +260,7 @@ channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 c4db340e71..e263b36820 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 @@ -56,7 +56,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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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,7 +64,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - 50c7e22cfbc3dbb4dde80840645c1482259ab25a13cfe821c7380446e6997e54@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/mounter - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -260,7 +260,7 @@ channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 c4db340e71..e263b36820 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 @@ -56,7 +56,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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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,7 +64,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - 50c7e22cfbc3dbb4dde80840645c1482259ab25a13cfe821c7380446e6997e54@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/mounter - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -260,7 +260,7 @@ channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 dc972185b7..2a399dadf9 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,13 +4,13 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - 50c7e22cfbc3dbb4dde80840645c1482259ab25a13cfe821c7380446e6997e54@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/mounter - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -65,4 +65,4 @@ channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 2e379717ed..de3da005dc 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: gFafZS3AhlO0hOXliuxVd2CPwIa7hedfMX1l599QcRY= +NodeupConfigHash: 3xHxVjTR1JPfx7HidvZY07qpmK+14yCJzkA7H4IN60g= __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 c64d531511..4ac10b8fee 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b InstanceGroupRole: Master -NodeupConfigHash: gFafZS3AhlO0hOXliuxVd2CPwIa7hedfMX1l599QcRY= +NodeupConfigHash: 3xHxVjTR1JPfx7HidvZY07qpmK+14yCJzkA7H4IN60g= __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 fc431e0579..12149531e8 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c InstanceGroupRole: Master -NodeupConfigHash: gFafZS3AhlO0hOXliuxVd2CPwIa7hedfMX1l599QcRY= +NodeupConfigHash: 3xHxVjTR1JPfx7HidvZY07qpmK+14yCJzkA7H4IN60g= __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 8353416534..331bdab6c0 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 00Vb0u90yi8JLP6z+Ap/4EwDABN8EFfGK+chbJp8J5s= +NodeupConfigHash: 2alOBS7Pj4OuQff17Cdt5hloOAtfW5HILgUQcjNmct0= __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 237b60abb6..93b3af3eaa 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: yeXRRojhppnqFSvopuNK9hjFwVA56oVrMalgXZOoYWs= +NodeupConfigHash: 0cb2JIYaH0bFdk2wMMvfeCCxoTXYyzNRGURRgr22x/Y= __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 45c5b19281..b41e4df891 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: LJ7OtsQw+z/Zwp8KDrsWklYxWfWZYlSqjPl8fvtulJU= +NodeupConfigHash: gPPnmTpenOgt2sWYr6NvrmgKPxM8bIoVLiFN0dc9m60= __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 73549e77e7..08e020c396 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.11 + version: 1.4.12 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 b866cbc8fc..34808b5045 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 e4c9766758..f24ac35bd4 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 2298970b12..58263cc511 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -251,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 345tDYgVKCxj6F/zteCgQYINiYWUymoLIYntnJnBm9M= +NodeupConfigHash: ZtYesr1MGsN4N4D6gbfb9fVoxDhpgB8BS9f/V9lbhCc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 2307df54ed..d8e1b83dba 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -131,7 +131,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -165,7 +165,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2kWouWgiHwe6KIsdj5fXtEK2nB0mKuRqsgnFF/UvHH0= +NodeupConfigHash: g315MHUM2HSA/NYJkRgai/2btqhjj2NFWBY7Qp340II= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index 95920d9e4d..d37fc753cc 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -44,7 +44,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 5cbdc1b30a..f4cdada881 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -261,7 +261,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content index f8dce4e71e..425b710085 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -64,4 +64,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 3035425327..7985a8e0e9 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -251,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: mnCnfY8pi+tLVEWHUt2+bFKHkYN9cmTD2/znVqac+Ms= +NodeupConfigHash: JgxiSJkfofRgmi2pfh5J42Kemei2TpqgO3swKU8e8mk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data index 2307df54ed..d8e1b83dba 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -131,7 +131,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -165,7 +165,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2kWouWgiHwe6KIsdj5fXtEK2nB0mKuRqsgnFF/UvHH0= +NodeupConfigHash: g315MHUM2HSA/NYJkRgai/2btqhjj2NFWBY7Qp340II= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content index 451c71ddd2..031406dd4e 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -44,7 +44,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 9acbb8bfd6..29ec5000a0 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -261,7 +261,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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-ccm/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-nodes_content index f8dce4e71e..425b710085 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -64,4 +64,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 abb375bcc1..1b8a93093d 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -251,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: F6ybaGWJUt3Q79v0YttRrtjJ9vgkLkLGrMygWJBoxGI= +NodeupConfigHash: TCyw8vTNFKphqWdXMRQRDZB5DJ0gYCAFqoxCT5pLmD8= __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 2ea599853a..d18fece986 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -165,7 +165,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: pilzmd+4IoX62yxYizpq2dV0DNzYV74AsN6P0AirFJ4= +NodeupConfigHash: sb4FhCuuGLZ2t7zvlMMrpDeMn5nOPdBPzuN4rnJUwTo= __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 beffcdf36e..9f19775dce 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 @@ -37,7 +37,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 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 fd375a1f52..d604c28b57 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -261,7 +261,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 43d1956a90..b09252391b 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -64,4 +64,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 96a80810e0..eefa33acd8 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -260,7 +260,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: xKkLXsWCD3SeqGL9zGIJEF9ZAhCt7JLTKCiYsaZaxTA= + NodeupConfigHash: 7+mILLSMqIQgMetrcjjXSuoGf4NAX4HMI+aICn+j75g= __EOF_KUBE_ENV @@ -399,7 +399,7 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -431,7 +431,7 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: A43AUETmMAZe+WHfsKAqap7yVbmQdBSFmGBSSpV7VFM= + NodeupConfigHash: eHxhM0uG2hBDcprCkR4Sdj3e7bAde7Xb0D+S/nU85+I= __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 858eb5e30d..5c7edf3b47 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -250,7 +250,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: W80rsOsSg9anEDGL5fL40gNx08rzxsiXwJo/qjhA6jA= + NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= __EOF_KUBE_ENV @@ -389,7 +389,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -421,7 +421,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: /xc0hHryd87G4ro46rYwe9mCe7j9bWZRSru2pMpqqNs= + NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= __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 448f6884d1..c9f401123a 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -249,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: W80rsOsSg9anEDGL5fL40gNx08rzxsiXwJo/qjhA6jA= +NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= __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 30e3880a4a..1944c2ff28 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: /xc0hHryd87G4ro46rYwe9mCe7j9bWZRSru2pMpqqNs= +NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= __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 11da7d7510..02107e9b36 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.11 + version: 1.4.12 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 e78d0e0a3c..5bf5fbcfd4 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 a6c20a5053..6d95ccbc59 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-ipv6-calico/cloudformation.json.extracted.yaml index cc9b34a469..f3e702ccee 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6-calico/cloudformation.json.extracted.yaml @@ -135,7 +135,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -257,7 +257,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: B0oyX3UJly+hptTRJ8vT2D1neYSDuBPRf8CtbkmEr8Y= + NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= __EOF_KUBE_ENV @@ -400,7 +400,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -434,7 +434,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: 9h7LnzYSzFeNnL+RwVKqe/4j529/rW24+xn5QSl0qoo= + NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 18ddd3851e..d82fc1c265 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -134,7 +134,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -256,7 +256,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: B0oyX3UJly+hptTRJ8vT2D1neYSDuBPRf8CtbkmEr8Y= +NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 5078ce93ee..8c1210eeb2 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -134,7 +134,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -168,7 +168,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 9h7LnzYSzFeNnL+RwVKqe/4j529/rW24+xn5QSl0qoo= +NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content index b7c56032b0..2dfd27b620 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -32,7 +32,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index f6ccf54df8..d4b84654f7 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -260,7 +260,7 @@ channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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-calico/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-nodes_content index c688f5dd15..60d107e33d 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -63,4 +63,4 @@ channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-ipv6-cilium/cloudformation.json.extracted.yaml index cc9b34a469..f3e702ccee 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/cloudformation.json.extracted.yaml @@ -135,7 +135,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -257,7 +257,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: B0oyX3UJly+hptTRJ8vT2D1neYSDuBPRf8CtbkmEr8Y= + NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= __EOF_KUBE_ENV @@ -400,7 +400,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -434,7 +434,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: 9h7LnzYSzFeNnL+RwVKqe/4j529/rW24+xn5QSl0qoo= + NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 18ddd3851e..d82fc1c265 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -134,7 +134,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -256,7 +256,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: B0oyX3UJly+hptTRJ8vT2D1neYSDuBPRf8CtbkmEr8Y= +NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 5078ce93ee..8c1210eeb2 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -134,7 +134,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -168,7 +168,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 9h7LnzYSzFeNnL+RwVKqe/4j529/rW24+xn5QSl0qoo= +NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content index 3e278a1d6e..1bd0be5d31 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -32,7 +32,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index f6ccf54df8..d4b84654f7 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -260,7 +260,7 @@ channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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-cilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content index c688f5dd15..60d107e33d 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -63,4 +63,4 @@ channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 18ddd3851e..d82fc1c265 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -134,7 +134,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -256,7 +256,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: B0oyX3UJly+hptTRJ8vT2D1neYSDuBPRf8CtbkmEr8Y= +NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 5078ce93ee..8c1210eeb2 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -134,7 +134,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -168,7 +168,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 9h7LnzYSzFeNnL+RwVKqe/4j529/rW24+xn5QSl0qoo= +NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content index 99f196e486..a2e690770e 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -32,7 +32,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index f6ccf54df8..d4b84654f7 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -260,7 +260,7 @@ channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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-private/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-nodes_content index c688f5dd15..60d107e33d 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -63,4 +63,4 @@ channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 cc9b34a469..f3e702ccee 100644 --- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml @@ -135,7 +135,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -257,7 +257,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: B0oyX3UJly+hptTRJ8vT2D1neYSDuBPRf8CtbkmEr8Y= + NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= __EOF_KUBE_ENV @@ -400,7 +400,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -434,7 +434,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: 9h7LnzYSzFeNnL+RwVKqe/4j529/rW24+xn5QSl0qoo= + NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= __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 18ddd3851e..d82fc1c265 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 @@ -134,7 +134,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -256,7 +256,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: B0oyX3UJly+hptTRJ8vT2D1neYSDuBPRf8CtbkmEr8Y= +NodeupConfigHash: vu8kuCLEmp5G+Pcx1g+lHLJY/SZA16FhSOV6+FdZqgI= __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 5078ce93ee..8c1210eeb2 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 @@ -134,7 +134,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -168,7 +168,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 9h7LnzYSzFeNnL+RwVKqe/4j529/rW24+xn5QSl0qoo= +NodeupConfigHash: 8ZT2mgeDVMq2Isp5iIQAKozt2G4FbcQ134+r2PUENgw= __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 ef5360d85e..10dbbc535b 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 @@ -32,7 +32,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 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 f6ccf54df8..d4b84654f7 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -260,7 +260,7 @@ channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 c688f5dd15..60d107e33d 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -63,4 +63,4 @@ channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 40774b000e..480c761e9e 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -252,7 +252,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Fy3gpuqKCFNgyF3EclxzxN7uThNyAHD7KKdzAqgReHE= +NodeupConfigHash: pDRSr6SMzK6tLxmcJOM7n0g2Kji8/350jRsx6uXYUII= __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 0b2985d050..4dc117e2bb 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -166,7 +166,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: UjegVvxXJ+jbQaNuHnMwHSxxtZLwVHGLrg2vzkYEMtI= +NodeupConfigHash: XPOVEdCrpSkrDxiJQoaIOeH8Ec/7oqGiNlEb+7iDEvE= __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 17b227704f..37311bcdd8 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.11 + version: 1.4.12 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 17f3f9ca83..81cd362543 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -260,7 +260,7 @@ channels: - memfs://clusters.example.com/minimal-warmpool.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 e27ff74be1..76d839b24f 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -64,7 +64,7 @@ channels: - memfs://clusters.example.com/minimal-warmpool.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 warmPoolImages: - k8s.gcr.io/kube-proxy:v1.21.0 - k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.4.0 diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index 51a9e4cec1..f44ade264b 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: W80rsOsSg9anEDGL5fL40gNx08rzxsiXwJo/qjhA6jA= + NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= __EOF_KUBE_ENV @@ -383,7 +383,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -415,7 +415,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: /xc0hHryd87G4ro46rYwe9mCe7j9bWZRSru2pMpqqNs= + NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= __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 56df06d10a..f0570fac88 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: W80rsOsSg9anEDGL5fL40gNx08rzxsiXwJo/qjhA6jA= +NodeupConfigHash: uvsdeylmA1Hmxd/ieHZhUf5wJOstPjxnQzqQlL7hROo= __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 30e3880a4a..1944c2ff28 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: /xc0hHryd87G4ro46rYwe9mCe7j9bWZRSru2pMpqqNs= +NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= __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 12d7b13522..db5eb741df 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.11 + version: 1.4.12 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 e78d0e0a3c..5bf5fbcfd4 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 a6c20a5053..6d95ccbc59 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 453918a067..4df554978a 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.11 + version: 1.4.12 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 ddf9a5aa09..aa47a27905 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 @@ -56,7 +56,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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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,7 +64,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - 50c7e22cfbc3dbb4dde80840645c1482259ab25a13cfe821c7380446e6997e54@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/mounter - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -260,7 +260,7 @@ channels: - memfs://tests/minimal-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 37fb57498b..32c25f3a57 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,13 +4,13 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - 50c7e22cfbc3dbb4dde80840645c1482259ab25a13cfe821c7380446e6997e54@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/mounter - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -65,4 +65,4 @@ channels: - memfs://tests/minimal-gce.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 6f86880845..c1846fdcc5 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: CfRgWOBYat0BblhdWdmDDVleXozVPAjW/zYlbfdA09k= +NodeupConfigHash: RaPC1jXNeS2wf1C+minDmw6vyuKu8d1u0XXgnH2tTwI= __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 402758602c..3aae332dda 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PKmuhfzRGT/4UE0gEb2oqFBkj461Ro14FQ+dPGH5TSU= +NodeupConfigHash: IM+wGeyjCq+8zwIapi3qUstAB/39X2jPj40PKuBlMeI= __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 273042bb5d..a6ca11a535 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.11 + version: 1.4.12 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 ec49383136..21c91a4567 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 @@ -56,7 +56,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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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,7 +64,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - 50c7e22cfbc3dbb4dde80840645c1482259ab25a13cfe821c7380446e6997e54@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/mounter - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -260,7 +260,7 @@ channels: - memfs://tests/minimal-gce-private.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 f30b79bcf8..aa84eb1c62 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,13 +4,13 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - 50c7e22cfbc3dbb4dde80840645c1482259ab25a13cfe821c7380446e6997e54@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/mounter - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -65,4 +65,4 @@ channels: - memfs://tests/minimal-gce-private.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 846594b032..5d916b1bf0 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: Master -NodeupConfigHash: 3oMBrsKyhZYSrdhZ/CVYkVN1sRyaB2Bfk5pCKWb9xxE= +NodeupConfigHash: geQXVMBDkdwG8xUA/TEjv4tzs1qNGac3cYZWbTw5lN4= __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 5a36aeb361..f014d46d16 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: TqScgZph8TdT1KvgsB9qS2B72HlJnWc2gQ48wx7PRTk= +NodeupConfigHash: InFMqIsDiXLR7os8eQnCmWGP1NLPGB1QqFxJLBsiiYU= __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 9d831fdbd5..e06b25f52d 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: YmX4HAFRaQFSZdJftPNVHzffkdrUhJchPgjfhi0q848= +NodeupConfigHash: LEvKeSsUPlTwvxrLsM9R/WHEgra5CXKQNJO9cDmZ/0I= __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 d00f7f03e9..246b50530c 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 0X4w89jCM5tvfu7AJxC5Y5fAumbMiJ2hMBcq90ldRZI= +NodeupConfigHash: A+FBEJzA1as/oasnEykHdc48XRZg9JwEC6nEeZF42mE= __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 298b58968a..0be2c9c9a8 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.11 + version: 1.4.12 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 7832e3348b..7806eea6e4 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/minimal.k8s.local/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 076a3e95e4..e28e86a763 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,14 +3,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -64,4 +64,4 @@ channels: - memfs://clusters.example.com/minimal.k8s.local/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 ac58899e18..492e60f14d 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= + NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __EOF_KUBE_ENV @@ -383,7 +383,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -496,7 +496,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= + NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __EOF_KUBE_ENV @@ -635,7 +635,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -748,7 +748,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= + NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __EOF_KUBE_ENV @@ -887,7 +887,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -919,7 +919,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: cYibNJpkNVEaVmVa2TF6wG3bgThiyxG+Fja1ifObcbY= + NodeupConfigHash: jtFNifJTD48V/GLMrMO/nzuIhatOmCVF245s9S56GcA= __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 8ab9b6362b..11caf3a9ea 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= +NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __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 9fe04d4bb6..5837d087c4 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= +NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __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 8fb3c81f43..f20ba66881 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= +NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __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 c2fade517b..9dca10ddc3 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cYibNJpkNVEaVmVa2TF6wG3bgThiyxG+Fja1ifObcbY= +NodeupConfigHash: jtFNifJTD48V/GLMrMO/nzuIhatOmCVF245s9S56GcA= __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 89885d0492..b760fa24df 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.11 + version: 1.4.12 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 c9511a5947..d8574920d0 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 c9511a5947..d8574920d0 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 c9511a5947..d8574920d0 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 39da947179..d85c3cf3cf 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 ac58899e18..492e60f14d 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -244,7 +244,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= + NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __EOF_KUBE_ENV @@ -383,7 +383,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -496,7 +496,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master - NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= + NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __EOF_KUBE_ENV @@ -635,7 +635,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -748,7 +748,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master - NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= + NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __EOF_KUBE_ENV @@ -887,7 +887,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -919,7 +919,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: cYibNJpkNVEaVmVa2TF6wG3bgThiyxG+Fja1ifObcbY= + NodeupConfigHash: jtFNifJTD48V/GLMrMO/nzuIhatOmCVF245s9S56GcA= __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 8ab9b6362b..11caf3a9ea 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= +NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __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 9fe04d4bb6..5837d087c4 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master -NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= +NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __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 8fb3c81f43..f20ba66881 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master -NodeupConfigHash: Z8T3uaWJY6tDT9ieoX1qyQOphMoH6IJCnP6d7+3P0ho= +NodeupConfigHash: gqzDVEDGVf4nodlpXIbwlDkD864u0ay7X2OGMn3qRow= __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 c2fade517b..9dca10ddc3 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cYibNJpkNVEaVmVa2TF6wG3bgThiyxG+Fja1ifObcbY= +NodeupConfigHash: jtFNifJTD48V/GLMrMO/nzuIhatOmCVF245s9S56GcA= __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 89885d0492..b760fa24df 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.11 + version: 1.4.12 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 c9511a5947..d8574920d0 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 c9511a5947..d8574920d0 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 c9511a5947..d8574920d0 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 39da947179..d85c3cf3cf 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 f692c9fd8e..2510ec7821 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 @@ -132,7 +132,7 @@ containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 6jTKznCNZAmoryqZULOLCNflvVZgTnkir+Unv1+XyB8= + NodeupConfigHash: Anitg6mVaWqntn/87qDuntaQYnw+V6j8bxDjEm9VwPE= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourceslongclusternameexamplecom.Prop containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourceslongclusternameexamplecom.Prop ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: ZQW0b/XcvNmRoOmT7ahP5gZdRc7Imoab5SOOAzlJiU4= + NodeupConfigHash: Tw0pD4UJzZ3BPB/329+fJ1hKHvR+EthYJbCrMKq+3wc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data index 4492dd5c9e..17c1ca0ccd 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 6jTKznCNZAmoryqZULOLCNflvVZgTnkir+Unv1+XyB8= +NodeupConfigHash: Anitg6mVaWqntn/87qDuntaQYnw+V6j8bxDjEm9VwPE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data index ad3d9af578..39f3c8c0b4 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data @@ -130,7 +130,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ZQW0b/XcvNmRoOmT7ahP5gZdRc7Imoab5SOOAzlJiU4= +NodeupConfigHash: Tw0pD4UJzZ3BPB/329+fJ1hKHvR+EthYJbCrMKq+3wc= __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 e13b141ed3..d07b6e2896 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.11 + version: 1.4.12 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 7c637cfcde..e181aa2e51 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/nthsqsresources.longclustername.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 etcdManifests: - memfs://clusters.example.com/nthsqsresources.longclustername.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/nthsqsresources.longclustername.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 5616d1b7af..da620c108e 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/nthsqsresources.longclustername.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml index 40a59bbd93..bd5c7809f7 100644 --- a/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml @@ -134,7 +134,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. nvidiaGPU: enabled: true package: nvidia-headless-460-server - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -247,7 +247,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: N7p2va9tPSRTapQ/idYkE3zTSMGc04Er5uSryOA+EJY= + NodeupConfigHash: BnBiCCXm3uYSzkYNxqh7P0ZTil+gsxMQPQZ2Wli4O/o= __EOF_KUBE_ENV @@ -389,7 +389,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa nvidiaGPU: enabled: true package: nvidia-headless-460-server - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -421,7 +421,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: OyVtiYq+TGC8i2VY0pYPlgnx1r3FYU53FSn5Y0bLIQ4= + NodeupConfigHash: 3JbfPNO+qitZH0iMWb77sgQaJ2Fp3z/yWM0yWnGR5qs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index ab84185f46..58fceb4758 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -133,7 +133,7 @@ containerd: nvidiaGPU: enabled: true package: nvidia-headless-460-server - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -246,7 +246,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: N7p2va9tPSRTapQ/idYkE3zTSMGc04Er5uSryOA+EJY= +NodeupConfigHash: BnBiCCXm3uYSzkYNxqh7P0ZTil+gsxMQPQZ2Wli4O/o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data index bc6ac6cc93..b0766b4c81 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -133,7 +133,7 @@ containerd: nvidiaGPU: enabled: true package: nvidia-headless-460-server - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -165,7 +165,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: OyVtiYq+TGC8i2VY0pYPlgnx1r3FYU53FSn5Y0bLIQ4= +NodeupConfigHash: 3JbfPNO+qitZH0iMWb77sgQaJ2Fp3z/yWM0yWnGR5qs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content index 2ecb99df73..9e7091bf27 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -23,7 +23,7 @@ spec: nvidiaGPU: enabled: true package: nvidia-headless-460-server - version: 1.4.11 + version: 1.4.12 dnsZone: Z1AFAKE1ZON3YO docker: skipInstall: true diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index 7d674b7035..8faccea662 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -263,7 +263,7 @@ containerdConfig: nvidiaGPU: enabled: true package: nvidia-headless-460-server - version: 1.4.11 + version: 1.4.12 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/nvidia/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 1001d3600c..382968c505 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -3,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -69,4 +69,4 @@ containerdConfig: nvidiaGPU: enabled: true package: nvidia-headless-460-server - version: 1.4.11 + version: 1.4.12 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 4a4380e4fe..10ca3c1be3 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: ZH6LtvLuH7EzqXA90SZzRUKTyt52fMW5pqDSTrnETwI= + NodeupConfigHash: pk2UmZSleNJwj6l2MUTa7SOAUtdxDiheZf2edFm0AJo= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: FVdaTp49ps6Bdi+TXySvoAnRRy6pHk5BDAqecEkVxxg= + NodeupConfigHash: RHB3xpW4L0zay+DhORGAEilJK1r0tVvwmUu0kjdmA6I= __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 804cf6146d..7186abadd0 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ZH6LtvLuH7EzqXA90SZzRUKTyt52fMW5pqDSTrnETwI= +NodeupConfigHash: pk2UmZSleNJwj6l2MUTa7SOAUtdxDiheZf2edFm0AJo= __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 9177c08c9e..20c4eba841 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.11 + version: 1.4.12 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: FVdaTp49ps6Bdi+TXySvoAnRRy6pHk5BDAqecEkVxxg= +NodeupConfigHash: RHB3xpW4L0zay+DhORGAEilJK1r0tVvwmUu0kjdmA6I= __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 58b9362f72..61f818ee10 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.11 + version: 1.4.12 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 ace1e128ba..b75cfa887f 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 c87f0d1e33..0861577498 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 31849c99c3..d1f613a574 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 3fbfOG/KgQtwgag+KsakwTiX4seBRwEEwocaVLGlPjY= +NodeupConfigHash: cuBFa2qO3I3HeP/BbKT2Il5QJbZq2dfJfydtis7/ONk= __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 41b9ff93d8..6d60f86d43 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.11 + version: 1.4.12 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: Fgd7CMDMSH8hf2cFmRUyYtyrdrxQSEpJxd+d7xr1kwU= +NodeupConfigHash: OjGIAbjdHtboBbIsjunNu8ywFFPpbi40YxaAr6CbglM= __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 09a3bc6e0e..29918c780a 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.11 + version: 1.4.12 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 e33edcdb9b..b7021e1c4e 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/private-shared-subnet.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 b5ccb04adb..b3d8fe0724 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/private-shared-subnet.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index 57a570f81c..ee942d43bf 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: SJXlQ0IBtqJTXWHh1ZLC5z7Yxnf5+g/CMpj6u4QLSzc= + NodeupConfigHash: QsLjbBH58AR25hdHczx1HEuJkP9V6YL7oIVdAiaNbtE= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: sZlh74F+f/v1Xuc5v2EZaLrmR9fQ6D+7JBDpnYDuorI= + NodeupConfigHash: GkHMW8t1Vddxt+JhlYTe84LBWFOHZsTx3XwqjfIPxMY= __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 b301cb1eb0..d70eb685ac 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: SJXlQ0IBtqJTXWHh1ZLC5z7Yxnf5+g/CMpj6u4QLSzc= +NodeupConfigHash: QsLjbBH58AR25hdHczx1HEuJkP9V6YL7oIVdAiaNbtE= __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 7ce7abc9e2..7765996d81 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: sZlh74F+f/v1Xuc5v2EZaLrmR9fQ6D+7JBDpnYDuorI= +NodeupConfigHash: GkHMW8t1Vddxt+JhlYTe84LBWFOHZsTx3XwqjfIPxMY= __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 f41f927f89..5ea972b456 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.11 + version: 1.4.12 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 f55435c4e3..f6401cd377 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 0304d9928e..123f4caa87 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 176ace1322..3aac76552b 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 @@ -131,7 +131,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -254,7 +254,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: cDWy7b28g2HeI4L2fYq3N4v96GeAjsauylqNFQvNTEI= +NodeupConfigHash: fNH/0q8QSo6v5DgfOlE5Tu7N0VfT9JLoggkfwND7oZc= __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 d503eb7fe4..f06a5ce3b0 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 @@ -131,7 +131,7 @@ cloudConfig: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -167,7 +167,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: yaHIJa6pnpGnjNVhmc6Q+KUAQEfb2aZQnSNqwggjxms= +NodeupConfigHash: 9cdcV95YxxbZb10VjjolJ6X9QQvkXActxmr9KWlQPxs= __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 95030ac0e2..e577ee3011 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 @@ -23,7 +23,7 @@ spec: containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 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 ededc946b6..1c54d25f74 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 @@ -55,14 +55,14 @@ Assets: - fec5c596f7f815f17f5d7d955e9707df1ef02a2ca5e788b223651f83376feb7f@https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/amd64/kubelet - 703e70d49b82271535bc66bc7bd469a58c11d47f188889bd37101c9772f14fa1@https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - cea637a7da4f1097b16b0195005351c07032a820a3d64c3ff326b9097cfac930@https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/arm64/kubelet - 8d9cc92dcc942f5ea2b2fc93c4934875d9e0e8ddecbde24c7d4c4e092cfc7afc@https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -261,7 +261,7 @@ channels: - memfs://clusters.example.com/privatecanal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 79cc1b1a39..967e17e7d9 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,12 +3,12 @@ Assets: - fec5c596f7f815f17f5d7d955e9707df1ef02a2ca5e788b223651f83376feb7f@https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/amd64/kubelet - 703e70d49b82271535bc66bc7bd469a58c11d47f188889bd37101c9772f14fa1@https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-linux-amd64.tar.gz arm64: - cea637a7da4f1097b16b0195005351c07032a820a3d64c3ff326b9097cfac930@https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/arm64/kubelet - 8d9cc92dcc942f5ea2b2fc93c4934875d9e0e8ddecbde24c7d4c4e092cfc7afc@https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -64,4 +64,4 @@ channels: - memfs://clusters.example.com/privatecanal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index 8021f628f8..7b73074baa 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -245,7 +245,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: w8SHDGznYkWtBHtj0YCc0I9yPbmtQ3LEpq9VJh8D9gw= + NodeupConfigHash: iB55E6GLnxJsiV+aT+Sq04FuPcbSpUKnsoZVQPhLjv4= __EOF_KUBE_ENV @@ -384,7 +384,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -416,7 +416,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: 22hs1AnZyUjKnCk3oueReh9e5BPLxtzYgXWjuzHYu/8= + NodeupConfigHash: xC5tzX+O6uOdArq3DaSOez2gKi783lM8grs+u+EFAlw= __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 146a10c4d5..6b574cbddd 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: w8SHDGznYkWtBHtj0YCc0I9yPbmtQ3LEpq9VJh8D9gw= +NodeupConfigHash: iB55E6GLnxJsiV+aT+Sq04FuPcbSpUKnsoZVQPhLjv4= __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 5d99e8341f..35575b09a3 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 22hs1AnZyUjKnCk3oueReh9e5BPLxtzYgXWjuzHYu/8= +NodeupConfigHash: xC5tzX+O6uOdArq3DaSOez2gKi783lM8grs+u+EFAlw= __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 9ef83d3e9d..67357cfb01 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.11 + version: 1.4.12 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 7c15b45583..69f7c8444f 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 211c9f8689..4f22cd9e65 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index ce8fd29b78..8276d41886 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -248,7 +248,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: /ukQwN1fLtSIHMRBBnFArg5KQv8z1wW22BqM1VkDI3U= + NodeupConfigHash: VJxx4pMTuHBnBVSpWQuu2yBPo0IJrpQzJaQdA5rbJyM= __EOF_KUBE_ENV @@ -387,7 +387,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La containerRuntime: containerd containerd: logLevel: info - version: 1.4.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -420,7 +420,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: VxVjDe8c3z+4Se6fCZh+ElgTvu0w3yfI64FWYDJG1RQ= + NodeupConfigHash: Whr86CROsMxJvKPNBQeIv/zy9VmneGPq9PrY2nxglb8= __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 614584c9c1..23a668f402 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -246,7 +246,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: /ukQwN1fLtSIHMRBBnFArg5KQv8z1wW22BqM1VkDI3U= +NodeupConfigHash: VJxx4pMTuHBnBVSpWQuu2yBPo0IJrpQzJaQdA5rbJyM= __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 1b8ed321f3..1298a80f62 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -163,7 +163,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: VxVjDe8c3z+4Se6fCZh+ElgTvu0w3yfI64FWYDJG1RQ= +NodeupConfigHash: Whr86CROsMxJvKPNBQeIv/zy9VmneGPq9PrY2nxglb8= __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 866204015a..3e33406735 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.11 + version: 1.4.12 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 34ef867d52..dfbe238093 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -327,7 +327,7 @@ channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 739a30f1ce..fc59a692ce 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: etcd-clients-ca-cilium: | -----BEGIN CERTIFICATE----- @@ -84,4 +84,4 @@ channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 fc2fa7574f..91179258e7 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 0NIqyrgoXb026hEF4lI+9jh3LXlsqEEO3DeYj9NOfSU= +NodeupConfigHash: CPux0dD2+HT4c56ZZio705evTTq8x20pZNL1FYdUyFw= __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 f7ee939cdf..eb56145c16 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: RZI+dOuWQ5z0diJdGFZheSmrk42XMWd72kPh2jO4H0c= +NodeupConfigHash: KOE4/tcEk3yVEmlW/UStobdHpaPXYSetj232s84yOR8= __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 7dd5023b7f..d9cf0e4e19 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.11 + version: 1.4.12 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 14bbccc438..f5c4fa8eab 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/privatedns1.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 d71391dc42..f18d86febe 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privatedns1.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 5760555ddf..81b9781d7d 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: +FwMF7KMFySIWkibYmNECDBoeoiaNzSzwD6E0EhUOvY= +NodeupConfigHash: ioJEozdQomCuJVLhs1OEKKrCX8TX5X4SWb/cPfrWnps= __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 7594ac5fa3..d1b02f168c 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: AbXK4LtXw/jaOk+I61RWTZ86BPas5Eg6hrxdTyBK4o0= +NodeupConfigHash: uhr4uOESSTzwNUKcVIPswkPVvqWsPteu4XGpi5D/pqE= __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 c9613eb7ed..3acace568c 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.11 + version: 1.4.12 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 f7cc52f375..43bfd6311e 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/privatedns2.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 946e4b05f7..f34b19ed33 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privatedns2.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 f063363b0b..8b05f12348 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 1lJKetiGCY8bknZ/nYxsGtmdODiRnF6aovPOC+2wjkY= +NodeupConfigHash: Zz9KzfUGiTK4kN7RXOy4gdZcaoUPWtxaWc84oo1DkQU= __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 ecc53685ea..c47821e531 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: O6bqARd+2JTDjuPy6zpJKJRAWJeuN7viYRx9HSd9nZ8= +NodeupConfigHash: moMK5mtrLFbiueb9+1ezRA+wxlNcjdmtHJhVAveBews= __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 782513cf81..595ad3490d 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.11 + version: 1.4.12 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 773390b741..0739cfd75d 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/privateflannel.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 e6e3760f28..391b9106fa 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privateflannel.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 1ee3953283..a9ca5ea392 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -241,7 +241,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: uM1GS7FDKFB34SJMZcKEbUiJneLYjGlTxLAOp0Eilzk= +NodeupConfigHash: WJBgoSYqHArQQkNa1eHivx70rxkNkZGlAtRy1Tob+ko= __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 a064c81e52..866be8250a 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -161,7 +161,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 6BsL1o8+xIJWxgQsanvkYMJPb61q7VlNej9cHejL6+E= +NodeupConfigHash: ZsphstEUyVb1l1RFR5KpsjM5CtOqdvehFI4WEdt289w= __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 368752c845..6a3deb73a9 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.11 + version: 1.4.12 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 07e7752a3a..0a1d73e9bf 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -256,7 +256,7 @@ channels: - memfs://clusters.example.com/privatekopeio.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 dfbd545a3d..7c203cc5c8 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -59,4 +59,4 @@ channels: - memfs://clusters.example.com/privatekopeio.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 f81d58af56..5a1bac98f2 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ct6YzV2WsvoGAoTol7VyRwMuPXC9xv7RVu6lpyqLei8= +NodeupConfigHash: 7eT0x+DGB4d2vPpg1WUjLUYMarUyOu7gTF00n16yQjs= __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 16f32cd2c9..e2d9777df7 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Ls4Yw32RR9OkzwlZwpf5D2gkg6FG0nJ7NT6fK+k++mo= +NodeupConfigHash: Ge59mZH78+vn6rESQespEVRdHVRFGbNik4eo7bRHkPg= __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 4447d17466..b69bd2280a 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.11 + version: 1.4.12 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 7bb3f69929..78ce530e57 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/privateweave.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 37baaabf39..113d680786 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/privateweave.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 44407c4a2f..da95ce7b30 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: bW/T1B+ymeUtrqjNV2Lrl/iLqRqA0veA4mcr2yjnxfw= +NodeupConfigHash: 7PUFcQQbQJz0hBfJwfBpvh9vWW3XUgkXjs1NucShcmQ= __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 8e820ca8c6..c7baa6b3a3 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 01Be5T4q2jX/omAMGJfyfTy373WI7kRHBGsoBFXRj2c= +NodeupConfigHash: gDhLLl3zMfK/GqffLfSTEo2HTI0oOq40e+eDVRKzqeA= __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 cb176e6fcd..0c488d52a8 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.11 + version: 1.4.12 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 a875a3b12d..51d4165afd 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/sharedsubnet.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 4e0e9daca0..57d64065bc 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/sharedsubnet.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 d8685d8777..00e99da4a2 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: jIVUvO+NdUOt+kWbyNLv2k/ad6UrvZ7LtT1wlAPBSHw= +NodeupConfigHash: VHGwRGFDge47Sh4FRKQbwdyvnr5tw9czUrbz2WFqEsw= __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 d072421ac9..3a5df61edd 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: CQ8CFabfcJaB6jaoJrPNth95BJPzNbsGy5OM9oea8xs= +NodeupConfigHash: Vl+/FMmSAiNUwr6sPMejuhCqy+e3905EP8EH5eNXq0w= __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 acaa12809b..099cca78d9 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.11 + version: 1.4.12 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 1960069cae..1931911954 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/sharedvpc.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 b8a28e6dfb..c95cc57a1d 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/sharedvpc.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 8e0fc06fd7..42c37bf758 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 2hqxvnf/1s5uO1lHA5qvsi4AiMQySmLgEdhoLBN2OQk= +NodeupConfigHash: iv99SKTGB5CNRQdOS9vrBG5rjSWPfCHBt/z+4LfjCMM= __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 59f76e445d..bd7682ea73 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 6Z9EvlyKTQtaqNqQOQHyiogQGWnyPc/x/PMIVxyyNHc= +NodeupConfigHash: CGSc972qynBjNblVJSwm0HjSgxy4n+/57O9YUt7g5Ss= __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 debfcf1575..1a5c3a87d9 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.11 + version: 1.4.12 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 4bdee9ad18..fbc1fa00db 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/unmanaged.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 ef4f40cce8..ac0db69bad 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/unmanaged.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 ba967280b4..a30c69771a 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.11 + version: 1.4.12 docker: skipInstall: true encryptionConfig: null @@ -243,7 +243,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: lO1CPOIzR707mdRTd3CuVEdeC/DB0u4G/iZaoBZNcVQ= +NodeupConfigHash: mRNx2d1ys4aKviHY7yRCTvfI0BcX3VQ/MJwoa+QaDoQ= __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 30e3880a4a..1944c2ff28 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.11 + version: 1.4.12 docker: skipInstall: true kubeProxy: @@ -162,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: /xc0hHryd87G4ro46rYwe9mCe7j9bWZRSru2pMpqqNs= +NodeupConfigHash: PMbuErTATZ4E+W0XoSuyuYW/O0WKToQKV1S1lUMtPzQ= __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 92320023f8..75845b480a 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.11 + version: 1.4.12 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 4b03116956..86b7f98adb 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 @@ -55,14 +55,14 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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: - 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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: @@ -257,7 +257,7 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12 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 a6c20a5053..6d95ccbc59 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,12 +3,12 @@ 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 - - a4a4af4776316833cad5996c66d59f8b4a2af4da716b7902b7a2d5f5ac362dcc@https://github.com/containerd/containerd/releases/download/v1.4.11/cri-containerd-cni-1.4.11-linux-amd64.tar.gz + - f6120552408175ca332fd3b5d31c5edd115d8426d6731664e4ea3951c5eee3b4@https://github.com/containerd/containerd/releases/download/v1.4.12/cri-containerd-cni-1.4.12-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 - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - - 0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz + - 87a4219c54552797ffd38790b72832372a90eceb7c8e451c36a682093d57dae6@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz CAs: kubernetes-ca: | -----BEGIN CERTIFICATE----- @@ -60,4 +60,4 @@ channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml containerdConfig: logLevel: info - version: 1.4.11 + version: 1.4.12