From 579fb6b2b07c507759c7cec00823248372e69d0c Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 3 Jan 2025 21:43:20 +0200 Subject: [PATCH] hack/update-expected.sh --- pkg/model/tests/data/bootstrapscript_0.txt | 2 +- pkg/model/tests/data/bootstrapscript_1.txt | 2 +- pkg/model/tests/data/bootstrapscript_2.txt | 2 +- pkg/model/tests/data/bootstrapscript_3.txt | 2 +- pkg/model/tests/data/bootstrapscript_4.txt | 2 +- pkg/model/tests/data/bootstrapscript_5.txt | 2 +- pkg/model/tests/data/nodeupconfig_0.txt | 1 + pkg/model/tests/data/nodeupconfig_1.txt | 1 + pkg/model/tests/data/nodeupconfig_2.txt | 1 + pkg/model/tests/data/nodeupconfig_3.txt | 1 + pkg/model/tests/data/nodeupconfig_4.txt | 1 + pkg/model/tests/data/nodeupconfig_5.txt | 1 + ...r-us-test-1a.masters.additionalobjects.example.com_user_data | 2 +- ...aunch_template_nodes.additionalobjects.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ..._template_apiserver.apiservers.minimal.example.com_user_data | 2 +- ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-apiserver_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...ter-us-test-1a.masters.bastionuserdata.example.com_user_data | 2 +- ..._launch_template_nodes.bastionuserdata.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-bastion_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...a.masters.cas-priority-expander-custom.example.com_user_data | 2 +- ...-priority.cas-priority-expander-custom.example.com_user_data | 2 +- ...-priority.cas-priority-expander-custom.example.com_user_data | 2 +- ...ate_nodes.cas-priority-expander-custom.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes-high-priority_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes-low-priority_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...-test-1a.masters.cas-priority-expander.example.com_user_data | 2 +- ...es-high-priority.cas-priority-expander.example.com_user_data | 2 +- ...des-low-priority.cas-priority-expander.example.com_user_data | 2 +- ...h_template_nodes.cas-priority-expander.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes-high-priority_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes-low-priority_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.complex.example.com_user_data | 2 +- .../aws_launch_template_nodes.complex.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../complex/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...ate_master-us-test-1a.masters.compress.example.com_user_data | 2 +- .../aws_launch_template_nodes.compress.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../compress/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...e_master-us-test-1a.masters.containerd.example.com_user_data | 2 +- .../aws_launch_template_nodes.containerd.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...e_master-us-test-1a.masters.containerd.example.com_user_data | 2 +- .../aws_launch_template_nodes.containerd.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../containerd/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...template_master-us-test-1a.masters.123.example.com_user_data | 2 +- .../data/aws_launch_template_nodes.123.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../digit/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...master-us-test-1a.masters.existing-iam.example.com_user_data | 2 +- ...master-us-test-1b.masters.existing-iam.example.com_user_data | 2 +- ...master-us-test-1c.masters.existing-iam.example.com_user_data | 2 +- ...aws_launch_template_nodes.existing-iam.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1b_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1c_content | 1 + .../existing_iam/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...e_master-us-test-1a.masters.existingsg.example.com_user_data | 2 +- ...e_master-us-test-1b.masters.existingsg.example.com_user_data | 2 +- ...e_master-us-test-1c.masters.existingsg.example.com_user_data | 2 +- .../aws_launch_template_nodes.existingsg.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1b_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1c_content | 1 + .../existing_sg/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../external_dns/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...e_master-us-test-1a.masters.externallb.example.com_user_data | 2 +- .../aws_launch_template_nodes.externallb.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../externallb/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...er-us-test-1a.masters.externalpolicies.example.com_user_data | 2 +- ...launch_template_nodes.externalpolicies.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ..._template_master-us-test-1a.masters.ha.example.com_user_data | 2 +- ..._template_master-us-test-1b.masters.ha.example.com_user_data | 2 +- ..._template_master-us-test-1c.masters.ha.example.com_user_data | 2 +- .../ha/data/aws_launch_template_nodes.ha.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1b_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1c_content | 1 + .../ha/data/aws_s3_object_nodeupconfig-nodes_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test1-b_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test1-c_content | 1 + .../ha_gce/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test1-a-ha-gce-example-com_metadata_user-data | 2 +- ...late_master-us-test1-b-ha-gce-example-com_metadata_user-data | 2 +- ...late_master-us-test1-c-ha-gce-example-com_metadata_user-data | 2 +- ...nstance_template_nodes-ha-gce-example-com_metadata_user-data | 2 +- ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../irsa/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...mplate_karpenter-nodes-default.minimal.example.com_user_data | 2 +- ...enter-nodes-single-machinetype.minimal.example.com_user_data | 2 +- ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../aws_s3_object_nodeupconfig-karpenter-nodes-default_content | 1 + ...ject_nodeupconfig-karpenter-nodes-single-machinetype_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../karpenter/data/aws_s3_object_nodeupconfig-nodes_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...ate_master-us-test1-a-minimal-example-com_metadata_user-data | 2 +- ...stance_template_nodes-minimal-example-com_metadata_user-data | 2 +- ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../minimal-1.28/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../minimal-1.30/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ..._master-us-test-1a.masters.minimal-aws.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal-aws.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../minimal-aws/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...master-us-test-1a.masters.minimal-etcd.example.com_user_data | 2 +- ...aws_launch_template_nodes.minimal-etcd.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...master-us-test-1a.masters.minimal-ipv6.example.com_user_data | 2 +- ...aws_launch_template_nodes.minimal-ipv6.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...master-us-test-1a.masters.minimal-ipv6.example.com_user_data | 2 +- ...aws_launch_template_nodes.minimal-ipv6.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...eally.really.long.cluster-name.minimal.example.com_user_data | 2 +- ...eally.really.long.cluster-name.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content | 1 + .../minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...master-us-test1-a-minimal-gce-example-com_metadata_user-data | 2 +- ...ce_template_nodes-minimal-gce-example-com_metadata_user-data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...master-us-test1-a-minimal-gce-example-com_metadata_user-data | 2 +- ...ce_template_nodes-minimal-gce-example-com_metadata_user-data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...er-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data | 2 +- ...emplate_nodes-minimal-gce-ilb-example-com_metadata_user-data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...very-very-very-very-long-name-example-com_metadata_user-data | 2 +- ...very-very-very-very-long-name-example-com_metadata_user-data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...very-very-very-long-name-example-com_metadata_startup-script | 2 +- ...very-very-very-long-name-example-com_metadata_startup-script | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...er-us-test1-a-minimal-gce-plb-example-com_metadata_user-data | 2 +- ...emplate_nodes-minimal-gce-plb-example-com_metadata_user-data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...s-test1-a-minimal-gce-private-example-com_metadata_user-data | 2 +- ...ate_nodes-minimal-gce-private-example-com_metadata_user-data | 2 +- ...mplate_master-us-test-1a.masters.minimal.k8s.local_user_data | 2 +- .../data/aws_launch_template_nodes.minimal.k8s.local_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...mplate_master-us-test-1a.masters.minimal.k8s.local_user_data | 2 +- .../data/aws_launch_template_nodes.minimal.k8s.local_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + .../data/aws_s3_object_nodeupconfig-master-fsn1_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes-fsn1_content | 1 + .../minimal_hetzner/data/hcloud_server_master-fsn1_user_data | 2 +- .../minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data | 2 +- ...ster-us-test-1a.masters.mixedinstances.example.com_user_data | 2 +- ...ster-us-test-1b.masters.mixedinstances.example.com_user_data | 2 +- ...ster-us-test-1c.masters.mixedinstances.example.com_user_data | 2 +- ...s_launch_template_nodes.mixedinstances.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1b_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1c_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...ster-us-test-1a.masters.mixedinstances.example.com_user_data | 2 +- ...ster-us-test-1b.masters.mixedinstances.example.com_user_data | 2 +- ...ster-us-test-1c.masters.mixedinstances.example.com_user_data | 2 +- ...s_launch_template_nodes.mixedinstances.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1b_content | 1 + .../data/aws_s3_object_nodeupconfig-master-us-test-1c_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...sters.nthimdsprocessor.longclustername.example.com_user_data | 2 +- ...nodes.nthimdsprocessor.longclustername.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...sters.nthimdsprocessor.longclustername.example.com_user_data | 2 +- ...nodes.nthimdsprocessor.longclustername.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../nvidia/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...r-us-test-1a.masters.private-shared-ip.example.com_user_data | 2 +- ...aunch_template_nodes.private-shared-ip.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...-test-1a.masters.private-shared-subnet.example.com_user_data | 2 +- ...h_template_nodes.private-shared-subnet.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...master-us-test-1a.masters.privatecanal.example.com_user_data | 2 +- ...aws_launch_template_nodes.privatecanal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../privatecanal/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ..._master-us-test-1a.masters.privatedns1.example.com_user_data | 2 +- .../aws_launch_template_nodes.privatedns1.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../privatedns1/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ..._master-us-test-1a.masters.privatedns2.example.com_user_data | 2 +- .../aws_launch_template_nodes.privatedns2.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../privatedns2/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...ster-us-test-1a.masters.privateflannel.example.com_user_data | 2 +- ...s_launch_template_nodes.privateflannel.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...aster-us-test-1a.masters.privatekopeio.example.com_user_data | 2 +- ...ws_launch_template_nodes.privatekopeio.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...master-us-test-1a.masters.sharedsubnet.example.com_user_data | 2 +- ...aws_launch_template_nodes.sharedsubnet.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...te_master-us-test-1a.masters.sharedvpc.example.com_user_data | 2 +- .../aws_launch_template_nodes.sharedvpc.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...master-us-test-1a.masters.minimal-ipv6.example.com_user_data | 2 +- ...aws_launch_template_nodes.minimal-ipv6.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...te_master-us-test-1a.masters.unmanaged.example.com_user_data | 2 +- .../aws_launch_template_nodes.unmanaged.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../unmanaged/data/aws_s3_object_nodeupconfig-nodes_content | 1 + ...late_master-us-test-1a.masters.minimal.example.com_user_data | 2 +- .../aws_launch_template_nodes.minimal.example.com_user_data | 2 +- .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content | 1 + .../vfs-said/data/aws_s3_object_nodeupconfig-nodes_content | 1 + 303 files changed, 303 insertions(+), 151 deletions(-) diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt index cdc617f647eae..dc4a8a279cc02 100644 --- a/pkg/model/tests/data/bootstrapscript_0.txt +++ b/pkg/model/tests/data/bootstrapscript_0.txt @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: ControlPlane -NodeupConfigHash: sq0FwAxnWal2+vIUsu8xUKK8Q+Vzx3V9LKkSFo/ds4M= +NodeupConfigHash: fAxvqbU++fBpT6SIjMMeXWlQ4oHqL/M8N7AaaJkOPOM= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt index ef8c4544cc94e..3ec0fdffba71f 100644 --- a/pkg/model/tests/data/bootstrapscript_1.txt +++ b/pkg/model/tests/data/bootstrapscript_1.txt @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: ControlPlane -NodeupConfigHash: soFi0PS8cYVnHNTGuj1Fv1d8Q71M6D9Mgo/fjlPSkB0= +NodeupConfigHash: N0d3Il7CeGYFi32ZDb4i3iftzUD6swJ3F/tZf8d1bZY= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt index ef8c4544cc94e..3ec0fdffba71f 100644 --- a/pkg/model/tests/data/bootstrapscript_2.txt +++ b/pkg/model/tests/data/bootstrapscript_2.txt @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: ControlPlane -NodeupConfigHash: soFi0PS8cYVnHNTGuj1Fv1d8Q71M6D9Mgo/fjlPSkB0= +NodeupConfigHash: N0d3Il7CeGYFi32ZDb4i3iftzUD6swJ3F/tZf8d1bZY= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt index 50341d1e6bf6d..0bcaa222d2530 100644 --- a/pkg/model/tests/data/bootstrapscript_3.txt +++ b/pkg/model/tests/data/bootstrapscript_3.txt @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Node -NodeupConfigHash: bzOu75vonqETQp0my4RwAbbZvfTkGmwJ0uvaN5JHI5Y= +NodeupConfigHash: X6Di6WM7EcwYaitdtxqgDgb2VjQuX4gHgLLPBZUb6Hw= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt index de3f14c6b1dbb..634fa6529850d 100644 --- a/pkg/model/tests/data/bootstrapscript_4.txt +++ b/pkg/model/tests/data/bootstrapscript_4.txt @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Node -NodeupConfigHash: Pj5zYnkoZ3wGhph8FTN58SH0n4LL85thsUN6YE09xe0= +NodeupConfigHash: FOtsEbu1CrMgt9fSSoK3X+UvdHnVKS4MmNRxjGmd40c= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt index de3f14c6b1dbb..634fa6529850d 100644 --- a/pkg/model/tests/data/bootstrapscript_5.txt +++ b/pkg/model/tests/data/bootstrapscript_5.txt @@ -144,7 +144,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Node -NodeupConfigHash: Pj5zYnkoZ3wGhph8FTN58SH0n4LL85thsUN6YE09xe0= +NodeupConfigHash: FOtsEbu1CrMgt9fSSoK3X+UvdHnVKS4MmNRxjGmd40c= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/nodeupconfig_0.txt b/pkg/model/tests/data/nodeupconfig_0.txt index 821a8593038cc..62453d43f988d 100644 --- a/pkg/model/tests/data/nodeupconfig_0.txt +++ b/pkg/model/tests/data/nodeupconfig_0.txt @@ -20,6 +20,7 @@ Hooks: ExecStart=/usr/bin/systemctl start apply-to-all.service name: apply-to-all.service - null +InstallCNIAssets: true KeypairIDs: {} KubeProxy: cpuLimit: 30m diff --git a/pkg/model/tests/data/nodeupconfig_1.txt b/pkg/model/tests/data/nodeupconfig_1.txt index 58c12a8c50bd8..48350d5a4291f 100644 --- a/pkg/model/tests/data/nodeupconfig_1.txt +++ b/pkg/model/tests/data/nodeupconfig_1.txt @@ -38,6 +38,7 @@ Hooks: - -c - apt-get update image: busybox +InstallCNIAssets: true KeypairIDs: {} KubeProxy: cpuLimit: 30m diff --git a/pkg/model/tests/data/nodeupconfig_2.txt b/pkg/model/tests/data/nodeupconfig_2.txt index 58c12a8c50bd8..48350d5a4291f 100644 --- a/pkg/model/tests/data/nodeupconfig_2.txt +++ b/pkg/model/tests/data/nodeupconfig_2.txt @@ -38,6 +38,7 @@ Hooks: - -c - apt-get update image: busybox +InstallCNIAssets: true KeypairIDs: {} KubeProxy: cpuLimit: 30m diff --git a/pkg/model/tests/data/nodeupconfig_3.txt b/pkg/model/tests/data/nodeupconfig_3.txt index b8ddadb3d8dd0..b66be2a47bdb3 100644 --- a/pkg/model/tests/data/nodeupconfig_3.txt +++ b/pkg/model/tests/data/nodeupconfig_3.txt @@ -9,6 +9,7 @@ Hooks: ExecStart=/usr/bin/systemctl start apply-to-all.service name: apply-to-all.service - null +InstallCNIAssets: true KeypairIDs: {} KubeProxy: cpuLimit: 30m diff --git a/pkg/model/tests/data/nodeupconfig_4.txt b/pkg/model/tests/data/nodeupconfig_4.txt index 813787a159ccc..0825419cde510 100644 --- a/pkg/model/tests/data/nodeupconfig_4.txt +++ b/pkg/model/tests/data/nodeupconfig_4.txt @@ -27,6 +27,7 @@ Hooks: - -c - apt-get update image: busybox +InstallCNIAssets: true KeypairIDs: {} KubeProxy: cpuLimit: 30m diff --git a/pkg/model/tests/data/nodeupconfig_5.txt b/pkg/model/tests/data/nodeupconfig_5.txt index 813787a159ccc..0825419cde510 100644 --- a/pkg/model/tests/data/nodeupconfig_5.txt +++ b/pkg/model/tests/data/nodeupconfig_5.txt @@ -27,6 +27,7 @@ Hooks: - -c - apt-get update image: busybox +InstallCNIAssets: true KeypairIDs: {} KubeProxy: cpuLimit: 30m diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data index 63ea11382e556..7cf0f3ac2d344 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: additionalobjects.example.com ConfigBase: memfs://tests/additionalobjects.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 71EwaKyEXMn6jyRja4jekg+4R8q6vNTwr8cTxtVqeME= +NodeupConfigHash: pxwzAkxYx5nUePbonTlGaPcheFpACKvfkCfcs7IMQcM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data index f14d6ac712aa8..56b325a545847 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.additionalobjects.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: YGAk3OvRYXlR/iugY5/3S/V4IilpYmKOqlyAv5Wdf5E= +NodeupConfigHash: AjW1WevmlRI4l09kE0iektk6rtPGAFVvXUXQkQFX0HQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 44753185fb5c8..025c100ccc9ec 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -270,6 +270,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content index 74818a00f1798..62848b093d75b 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: additionalobjects.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data index b5b9d6165f37e..395694b127767 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: apiserver InstanceGroupRole: APIServer -NodeupConfigHash: EgxBNpdOW1dhGhWYU64WzwNDxKf3cJ7l3IhXUIpg9BM= +NodeupConfigHash: DGxbW0XRm7D5zB9YwjGlYU7alrRcRG85ySGSp39Mk1E= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index db64f5f1047ac..1a13a8f0eccc7 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 6I/xMbU1RuEJGM/q+HqSJhU5a4gk4fZ2NsSLom4F6ME= +NodeupConfigHash: oat4TLWZZOwj65R6CKin5eR7GMvLjjtMZK541q480iE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data index 2f65ad5ded7cb..d546e3e81cd62 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: kh+oYD0OsaXnRNBLafouDao8K238Z+h0NXsAYtQbdvg= +NodeupConfigHash: 2qas7IWBw7bXrVthbyjE5kxmfKcL2NufTUVsZzWlfsY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content index 5c273b45bccac..b7c0026441092 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content @@ -152,6 +152,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 738a007aee137..7551c2ee69e50 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content index 521492bbdb034..1053c7df23376 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 6d38d1fa3d80a..ef16068ce7898 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 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: DN1sgfeoxwF4Qc+5F40PK2PHpduCxMyqef4Hxyn2up4= +NodeupConfigHash: 7eHYq2LK1E2ckFYz8iTZKhMiwyKE9zZ4N9Iijh0av/c= __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 b30b80d637df7..e6a1bb07bcafa 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cc2xTNBWx1xCOd/t3VrF9ED2F3kleatkRokwyNKvzNc= +NodeupConfigHash: 8CZ7yLVzS//HUyyG0tIMtQkPj8eMl/QL1MNtZRcEDDE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 9664131909fcd..b5ef4fade79ab 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content index e6859f217eac0..3b68234cbdae8 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 3da66c74d85a9..c370ab83c05ba 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 @@ ClusterName: bastionuserdata.example.com ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: oawfcBRMzUOUkyGiWrmgKdLvRfQUoKcYpenNwSm2zME= +NodeupConfigHash: cFGsAAqYrwM7b8sg8ARyUvrQ/X1mCS1wq1IuxNHlcbE= __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 42429f4777cac..cf7447afc6b23 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 @@ -162,7 +162,7 @@ ConfigServer: - https://kops-controller.internal.bastionuserdata.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ksGASsz+Zd4bN3mRrF+LFw2mlGOwJ4GHA6dhJ91ePzc= +NodeupConfigHash: GBq6HoXAbWL91+sbYN2UBHutnOTPqZ4YF4eubbNjGsk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content index e947c4f5a5116..0e3ebea7273af 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content @@ -20,6 +20,7 @@ ClusterName: bastionuserdata.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: {} KubeProxy: clusterCIDR: 100.96.0.0/11 diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index cdee67dfcab77..a995929db0241 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content index f5c011c12d8e3..63d1a86a00a35 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: bastionuserdata.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data index e5348fc3d2550..8415546f84862 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: cas-priority-expander-custom.example.com ConfigBase: memfs://clusters.example.com/cas-priority-expander-custom.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: s+rdLO6YzM5pXSZzp0Awd+0u3DxouvE0BNN4jFRJQPA= +NodeupConfigHash: b2xNUpnVA9+OHxycc5ZxoOaYX0WauMvhVCZbOHYhWSg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data index 9e53a1ad120ba..06f4b4a57f77b 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes-high-priority InstanceGroupRole: Node -NodeupConfigHash: C/lz8xS7S7VH2aQEg3hW1XudOlJsrjQZMIVcb+B/dfM= +NodeupConfigHash: 3S0kO0rn8/IeZUrZftL7DVYj+3R6xDMIb4Ntoz8LYwI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data index 354fee81b998b..d6b10fd4c235a 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes-low-priority InstanceGroupRole: Node -NodeupConfigHash: C/lz8xS7S7VH2aQEg3hW1XudOlJsrjQZMIVcb+B/dfM= +NodeupConfigHash: 3S0kO0rn8/IeZUrZftL7DVYj+3R6xDMIb4Ntoz8LYwI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data index c7664ab7215d7..22ebd82a40e9c 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: C/lz8xS7S7VH2aQEg3hW1XudOlJsrjQZMIVcb+B/dfM= +NodeupConfigHash: 3S0kO0rn8/IeZUrZftL7DVYj+3R6xDMIb4Ntoz8LYwI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index fbd71de76b807..87dd13e55b2ec 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content index 8b941b5b51209..27c50911584c1 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-high-priority_content @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander-custom.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content index 8b941b5b51209..27c50911584c1 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes-low-priority_content @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander-custom.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content index 8b941b5b51209..27c50911584c1 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander-custom.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data index 71e67a152d96d..29e14cc396a57 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: cas-priority-expander.example.com ConfigBase: memfs://clusters.example.com/cas-priority-expander.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: JamW6lPVHwg1Um/9IDx4yHpg+8bcXyFe3dO+qyayzoU= +NodeupConfigHash: esCkj8xtANMAq+yucbrXCk+MO2IXoC6224YmTA+HOaA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data index dbd37a27549c4..75d8eb4942a56 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes-high-priority InstanceGroupRole: Node -NodeupConfigHash: cKBwEi35nMWpDHoZlyWq4rtNBRj/ITyuOOe63pBtfuY= +NodeupConfigHash: df729KN5+gvvqaKyGX1Phg5EnmFTHt0M+RCCyN9ON94= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data index 1136f576d84f1..1b658888c49b2 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes-low-priority InstanceGroupRole: Node -NodeupConfigHash: cKBwEi35nMWpDHoZlyWq4rtNBRj/ITyuOOe63pBtfuY= +NodeupConfigHash: df729KN5+gvvqaKyGX1Phg5EnmFTHt0M+RCCyN9ON94= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data index 5379a06b59c17..fc712b0213838 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cKBwEi35nMWpDHoZlyWq4rtNBRj/ITyuOOe63pBtfuY= +NodeupConfigHash: df729KN5+gvvqaKyGX1Phg5EnmFTHt0M+RCCyN9ON94= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index f675cae7b4944..8b7e4ac0f2247 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content index d06a6935ee154..5de6befd84c67 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-high-priority_content @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content index d06a6935ee154..5de6befd84c67 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes-low-priority_content @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content index d06a6935ee154..5de6befd84c67 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: cas-priority-expander.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 aaac5671d7f81..48b23b7daf0f2 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 @@ ClusterName: complex.example.com ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: kzonIXkrzk/VIDrMF+0Es4kTG4zfbMevo2ep+bkxrDk= +NodeupConfigHash: n0QSK4aHtvOvq7sbGpqfU7yvS5qfdr+sn8y6ehRFckQ= __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 5192a69078798..9abdeeef1c2be 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 @@ -162,7 +162,7 @@ ConfigServer: - https://kops-controller.internal.complex.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: l6WgeDFpg9rsRWP7oLfkFDKe8knxK++oV2C8Cx2cYrg= +NodeupConfigHash: QquFvWQTN2ryNMDOYMclovKwenDnHS9AaKJAbm+E17A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 45a569c8c2b38..b08572ff1cee1 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -285,6 +285,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content index 9b437b67d4831..8fe5989edd718 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: complex.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 b04d7dec4b8cd..14dffc6b865d3 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 @@ -133,7 +133,7 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/2zOzUoDMRTF8X2eIvsyDX5gMeBCs7BW0g6lPsA1uaMDSW7MTWb07UVmNeD+/+McE6j5vtA0eixawszChMYVyxEiauko5oLMW/yGmANuHUVhKA3jxxMwahkxDqyVcotahepf/ZK4QnL4XKjlZSXCn+0adxW5dlewjs4UUEtDqRYKfYCE4kgeW16O7IE/tdyZw3u7my5f4ad4r/abU7Ob1/N8uL69t2N/M6vdYC/OPp7eHsQvAAAA//8BAAD//73Y7Sf3AAAA" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/2zOwUrEMBDG8XueInfpxkLXQ8CLQddFLFXwAWbTaV3MZEImcbc+vUhPBe//H9/nAtdxyPx9HjFbDRdRLlQpmHsgtNozpYwiO7wCpYA7z6Qcx+k8P4Cg1YQ0iTXGr2oTmn/1MUqB6PGQuaZ1heDPNlWaglKaFrbROwe02nEsmcMQIKLqecSa1iPPIJ9WC566p5ufrqI7XB8vGY6309fb8tpTPdHc7g0vHy/tfpjvunv1CwAA//8BAAD///gdAzn3AAAA" | 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 a497ff491f1bc..651f97f09762f 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 @@ -133,7 +133,7 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/6yUS4+ySBiF9/4K9uZrERTBpBcFFDcFQW5N7xCLi3KnsNTMj59IT/JlMp3JZNIsWJyTehZvnhypbMaz3Te34oz6LRWTYSaV44BRb8UV2lJJU7U9GoY3dI+rtkRvSVPNpKZOi8xF/Q312xlFSUBCPS7SIokxGrbUHzOKoqhfr0+Eqm5REjx6uqJLwINTOvWmrouniySBY5EBoosg002lBVYnyrzlyjwDfNcEtCq5nerqJ1Z2oCgRH5hidlcuwJ8gYmYFIjA9OcTLqAoepyqgPz9MHDGQaHlimRdIrCdgTTkhBxmQ8JU9f2cTZCouIDKPEVFAJAeOI0Oy7M+hUSbVujyrwXMfWrmpECI7kbFrPvX8lljAgaLoAHmCuAQQFxgisBSdffa0d+Wv/RDyN3JJzfZpHMrQ4bkld1PZyI6ZDmT6Jlg1O5IG9EPPlhPkgucal67sBbnawPZsLz22gv7gGw1ChdASIBCA2JJMCIicRXJwpG3gaAsRODLIoPp1WMCrYOmfIYHigjiKCUwRpDzRnOnBQRQjqFgq+wwuXrIvDSIPxmqxE+Rgs2tyH/wF+eflAQ2ByJ9pNo0Ysgl3bXpghE5nhHU7MtIqiQVQBOqhzdyEnyC4coaO65M7Zr15f1rzgh3gJ12RRbLz7ocrl2mMJEnzh5Y+GPL+/tsbaMnfW/N/rbpVbkwfQBlVH7uftcozme+tehU/ZpWpcMoq/jy3iD767eNxjcU2JJ9STU5pmkfqgczTgTue96PfbRzJqoxqAbvNBAnDw7MwI7nQBfeUlK0855zCoC0Wdm0b+D9o1V6vWg4cL7YMNK7O9fmQhAFmHeFU/6tVgRPc16aPR6AjZI+20KyXd9x6jMspt7TgjZUu3evyS01B3PgyMw55Eig2jlGzF9R05ONotTNE1HXZurmUq6461l5++S9WDdOSDa8p+0XlGLfDdrG4Nu3wK2lq3Ddlifq3osaor+Py7btJ3LICzy9mej3guE6Q2jdj+zWgdXNGw9+LY1OiLWU1ZzR7/cb2a0+1eMi3VLdszfpDu2EtGI1rsGMYZ2/AEWIf3z/ZRZR5AcgbcyQoep/9CQAA//8BAAD//+Revya+BQAA" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/6yUSY+yWBiF9/4K9uYrERTBpBYvo2CBTELhDuEyKPPgVdM/viPVyZdOVzqdTrFgcU7us3jz5AhFPcZmV9/yGHVbIsT9TCjGfkCdEZZoS0R12XSo79/QPSybAr1FdTkT6irJUwd1N9RtZwQhgIC6IU/yKBxQvyX+mBEEQfx6fbykqAYhSLaryqoArjSlU6+rKn++CALYeQpY5SFVdbkBo+VF1nBEloKjowOpCE6rOOqZFi2JF/ARdD69yxc4ThA+NTwedFf0h2VQeo9z6ZGnT30IKAnvssjQLxI2nkDrYoQPImD/lT1/ZxNkKi4Q6HaAZQhEz7JECS+72NeKqFwXseI9P3wj02WMRSvQ9vVJzW6RAZbE8xaIE8TBgB3QeDBklX52pHtlr13vszd8SfTmqR0K32KZJXNT6MAMqRZSdeOt6j1OPPKhpssJchnmOyZZmQt8NcF0TTexG059sPVOkmRMCoAlgNAQdAmwmAaiZ5MmWLsFD5YIqaR8HRZYBZbHWMISv8CWrIPOQ8LinTU9OPB8IMmGQj+9ixt9FBoWe2212HOit9nX2RH+gvzz8kBKwLMxSScBhTf+vkkOFNeqFLduRkpYRSEHuaccmtSJ2AkylFbfMl10H2h33p3XLGd6w5Ms8SLau/fDlUl3lCAI88cueVD4/f23N5Ihfm/N/7XqVjoheYAiKD/3P2uVq1PfW/UqfswqXWbkVXiKG0Tax+bxuIZ84+OTUOFzkmSBcsDzpGfs+GM8thtLMEqtXEjtZoL4/uGZ64GYq5xzjopGnDNWrpEGLbVN4x1/0KoPtWwYsC+mCDumytR5H/neQFvcufpXqzzLu6/14zCCipA5mly9Xt6HxqUcRr4lOautVOFeFV9qcvzmKFJjn0WebA4hqj84JRnZMFjtNR61bbquL8WqLe3KzS7/xap+WrL+NWW/iGwYmn67WFzrpv8V1dXQ1UWBure8GlBXhcXbd5O4pTmWXczUqh/CKkJKV4/N14BWdYz6vxd2XaAtYdQxmr1+Y/O1p7uwz7YEvYxX3GeUbzK9P1HN5qSNLsb27rDmVHflI5E/65QPN30Zvc/+BAAA//8BAAD//xXbKsO+BQAA" | 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_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 144a56e08383d..187f3ba9dbb81 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content index a52ab2cef3674..381bbf51d20ff 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: compress.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index 5525ea8e361dc..5fc68c45255d6 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: gyqrD0ql2Dn9sJ44EAjuLyaXYjgmu+6iy/XtpCMo94M= +NodeupConfigHash: kpe8YTTVpxXn3WbTrJD51Bx9uWmtf8rHAB3mELryCtk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data index 5c8785221a015..4a35938eca74c 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.containerd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: y4NONKeUGtto/KhO48b/V9F6bHEbO1XRC1qVgA7GMac= +NodeupConfigHash: hTzhctgyEwYBENFX+168zIbaUI9aLdGx2FSp+4u75RU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index adb6b70ec4637..a4748649de1f5 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -263,6 +263,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content index 918a879297d57..61e9a1cbc1f76 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content @@ -14,6 +14,7 @@ ClusterName: containerd.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index e829ce0ddaa31..2aa7b014f846f 100644 --- a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 5My1rlCzIGrucn+VvSP5jxsYUDCmB/ukaC2HoMG6eJ4= +NodeupConfigHash: hiw+6M2NNFGZnFHsU4jfB7w+3LQfcvenbBNjv279MpM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data index d086d64d80645..5c910a5cf8e4a 100644 --- a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.containerd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: RuTnX4+NsHJtBNnb9aOi3OMWMtK2XEsJ+Wd9Q4ehvOk= +NodeupConfigHash: xOxs5o6qwTTLWWpkWpw6WIvfClv4JpWeZRvyXjvGSlw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 5b6507be9ae6b..ff9092b8c0e7a 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content index 8bc23c65700d0..c204b6d9a1a16 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: containerd.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 1bab51937b9dd..c3c91eac03349 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 @@ ClusterName: 123.example.com ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: thcOjRK2IL1G6Gjw8Iw8jHfuGGTbJ9nRSwYjdB+Xk4I= +NodeupConfigHash: 95PJjSO3CGrmQ/HQID24bLCCe81QSyzJEhqC6cHtiXk= __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 61af85f81ee84..7e357a1824f7f 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.123.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: w9Zgr4oe9C02aoT1cGSrklFJSt4H7Pnt0u2F9/PiZUs= +NodeupConfigHash: aOX5nAbRyHetP0h7sBDoM6qnL1gQK82EendRvLp/b/w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 75d39200a5167..ad0b281eef04e 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content index aa125c54b2dc3..cabde62cf6534 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: 123.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 205fc8fc67159..ec35ec1b3f82e 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 @@ ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: W9ovJfVCGZ9GMvFgEsiQpzbMkfW6ybOYPaoNdLd4q2A= +NodeupConfigHash: u86xTIyexBtvuyd47DysOCsHJSGhsK4QQ34GRBg9DpA= __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 0bd9d45d7f525..ec9717129d82c 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 @@ ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: tdsiZJegbdlmXMKotRu+Ba6oJUaUVP9hEW/xx+Z8utQ= +NodeupConfigHash: rmNSr60VPHM4QN2vhVv2agHesoCUx4CjE1fHSJr2Lhk= __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 9c8aae1dd948e..4ff28b692ce1d 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 @@ ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: oM/9JKY9eSh8dVnvfp0C8CCZBbUL9r2TIgSkmjQWops= +NodeupConfigHash: sQ+r8F6nuXkvj8T+tlzLT3oGeMV5UwJQixw1kHiwmo8= __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 9d3e186468286..aa5d058521655 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.existing-iam.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: WQBvLSF6oEmDHBa0GJ5HndzOS7Fv3Z/Ecq/nvLUoG3Y= +NodeupConfigHash: iU/r1fYKN7jkZu/xmLM7kZjGynyX1JNGYRHtZOKKhi8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 434e4159ba075..69d4573d1503b 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index d291725e52174..94b94e914c885 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 782cad20cbaa4..e7892cce26628 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content index f5bb1093b9c1a..a43a20c5f9057 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: existing-iam.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 dbe2422749731..d1774fc19f6eb 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 @@ ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: qIm1VCcSOkf4qaeZxPNr/Pr/c50RS/wvQN9MKABI/DA= +NodeupConfigHash: ICdjxZrIVr68jzZXOtTqFSYwQwhDPg3GrXWchsSFctw= __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 f133e1c8b83f9..606455f8d759e 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 @@ ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: PJJAwpXmW6UqMj/UfpQ2GB3DS1L3jUdsxfofonDQbWs= +NodeupConfigHash: idFFl4fjaqAO14k8DnVbhPMTCUpatGJojbRhhspOEVs= __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 c5d923941d51c..3f91d23898309 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 @@ ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: lPH4UL17e+HfwCxiz5y0XK5vJGtxPQV+dO+ZW9i+a+8= +NodeupConfigHash: XgMBw88ZVFMLkKu6oxQenbGzOIMRngJVCvir0tUHhbQ= __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 66c66ae8ceb5b..68cc7909251ca 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.existingsg.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 98nGZn/rPGjbbyzo9s5ssDFen4JIB7dwNNP/ROApjkE= +NodeupConfigHash: K5+mTeoXPRLuy3jHWMKTkOCqNEsF3nonD71OjBR0W44= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 58a5a52757c92..4a7dd0df98465 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index 4abf15ab96ca4..8a32a4b871aa4 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 4cc7a2ba580cb..5cea523342aaf 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content index 7080fb104f962..c420f537c54c8 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: existingsg.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 aaa52356e2ab4..1f0b3cef247e1 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 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: n2Y3f/YFlfmpKAp7rBb2A3KY8xK/XudhQKklSOXHEsU= +NodeupConfigHash: Arj9CPYPT79nVe1Uju7SKarwPhrwxdpEn3bezaNlNUo= __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 b30b80d637df7..e6a1bb07bcafa 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cc2xTNBWx1xCOd/t3VrF9ED2F3kleatkRokwyNKvzNc= +NodeupConfigHash: 8CZ7yLVzS//HUyyG0tIMtQkPj8eMl/QL1MNtZRcEDDE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 990013f0b7634..e45b55f9acc40 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content index e6859f217eac0..3b68234cbdae8 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 6d38d1fa3d80a..ef16068ce7898 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 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: DN1sgfeoxwF4Qc+5F40PK2PHpduCxMyqef4Hxyn2up4= +NodeupConfigHash: 7eHYq2LK1E2ckFYz8iTZKhMiwyKE9zZ4N9Iijh0av/c= __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 b30b80d637df7..e6a1bb07bcafa 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cc2xTNBWx1xCOd/t3VrF9ED2F3kleatkRokwyNKvzNc= +NodeupConfigHash: 8CZ7yLVzS//HUyyG0tIMtQkPj8eMl/QL1MNtZRcEDDE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 9664131909fcd..b5ef4fade79ab 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content index e6859f217eac0..3b68234cbdae8 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 12325ea49ca99..f31aa90038be1 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 @@ ClusterName: externallb.example.com ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: DV/SaZxCMxlLvGol45hn1QQDu1VzH+zkTiNWNQJQdpM= +NodeupConfigHash: sKPCXRg8rW45b5xY/U/wYx32kzi/JiPBozxFb5/osG4= __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 0bb3418344150..730f2b38bbc6d 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.externallb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: yXUjthqkyX46TdMh0JX/xs9AJ7zJa0syYk7Eg6Hkcm8= +NodeupConfigHash: MPu8JszFdqU/JAAKeVVua8kgtZRRXPULCS1vdOo6xfw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 512455c5f6a6c..315167b190f62 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content index 57aba7aa7f864..1a0ccd006307f 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: externallb.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 08279214ec12f..d6eb31e387dfd 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 @@ ClusterName: externalpolicies.example.com ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 12X0l983XxSniqQ6WyXUhE3cDp1dFMP+vgrzyQpQyxw= +NodeupConfigHash: WNeE2nmO7nfvvXbn3ZiIrqytPPsSNY3Zk8A+DSnuCl4= __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 47230d237c33f..9e70752f6ffbb 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.externalpolicies.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: bg6O/LsZp1MqNweDn9QdmmbjDkmnNEQzOwl9N6ZssYo= +NodeupConfigHash: OtfMRLXfdxwQmbtF5Xph6i0U5baqhcZrPzmK/AH38E4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index bede0f99826b0..386bf654e8125 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -270,6 +270,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content index 24a0e0fce31f7..93b3747a03a45 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: externalpolicies.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 22d1f5401c900..390fec9417c40 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 @@ ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: KyUb3dE2J1FdY11kWe5HenFSepq9rluhZ7k8GuhczB8= +NodeupConfigHash: EzSpxxRLzWtK+CbGfDPI4vxzNcHx0PcuB//B7bDqNDE= __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 b4573e88f3ae5..0444dafbdb7cd 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 @@ ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: PyyhXAaGp1RFZqQWfMSj5uqXzcUFms6GWfbiq0P/O04= +NodeupConfigHash: ZTYbGGnIdTitKLmjPFN1lsRwwIf2+PTdTXxQaD4+LRc= __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 0d2b83eb5261f..4c006d76adf78 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 @@ ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: 1f+vj3UKbZn8xtPo9SDrgRkt2GxvaLgGyYoZLrFsxbM= +NodeupConfigHash: HA1a6rZR7IvYHsGnKf0B9/bTwCW/EayNTFIIL53tQwk= __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 43f9c604da645..6cf5f3401e75c 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.ha.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: A+GRrj9q0vIpNk2cqUhoeVKqHH3d9RrwqCglVf3otVo= +NodeupConfigHash: NGrM/RooWL4bH8+59gljwPe9ZqiNUG/RlXjolz8mYR0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index fe99fdb0fd6aa..2e71c9519f323 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index e216ef387e090..691f6bc9ab8ad 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 2001e32efb8a7..78abbea092ab8 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content index 822b1729d664f..6342721e2c700 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: ha.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 9504ff0f5cf7f..4718787ac4368 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -262,6 +262,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content index ae3b2ed0ff409..2ef0f07346e0e 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content @@ -262,6 +262,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content index b8090210c9e70..e05ff6dfb5353 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content @@ -262,6 +262,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content index 87e472c6ae036..aa8046d0fe81b 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: ha-gce.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data index d68cfe20d5560..20494da43664a 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data @@ -129,7 +129,7 @@ ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: U5xgrSUdP6KaJDLNs0XX63HfJylIHGLVz9Shy7mkiT0= +NodeupConfigHash: iaC3YRyrpaqRGZoKq/evZi13FpDe5TE80WMSe0oiLGo= __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_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data index 82262df4ba2d9..e5ca4a618a421 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data @@ -129,7 +129,7 @@ ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b InstanceGroupRole: ControlPlane -NodeupConfigHash: X8QDn4sCMWn9I+WOi9DwK/Hsryyq6N2oKJs3va91QNs= +NodeupConfigHash: Ccz0pGhkAcbcB2swFhBjbP/I9g1iaxXifbYHltSWGBE= __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_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data index dc4753c4323f8..b08f6a7c9b488 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data @@ -129,7 +129,7 @@ ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c InstanceGroupRole: ControlPlane -NodeupConfigHash: IBVJFS8aMdrNckiO2dDrqlX5wRqUpTa+9AkrW6VgxBo= +NodeupConfigHash: ANBxpXGickkt0KsGZvF2GjrCL7klXJcuEz7p/KLkyo0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data index 238d649275492..323ea152d0ff9 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data @@ -152,7 +152,7 @@ ConfigServer: - https://kops-controller.internal.ha-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 4Sb0CR2STaI+KSd/NY7YYKyG6T5v5EPD/GIsn0TQIk0= +NodeupConfigHash: qeQTOKt0hOOaYdUKV4uuU/tWbk77g7CZAyAVrqYwKmY= __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 6d38d1fa3d80a..ef16068ce7898 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 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: DN1sgfeoxwF4Qc+5F40PK2PHpduCxMyqef4Hxyn2up4= +NodeupConfigHash: 7eHYq2LK1E2ckFYz8iTZKhMiwyKE9zZ4N9Iijh0av/c= __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 b30b80d637df7..e6a1bb07bcafa 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cc2xTNBWx1xCOd/t3VrF9ED2F3kleatkRokwyNKvzNc= +NodeupConfigHash: 8CZ7yLVzS//HUyyG0tIMtQkPj8eMl/QL1MNtZRcEDDE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 9664131909fcd..b5ef4fade79ab 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content index e6859f217eac0..3b68234cbdae8 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data index 4277de37651e1..dc7defd1d2a3e 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: karpenter-nodes-default InstanceGroupRole: Node -NodeupConfigHash: LxW09nOtpT6rBGfchn8aUehoDO/kdUqaQowuhhCx7kI= +NodeupConfigHash: ThzoNo9Ktdabk+6L9GWga+JWV54y0W4sgJHyC0S9dQ4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data index 39ee893f0dd77..18ca62e6cfc7a 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: karpenter-nodes-single-machinetype InstanceGroupRole: Node -NodeupConfigHash: ifghyl5MXq2kJJhZDVa+ywfqZR2GaCYmUCympS4qH8M= +NodeupConfigHash: OZyPvkIjT8onFAjEwNUEf2haFcA3ScarJDKAq0bI2o4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 39bad84b1f0c0..fa02d0a3a34e6 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: nTJsFz4jbpbA8O2HOztg8StQSCVivDSBaRPTfnMW6wc= +NodeupConfigHash: 6QxBduIpSUWtdkR6H4KTFTIgcolfbWIOoJXTQSE5Gxw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data index 21c33022c5c26..3dc60216659d2 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: WdFbEA8i8J+sJFJZOrowWurlP6DeYdnKEou4G+Q8QA8= +NodeupConfigHash: DgVcevdZDeKN4KKXD40vZtsZ6ADW2yQcl9DxNKFBefk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content index 9476cf069775c..03101100e6208 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content index 202232cc3d688..107f9dbb13c58 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a8c400de193ff..9117fdb48772c 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content index bca9f7460b6a8..b0a63894bdd4d 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index c6b19fc0e6365..f6af3d3730b22 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,6 +263,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content index 1b3dc3e2185e8..8e74ebe3cec63 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data index 8f12fdd3bd69b..a6656454b56c9 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data @@ -129,7 +129,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: 8jx4WMwH58XcD6pV7Lp1Syoiupfv63LNGLCAfBa5AJg= +NodeupConfigHash: NVq2buFLXmvajoLs0UdorRuSJQXVkNbMK6MqpAP6kso= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data index fa116efcd0288..6581d3a60a89c 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data @@ -152,7 +152,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ey84vaC+N28Bbvrd1bKLbNhOg+ZvYd0ebkVMdC8/ieY= +NodeupConfigHash: sHL0VmYL4D2ViGwzpr3tatLQ8udKJAjOz2ixNuMw7sk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 2f77d3fe20d48..834484933df0c 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: QhC3wjUKHX2ihHQ3MV2OvBSZM09TPVtbgvbmHWTtKis= +NodeupConfigHash: pEPkTd60I1vJQETo3EjSRADH3T8WgBhEYh1Xk4B4PBM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data index 4c2fba83c5a7d..0813a4d05f1df 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cxv7oc1VvusW9NHIZNnO3J5+vgmF8M7tPGnBIgtf4tY= +NodeupConfigHash: 3zDCnF/Zr465wzcKEQpekr6B2/9LITss9ETt11GACtM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index d3c12fa7bcde3..f1d43d0200d9b 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content index 0b9ccbda30587..74d336f35e66d 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index f341e7e8462ea..cbe41693914e1 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: ND9rZU4rgUbnvX5nVHvboYHrqg/yL7Vebks4YKidqhM= +NodeupConfigHash: k/B9mcfXVMF4pUBZTSlZOrkAFcmuWQVoCYf1v2ZIaOs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data index 7f4c7afa966e1..1869a13ab9da9 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: SULi0vBRXvuEVCLCJ0a+gadpCdNYpTD/QBdQQPWlSQY= +NodeupConfigHash: 6042fC55eyeSm2rv5AC0lnxFtEHRCHut6IC6W/f91QQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8aa67ac6486a2..82dfb4c1b4664 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content index 71b5417daee9f..4fd7e81731c8d 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 685ac6062988a..87b255a810032 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: CmIX9JPCR4Xx5WyhfHL0BmyO1XYuiUwT32sBXUbeOzM= +NodeupConfigHash: 2NT//VJ2Ox9q0XpVLRf8DE6VkUEIVLOyWLCUy8dqhbk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data index b9c817f20290b..4c774ea647770 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Njxwi1qmH3wWITGRAfz0K3DxJFkjnoFicnj7vaI2xJE= +NodeupConfigHash: +0N7Cy1RKM28OZ4VZyNDbMBce6HsDIqDLOyZXbjiQes= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index cee83a887e572..ea7c2ec6f2c91 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content index a76fb7b810fc5..dfe12143a0c9e 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index d74cae506057f..6a33652acb639 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: O75BcSePYmzYcK5TFBjdrV47qy+CB8nvvRG60YSTJUQ= +NodeupConfigHash: Ibqd5t4oSQmRlinh1eHxh7mKZ3tAwhbRlitROuEHrT0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_nodes.minimal.example.com_user_data index 287b216180a75..2b585c5f6acb7 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: /tn2SGp3Q5X7SWKk1s/WFhSODjb7uYQQ5C5EWg7vLj4= +NodeupConfigHash: Yh7qBfZdS5xtXORIDv7dRhXHRvvXsj13y4wyjunPlnE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index b5843260aaa3d..f1bff6231e1c7 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-nodes_content index e31473caf4ebe..aadad2820b976 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 75a957feaecf8..6b05f73d69632 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: JJilf++vIl+NjL7cALuxhAAfHxUVFbJjikB3/e8yuQ8= +NodeupConfigHash: R7O8ZXiEVSEK5SLoeeRpfCOBASu5K2/GCvS5QaXvZ+k= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data index f603d955094b8..b7e18102568c1 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: x40ThQHMt8uqlE46Mj3RS3hAR2Dq7pnODwjRxIw1Hbc= +NodeupConfigHash: 4yQUH1+Nn/vGMCZHK3CgGZcOmXHSu1Y3aLWriOazU70= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 4835ee9cc54c0..8f03c5f9df8e8 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content index 90539261e8bcb..6269132e30a55 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.30/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index f3c6b09f516fc..479153fa930cd 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: AG4srQ2rg5dQqyGaBeF2qZtpB8k5c4kTOj8Q6cjDmD8= +NodeupConfigHash: WMe7kzA23/KD+0pO9MKMoDokzxQ8p4bgwvS95MOo7Qg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.30/data/aws_launch_template_nodes.minimal.example.com_user_data index 3f730087d0668..af81e6afa5c3f 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: qqBryZtaH12R+/ule4jszXxqP2xuOwUHWd1fa68Zs3k= +NodeupConfigHash: +Lige1igRZ9fsXMhH69dcLiBRrsVdBeNd02Gc0YLqvY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8e3c502627899..0649f3107ff5c 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_nodeupconfig-nodes_content index da2d08e077a87..934b6f90b3bb3 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_master-us-test-1a.masters.minimal-aws.example.com_user_data b/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_master-us-test-1a.masters.minimal-aws.example.com_user_data index fe8ec376e1a27..4b9ed4cb2fb0b 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_master-us-test-1a.masters.minimal-aws.example.com_user_data +++ b/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_master-us-test-1a.masters.minimal-aws.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal-aws.example.com ConfigBase: memfs://clusters.example.com/minimal-aws.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 3zs3G40jmXG/4OfML6ZLuTJLTmt8YqI/QiWknM0vCxY= +NodeupConfigHash: UefPbjbiXca1aLfAZ1BrhkiiVmHP/vWp3YiYAxejcUg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_nodes.minimal-aws.example.com_user_data b/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_nodes.minimal-aws.example.com_user_data index 273f01fd045b0..e0706492aa438 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_nodes.minimal-aws.example.com_user_data +++ b/tests/integration/update_cluster/minimal-aws/data/aws_launch_template_nodes.minimal-aws.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal-aws.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 6ZYIqwxpogpHmyLD4vJ1lZ6K5BXqyKMVC11nkkTgGmk= +NodeupConfigHash: 4Ri7AqtZ/z9waxTvCFNS/G/Dc/pGuIRpuDB6qc5TG00= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index fac4c77d16e82..73b461e8a9efa 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-nodes_content index f23974405352a..ea2e930ea2fb5 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal-aws.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 6e198ed28a53b..a91e7a02a11e1 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: w/wI+aUO2D5pdf7jaGStLeqilgB0q8fP7s/wokwnyz4= +NodeupConfigHash: GJpv+cbvWJhszaPildTR7YuBPWxO7yhDqye7WgBP3a8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data index 731288d052725..06985908ae5fc 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Wq9tvtR4Cxmj/A/2yJEXUzW3tfsYSXVnfwvgTgogLI8= +NodeupConfigHash: AtWaof337lrN2NoQFvviT2Ss2cYW4gX24G/7XN349E8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index c15be72a9fb85..9b352b6d0f769 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,6 +267,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content index dc26d96dafd45..8d53ffcf52731 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data index 919f4ff47fc4f..d8e57b573ff41 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal-etcd.example.com ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: cqP+SF8QZbLZr/kqBhddjLSuTwSloOp/eLSMM8WOBwY= +NodeupConfigHash: ktsWtBv941aK+pL98v7GFVU89eXwuIdC4metzQEM7As= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data index 0364a203d5e87..e07df817c9335 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal-etcd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: bINK99YNkY3Ws1qtcbKdD9W5g50G4CHQ7MRxPFFLMdE= +NodeupConfigHash: yMctYTFg9SjCY6xHLGHPkCX5r1vNCy6ISaVleabk53A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index ab8e32534d79c..e59f7c7bd0e5c 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content index c1050ac0b5359..f7c680acce8ce 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal-etcd.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 aaa52356e2ab4..1f0b3cef247e1 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 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: n2Y3f/YFlfmpKAp7rBb2A3KY8xK/XudhQKklSOXHEsU= +NodeupConfigHash: Arj9CPYPT79nVe1Uju7SKarwPhrwxdpEn3bezaNlNUo= __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 b30b80d637df7..e6a1bb07bcafa 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cc2xTNBWx1xCOd/t3VrF9ED2F3kleatkRokwyNKvzNc= +NodeupConfigHash: 8CZ7yLVzS//HUyyG0tIMtQkPj8eMl/QL1MNtZRcEDDE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 990013f0b7634..e45b55f9acc40 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content index e6859f217eac0..3b68234cbdae8 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 99e182fd5dfa0..c5d869cf4ce07 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 6O8RJWBdNs8TBzoULBvG2jjjcLo+W1VN95gK25LIBNM= +NodeupConfigHash: ova1xYqaZS5E5uQNAiCIBVHcoMGGf+DBLF5/WdCmsrM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 131c80d9ddc84..c9dc716360e98 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cXxPI1I7s3Tgf2nJznIK0WV75QAJ0k6tqnNppZ9dRic= +NodeupConfigHash: Suh4p0bTQdigoYjO1dUnjDxRE8QVjilE46kAJsS1hw8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a087709dcf893..f14cae1b257ec 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -270,6 +270,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content index 78cc993346338..d21db8daffb73 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal-ipv6.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 99e182fd5dfa0..c5d869cf4ce07 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 6O8RJWBdNs8TBzoULBvG2jjjcLo+W1VN95gK25LIBNM= +NodeupConfigHash: ova1xYqaZS5E5uQNAiCIBVHcoMGGf+DBLF5/WdCmsrM= __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 131c80d9ddc84..c9dc716360e98 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cXxPI1I7s3Tgf2nJznIK0WV75QAJ0k6tqnNppZ9dRic= +NodeupConfigHash: Suh4p0bTQdigoYjO1dUnjDxRE8QVjilE46kAJsS1hw8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a087709dcf893..f14cae1b257ec 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -270,6 +270,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content index 78cc993346338..d21db8daffb73 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal-ipv6.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data index 11e74838c861d..b63b6a1198d06 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com ConfigBase: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: soPqyq7cluqhf8AmPbSajmpo14J8SspOfsx+h8YLQl0= +NodeupConfigHash: qcSUmBJo/LvEHNX5vheCF49ka0v8T6bXchwApwa0DQ0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data index 98a15cfb44727..e0568165b0b62 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: l1CXvtEV1DIq105XhcYFLLWKJldax5q09HR8GLM/Q1M= +NodeupConfigHash: mZGNNPBrUT1otbC/jFcujflBbrr68qsaGQjG9+4GuqQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 1239629289e07..8e4d932005ded 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content index 4e75ece09382b..afcffe7b52de8 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 78a4f0c13d7ee..e78491b817b06 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -262,6 +262,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content index bc4bc5c435a89..0380424aaaa99 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal-gce.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data index b04fb5be2dcec..91e451f105564 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data @@ -129,7 +129,7 @@ ClusterName: minimal-gce.example.com ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: wmwOefk48SeECMc8EIGfa8Akt5U0aI0/qzo9vqFEqpk= +NodeupConfigHash: O9tu/2iDdoASFC6EdHiW9OKceGx8gSFxvTjY7vsCCvU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data index e24155d44ede6..7a3996bd548d1 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data @@ -152,7 +152,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: eQe+OamXMvDFbQEbWFFXoFT0LWiJO/UmXm2bZ0SZaYI= +NodeupConfigHash: emPV8sG3SHlriMIH1NlrMPlYehZK5TolODtla26tqiQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 1258a6151e556..ccab43209de1b 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -262,6 +262,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content index f684265c0ade6..f77c26cc8fec4 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal-gce.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data index 0abb03001a918..0fee7ceadc7a1 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data @@ -129,7 +129,7 @@ ClusterName: minimal-gce.example.com ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: xJnS5Vmwe6Rz0I8DZMiWn6O1K85RFSiDghI1u7l93eY= +NodeupConfigHash: g3lbZ2msG5Qi/tRbnnSJIxvRRE+OhMNTnAKs7j+WYcw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data index d0e528c5a243b..75578c2b139d3 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data @@ -152,7 +152,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 7Bjljrq8PJxpoY90J5TzCwcANXNLUEtFKPrRVhOv+NY= +NodeupConfigHash: 1LDWa09+EGR84CsX3FydIqktkubxAnR04RQ78kKN2GU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 28ddcea1f90e8..66c3431f7a642 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,6 +263,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content index 496e71e8464bf..b3d9912a19d6c 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal-gce-ilb.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data index 947b219e5ba7a..bc971edc32b78 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data @@ -129,7 +129,7 @@ ClusterName: minimal-gce-ilb.example.com ConfigBase: memfs://tests/minimal-gce-ilb.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: VX3Uwn2q59WhnhSlWFQk9HXl4rgvwFM9kzj+bYEMlcM= +NodeupConfigHash: ERHgdvtfxh08HlZRThisFOedfB22qTVYoSvCMWvq2XM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data index 46eca48a6d949..72964cca8efc9 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data @@ -152,7 +152,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce-ilb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: H8/mcDjW7xaMSRig0U9cU8c3n2Jscv7w9Y9+atoSggQ= +NodeupConfigHash: jaPx50wdtO/EC22RG/03R8UBFG7PqWBU9HYSnpUuvxI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 7faa3e02a8032..bccb690d5e5a6 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,6 +263,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content index f33c0007fa6b0..981b0427371da 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data index 42b57f0346183..3357958a0b27e 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data @@ -129,7 +129,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: EojkB2C69bd4W2CM3pzxoVoZeqPBm4BXXCK4PHCk7d4= +NodeupConfigHash: ntCCGf3auTvGV21zZtxErvZvsmLkPR/pk72hnWrTEt8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data index 0bc788793d3ae..531ed1e7f969e 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data @@ -152,7 +152,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: BnYYap13l2VWfvSd+Hi7kXWtcWvbYMaXtVeASCsoswU= +NodeupConfigHash: RSxWbov23GXcHlonmVB7hQJIBHA/NQ7AF+8uXL2dDHE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index dac7afcfde3d7..1fab5f0bdf24e 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -262,6 +262,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content index f33c0007fa6b0..981b0427371da 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index 922e4b0714753..829e4a57276b8 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -129,7 +129,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: 8FUOm05czQWaGy5KjsX/vVAmHilLqbnc/GVzjFblmzo= +NodeupConfigHash: 8dGDbo1++ryciF3GssUscURJAcitPNJMTAqnXWTFwkw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index 0bc788793d3ae..531ed1e7f969e 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -152,7 +152,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: BnYYap13l2VWfvSd+Hi7kXWtcWvbYMaXtVeASCsoswU= +NodeupConfigHash: RSxWbov23GXcHlonmVB7hQJIBHA/NQ7AF+8uXL2dDHE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 153d867f4a0ec..f1a2924ed84a1 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -263,6 +263,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content index 8c4c1f25fd51d..1198682d93506 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal-gce-plb.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data index 81d188b8a3d28..094d3a07f5bbc 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data @@ -129,7 +129,7 @@ ClusterName: minimal-gce-plb.example.com ConfigBase: memfs://tests/minimal-gce-plb.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: x7NaK+Jmx0p/X6oJB802qnfNF7rHy1dkP/2ke6I4UQE= +NodeupConfigHash: cMvFpky7SE6GqYpstTl1EMO4nqxjXsVkbHkwaHxQOok= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data index bd83e3c6fe5c0..bdb090eed6fe8 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data @@ -152,7 +152,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce-plb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: chFa4B59xaLUClnShgZPk7QI6Uwtqsv946WLyaznO/o= +NodeupConfigHash: n46+NMNgKnsSWAzTAwZ4FmqGUsbq3LrE60DdxHex7uU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 8dce8e72f8b50..b25c75bf2f6b9 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -262,6 +262,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content index 6415cd0338ebf..9d2769637e90d 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal-gce-private.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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_user-data b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data index c786d92855c4e..68df162bc96dc 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data @@ -129,7 +129,7 @@ ClusterName: minimal-gce-private.example.com ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: XZvXGPdUm0xs+cYv7A/8gD9XBgPGMozrbbYs0feyQd0= +NodeupConfigHash: 25JqlKAyvQpNHMyAdgrkJGYzL54PDRF+W7ofoCy2UEQ= __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_user-data b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data index 1be0e82c933c9..46eaeee0cd823 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data @@ -152,7 +152,7 @@ ConfigServer: - https://kops-controller.internal.minimal-gce-private.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: eo9HsnjM4RneDhDFX6kMFbuz+Ej7k2FPTTrzuhdJI1Q= +NodeupConfigHash: jdtCRQpZcUE7NAr+awSy4plnkvNEbJsGAXcu1gs+R60= __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 34bd6d1f94617..50e8b5eb97a23 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 @@ ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: /Xt+iSm4V4Rhjy1seTOPFif8v+eniOjoxbzFSVvScsg= +NodeupConfigHash: TI5eMxNyhKrfisxHTrT5oYfsMM+J1iX2X2eW9XyvkMQ= __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 a4a5bb6fd006c..cf9e33d752e86 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 @@ ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: kFjtceblKdmkHkUwJlAcHMBlwM3TqgmSP4f7C4wRY74= +NodeupConfigHash: ZTRdjUy+OLqcnvm10a8bguUGVvt8Fp8D/29mSoUyJqw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2330d6fa44650..4780b3266add8 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content index 9ff2b4bd193b3..1a0bae6e7a4dd 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content @@ -45,6 +45,7 @@ ClusterName: minimal.k8s.local Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 0aeb0dbaba8cb..504a66182e955 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: ntRYT9+7pump59DJamJCT2h1l96jeH5nTAirCfPIjE4= +NodeupConfigHash: slfpGg/g0a7ExmKM9pyK7wB5ZtlvwdzXOHMWBk6Unsw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data index a4a5bb6fd006c..cf9e33d752e86 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: kFjtceblKdmkHkUwJlAcHMBlwM3TqgmSP4f7C4wRY74= +NodeupConfigHash: ZTRdjUy+OLqcnvm10a8bguUGVvt8Fp8D/29mSoUyJqw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 647bc12e265a4..498770271b60b 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content index 9ff2b4bd193b3..1a0bae6e7a4dd 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -45,6 +45,7 @@ ClusterName: minimal.k8s.local Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content index 82e0c197b1f96..089cac039d70c 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content @@ -257,6 +257,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content index 1a0344f2eb08c..3f72596da3cb7 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data index 28f0992efc811..a2109608d9fda 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data +++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-fsn1 InstanceGroupRole: ControlPlane -NodeupConfigHash: IgCkQoWTAtEvL1ENoaa4T1Az971jJSdmLk+GlQtF/T0= +NodeupConfigHash: NniKBUB1ksKZGJzTZbW+SNwU0G5L/tUFFWM4rYtyfZU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data index b0dee3fc54fee..a216d553fa1c7 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data +++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data @@ -152,7 +152,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes-fsn1 InstanceGroupRole: Node -NodeupConfigHash: mxJpmAW6F6agQ49sSUKtMClnC7P4fL5nmA2O61oDaLo= +NodeupConfigHash: jn9Uny1kv6x28Z1EVFTV46RQzoBqAB0JCFiYRktMYRo= __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 c0b01bd4e0bd4..4c73c9710391c 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 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: qmT/w1SacMYF+luJ0Kg00e54pZTQnuA7FtdB5t6t+Yk= +NodeupConfigHash: gcWAvv1QiO+KxfCeXPae8Z/DOM5bwCg/p2Nuy/9ckzY= __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 5de5e2dd1867f..e2f12dd383e8b 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 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: O6YUw+yIuefGzdIergQnq4ECKoLxgCSoUF1qr7v6stg= +NodeupConfigHash: huIKr3Syeo4VAdMAj1pzKo6pMeUcEX2uHa8FbxEGvC8= __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 ce48354f7597e..30c819f74cb53 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 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: 6yrVoS+G5T9S68unlRwbcHxM/UOVFgRLkLnY0Ys8oO4= +NodeupConfigHash: rtsEQx/eHf9m0/25wraf0IMpqvOmAMCdaJ9lEySMkec= __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 8ed0b08bf378d..8f59e793ed397 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.mixedinstances.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: s+mShA6pC5+nm3QDOTmGMV2WO5n9QtJm9sDdc1tmSwQ= +NodeupConfigHash: vR9tnPGXM/YLtMOlHeM7mjuYi4aIzmBsFG6KIDf8rFA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index ade6fcd9730eb..c49e198057152 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index 1e72caedb5339..b26e4b087c87b 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 9b582a875f431..b23601bbc8073 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content index 2f14cce1f55ec..06be8df778909 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: mixedinstances.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 c0b01bd4e0bd4..4c73c9710391c 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 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: qmT/w1SacMYF+luJ0Kg00e54pZTQnuA7FtdB5t6t+Yk= +NodeupConfigHash: gcWAvv1QiO+KxfCeXPae8Z/DOM5bwCg/p2Nuy/9ckzY= __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 5de5e2dd1867f..e2f12dd383e8b 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 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: O6YUw+yIuefGzdIergQnq4ECKoLxgCSoUF1qr7v6stg= +NodeupConfigHash: huIKr3Syeo4VAdMAj1pzKo6pMeUcEX2uHa8FbxEGvC8= __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 ce48354f7597e..30c819f74cb53 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 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: 6yrVoS+G5T9S68unlRwbcHxM/UOVFgRLkLnY0Ys8oO4= +NodeupConfigHash: rtsEQx/eHf9m0/25wraf0IMpqvOmAMCdaJ9lEySMkec= __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 8ed0b08bf378d..8f59e793ed397 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.mixedinstances.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: s+mShA6pC5+nm3QDOTmGMV2WO5n9QtJm9sDdc1tmSwQ= +NodeupConfigHash: vR9tnPGXM/YLtMOlHeM7mjuYi4aIzmBsFG6KIDf8rFA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index ade6fcd9730eb..c49e198057152 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index 1e72caedb5339..b26e4b087c87b 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 9b582a875f431..b23601bbc8073 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content index 2f14cce1f55ec..06be8df778909 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: mixedinstances.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index 3bf039daa201a..33802f7b47a15 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: WCdrUHXTDm89r4NlBGbtUKgh77gSdCa5uVErC/d3hfQ= +NodeupConfigHash: W2lV8NHzvl+MZwINWEvjBhPHQ8eg1B0nqEeIRW6xDGA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data index eab7380ceac77..4c69c2739192d 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: MVfto3WVa4YWYnL1+t1TymEKtii8pv5hwZ/VK5y4HmA= +NodeupConfigHash: WXrB501m8YYXdXQLgK4bFtMY7qVmedWOcBOWOufewr4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 48e3624a10a4c..5695641a43635 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content index ea9076ff408a7..08c1576e6bd46 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index e76a8a2f47012..262e631733f58 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: SKOK3Eoeme//4rrCjWJ52XdYwLSAGmfraDy9bwXEmmk= +NodeupConfigHash: oneXzbKQoSNTcp48EoJyoAK2SAqXvqeO0D7pSdFW2ys= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data index eab7380ceac77..4c69c2739192d 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: MVfto3WVa4YWYnL1+t1TymEKtii8pv5hwZ/VK5y4HmA= +NodeupConfigHash: WXrB501m8YYXdXQLgK4bFtMY7qVmedWOcBOWOufewr4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index add0ac1ce0684..56e6995c64f1f 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content index ea9076ff408a7..08c1576e6bd46 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 8df7e29b18425..6aa8bb5e2a3e2 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 @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: ezD/RvXstQsW1pxM8URm/1W9n51ao8OUNDvVpod7f3I= +NodeupConfigHash: Us/bFG13BDJh1nGH/SBdjJgBhb9qMXj9EaWYHDeRqTM= __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 ffadd407aba95..da6926dbb5542 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: UwNX+rFTajl4rV8Xkv8Nb+ofuzU7JPKqQN/4NmeJXnE= +NodeupConfigHash: wZ1I0kZFJcuJYwy6TkNsVTa9P3qhW/UsJjjGejrba0w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index ea11fb080bd79..9af8cf2aafb4e 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content index e25cf50023ac4..d153dd3bfd831 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 0382afac7a241..4f2fe753c0a4b 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 @@ ClusterName: private-shared-ip.example.com ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: MNtG0Mzf8B0Z/whjApzP6fcMPfe2idP/aLLS9Uc13CY= +NodeupConfigHash: PTOyfcL4CyyaQhsPp8abT6ZryyDJ2LrSEn4JnaFLjIE= __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 eb468f73c8d56..034847f43df23 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.private-shared-ip.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ME5UcNiXD8ErkT6mB3NFGsPC8gXez07Dfre5Eju7RYI= +NodeupConfigHash: q9bVDtcfKe/XJHZEdokHUpmfefie9CVCI0CtMVHziM4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index ca96fbd81626c..7202f8af95c05 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content index cc2e0478d8b34..5d0c4121a44be 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: private-shared-ip.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 2dd77a086b90d..d33dd15059c93 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 @@ ClusterName: private-shared-subnet.example.com ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: yyf2JcNRUVLugGYsxGejzRaj/0JSbrUudSxkvltYKYI= +NodeupConfigHash: BXCD57hoEt99Pw7lV4+jHKn/7Kgr4l63uTJLTL3D5ck= __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 71886d2aaab8e..7dda92972700d 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.private-shared-subnet.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Wu+CG9we5NrbdA3ACSXmdD9NCAAOL+P5ietzmVLDIOo= +NodeupConfigHash: IRFhB94UHzhXOwVNuL3GgI3ww+N0Cc7yqFnVLrCTA64= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a9e4ed6b6aa7c..78feea9db04e5 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content index 43b6f922603a4..05d72f86dc5df 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: private-shared-subnet.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 e6b52720590ee..3a93d1b82ae9d 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: privatecanal.example.com ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: ZQC1nwAWMZto84L4Lt6rCSiuyfwMR8v24xvYSF+zUMI= +NodeupConfigHash: Tzt+LJNVum4rolb+f9MYOC2te4Nk8Li4n1tG0E8yThU= __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 51637b1f160c5..b8f3ee5f3b1a8 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.privatecanal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: /QKl5/WowAiXBcN53A+96zSgSdvi7TUH/abdK6895zc= +NodeupConfigHash: SUBDaWUSj6cy/++lg4oXVkohdU9EAmH8PMjhwe9GFZI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 9637751e332d1..871e4dff57eff 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content index 39729c95d8cc8..e7b31289515d2 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: privatecanal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 c746dcf635915..01bf184c99675 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 @@ ClusterName: privatedns1.example.com ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: bXVjiLthU3dxB7Q5sP/vaLnXh3CwBkGw6IifOgqjXv8= +NodeupConfigHash: DvzNFle9myzln0bcmwkZ6iDrkQIvDUJOEFYmbgMx4sA= __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 0d52c47333ce6..39ce97752b729 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.privatedns1.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 06mNl+2X0IbK7dGY3CGpk982fKpPgjg9jdBAkHmla1o= +NodeupConfigHash: 6oFibbZvlwnKUu0YGD8+d1eAKtgbC0Z7FW7pLvQ9pEo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a82078f5532ed..21a31ff4e246e 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -267,6 +267,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content index ced14baf776b5..27bb0d8782adf 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: privatedns1.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 17f4980b54b89..39899169ec51b 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 @@ ClusterName: privatedns2.example.com ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: fXXIiLkFRHA8HNGRxtRAz+m6E23Iswds65/oOr4PMRw= +NodeupConfigHash: ugcZCytvVGwU/qlDja4S935pP2wFpAD7EuEq1Pd7VLs= __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 a2c7594189a89..2807cc960c3e3 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.privatedns2.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: nTqryRdzFASRT/uq1UWa8GH98rwWwltwwvJfYMnJBbA= +NodeupConfigHash: qV8GSQcmXX1Ts13q1IlJW1i3/TYBzSL47CeQ/T2/ypk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index dd3248da3513d..204f896db8ee9 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content index 30926a2926cd7..e6294a7aeda70 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: privatedns2.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 303e30fc63575..60f50587cac20 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 @@ ClusterName: privateflannel.example.com ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: EkqNXZ7ShVPIGcAgAMRCqIY2vfbvk+3ip71RyGaVSb4= +NodeupConfigHash: ho6rEzIIk4sdKLxtW8FlR3pP2LuvlAeaGwNUlFWqcYc= __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 bbda253b0be9d..f839ec1077416 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.privateflannel.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: RzV3EuUP5b2ezmmLyoJAF2IT8bUbqNkr9clE5rMlCJo= +NodeupConfigHash: yPM+1DZtG568OGiywi4TJ4rMmQPClrdGQaPnawSzNBQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 3b5d2effd6c69..e87382d3b4b6c 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content index 79d54d885922a..6278239688484 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: privateflannel.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 6f8c981f8f2b2..51f2107735037 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 @@ ClusterName: privatekopeio.example.com ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: HTBWxIhbxo/k1RkGj8aIODb+AFxS1jgbj0MaQg10GNg= +NodeupConfigHash: 2Zib712nqQzsgrq6EakAWULkD6927ShyRMYWm480gkY= __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 1a331c2e5a920..d3f7dda3b4507 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.privatekopeio.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: iUIniFaew8do2H24xgUVcPcY+czt8/Nvp4IRSCSskMc= +NodeupConfigHash: Gxk3MwyCvSdma4NZKTetNcirTamAo+gCCSRfg6B2EGU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 745d8c33db0cc..e535aaaace842 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content index 9b568122a43fe..5d68953d30ebf 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: privatekopeio.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 4b8a2c2fcacbf..7c5d74eaf899b 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: SBkPEeGA0nkifaIRnU8kjfSvwedwEQTdsQ8QNxmKJkU= +NodeupConfigHash: lA5IIBBWTUuULhwY0+hQoYzzwO/j+oqDx7e/H3SiRG8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data index 7c625e65e5bf8..ede2afad0f92a 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: +5Ufz/tvN+byAuBfpa4WkFSJqkvnISgIKLiU4zd1PmU= +NodeupConfigHash: BnE9HqDNwZvLPaU79wlgQiuC8Ldvw9Uj8lYtg6sKFjI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 4be9eaba30438..fefd34121b36d 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content index b13c541e158ef..80cb2b27b135c 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content @@ -22,6 +22,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 7f6af4580b4d4..17f97bb66d307 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 @@ ClusterName: sharedsubnet.example.com ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 48XfUCHo6+TXaL2mYfC55bEEiF29Y3NDqhD9gumLp6Q= +NodeupConfigHash: T1Xxh9Yn+KIjSZlnh7NnF4Fiepi76IF+Z9IiuIbfW6k= __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 e8411d213667a..9c2f70e3b8cb1 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.sharedsubnet.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: dgrWq33iyqhHd/7VSQbWyzwsDuyn8Z+IQkW7PAvtHAc= +NodeupConfigHash: r9Py9m0JcWzZGwSQsGI/A62heJNwC9LdtjxaYIXffHM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 76071547609aa..6c0a393d297ea 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content index 571aaa79e7661..a536b80e34154 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: sharedsubnet.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 c71fa81966397..edb3c44a9481a 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 @@ ClusterName: sharedvpc.example.com ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: K6abEa1yyR7DYFUtfPGYoh9wy/wh0XGO3lhU6WfaVVo= +NodeupConfigHash: 3YCh3ulkOfZaSM42BZbdgTUMzKLqjP+aDAza4H/lEE0= __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 1d860e6239704..3599bdfb8c80a 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.sharedvpc.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: jSwKmDnrzDpj3sh/2KzGsZiCJvSFG7IhC3mSY4eunzg= +NodeupConfigHash: JVILxDaCMA/JQxC9oUwfLlFIMy5f4WLUR7MERdx6UXk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2e451041d4ab7..dfdc6d12b671e 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content index 6ea0b0b2bc57b..f03dd7d3b301c 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: sharedvpc.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 99e182fd5dfa0..c5d869cf4ce07 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -130,7 +130,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 6O8RJWBdNs8TBzoULBvG2jjjcLo+W1VN95gK25LIBNM= +NodeupConfigHash: ova1xYqaZS5E5uQNAiCIBVHcoMGGf+DBLF5/WdCmsrM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 131c80d9ddc84..c9dc716360e98 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cXxPI1I7s3Tgf2nJznIK0WV75QAJ0k6tqnNppZ9dRic= +NodeupConfigHash: Suh4p0bTQdigoYjO1dUnjDxRE8QVjilE46kAJsS1hw8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a087709dcf893..f14cae1b257ec 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -270,6 +270,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content index 78cc993346338..d21db8daffb73 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal-ipv6.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 1a52cd19f05dc..d0a8dd46a621f 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 @@ ClusterName: unmanaged.example.com ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: kC2l1X9wpeFZdDPP3stUlTWPOIr9VpFFXH/1GZXH/6A= +NodeupConfigHash: vB751VwdGSEBu+XxAz1BYvCDODKU5uxOtZzrO5GwEEs= __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 a25ceb85dcfc8..2de4fec4300ce 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.unmanaged.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Y0HkA0prFwdR/k9Y5GmQ5q6NHvzZa3lv2YZVSSjTUJw= +NodeupConfigHash: 3d72M+QofcXI3iMTzGRwvc9nhdMSOqd0IORgF4p0L1U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index fb960b7561097..998790ce210cd 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -268,6 +268,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content index 44c874afd402a..fa1352dfe5812 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: unmanaged.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: 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 6d38d1fa3d80a..ef16068ce7898 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 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: DN1sgfeoxwF4Qc+5F40PK2PHpduCxMyqef4Hxyn2up4= +NodeupConfigHash: 7eHYq2LK1E2ckFYz8iTZKhMiwyKE9zZ4N9Iijh0av/c= __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 b30b80d637df7..e6a1bb07bcafa 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 @@ -153,7 +153,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cc2xTNBWx1xCOd/t3VrF9ED2F3kleatkRokwyNKvzNc= +NodeupConfigHash: 8CZ7yLVzS//HUyyG0tIMtQkPj8eMl/QL1MNtZRcEDDE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 9664131909fcd..b5ef4fade79ab 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -269,6 +269,7 @@ FileAssets: Hooks: - null - null +InstallCNIAssets: true KeypairIDs: apiserver-aggregator-ca: "6980187172486667078076483355" etcd-clients-ca: "6979622252718071085282986282" diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content index e6859f217eac0..3b68234cbdae8 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,7 @@ ClusterName: minimal.example.com Hooks: - null - null +InstallCNIAssets: true KeypairIDs: kubernetes-ca: "6982820025135291416230495506" KubeProxy: