From 062f665dd5cd287db8aa682b54a49df7fd202b42 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Tue, 23 May 2023 12:52:56 +0300
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                         | 2 ++
 pkg/model/tests/data/nodeupconfig_1.txt                         | 2 ++
 pkg/model/tests/data/nodeupconfig_2.txt                         | 2 ++
 pkg/model/tests/data/nodeupconfig_3.txt                         | 2 ++
 pkg/model/tests/data/nodeupconfig_4.txt                         | 2 ++
 pkg/model/tests/data/nodeupconfig_5.txt                         | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ..._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           | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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             | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes-high-priority_content | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes-low-priority_content  | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...-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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes-high-priority_content | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes-low-priority_content  | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../complex/data/aws_s3_object_nodeupconfig-nodes_content       | 2 ++
 ...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   | 2 ++
 .../compress/data/aws_s3_object_nodeupconfig-nodes_content      | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../containerd/data/aws_s3_object_nodeupconfig-nodes_content    | 2 ++
 ...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   | 2 ++
 .../digit/data/aws_s3_object_nodeupconfig-nodes_content         | 2 ++
 ...plate_master-us-test-1a.masters.docker.example.com_user_data | 2 +-
 .../data/aws_launch_template_nodes.docker.example.com_user_data | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content   | 2 ++
 .../docker-custom/data/aws_s3_object_nodeupconfig-nodes_content | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1b_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1c_content   | 2 ++
 .../existing_iam/data/aws_s3_object_nodeupconfig-nodes_content  | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1b_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1c_content   | 2 ++
 .../existing_sg/data/aws_s3_object_nodeupconfig-nodes_content   | 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   | 2 ++
 .../external_dns/data/aws_s3_object_nodeupconfig-nodes_content  | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../externallb/data/aws_s3_object_nodeupconfig-nodes_content    | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ..._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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1b_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1c_content   | 2 ++
 .../ha/data/aws_s3_object_nodeupconfig-nodes_content            | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test1-b_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test1-c_content   | 2 ++
 .../ha_gce/data/aws_s3_object_nodeupconfig-nodes_content        | 2 ++
 ...master-us-test1-a-ha-gce-example-com_metadata_startup-script | 2 +-
 ...master-us-test1-b-ha-gce-example-com_metadata_startup-script | 2 +-
 ...master-us-test1-c-ha-gce-example-com_metadata_startup-script | 2 +-
 ...ce_template_nodes-ha-gce-example-com_metadata_startup-script | 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   | 2 ++
 .../irsa/data/aws_s3_object_nodeupconfig-nodes_content          | 2 ++
 ...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  | 2 ++
 ...ject_nodeupconfig-karpenter-nodes-single-machinetype_content | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content   | 2 ++
 .../karpenter/data/aws_s3_object_nodeupconfig-nodes_content     | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...aster-us-test1-a-minimal-example-com_metadata_startup-script | 2 +-
 ...e_template_nodes-minimal-example-com_metadata_startup-script | 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   | 2 ++
 .../many-addons/data/aws_s3_object_nodeupconfig-nodes_content   | 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   | 2 ++
 .../minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content  | 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   | 2 ++
 .../minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content  | 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   | 2 ++
 .../minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content  | 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   | 2 ++
 .../minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content  | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content  | 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   | 2 ++
 .../minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content   | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content  | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...er-us-test-1a.masters.minimal-warmpool.example.com_user_data | 2 +-
 ...launch_template_nodes.minimal-warmpool.example.com_user_data | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 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   | 2 ++
 .../minimal/data/aws_s3_object_nodeupconfig-nodes_content       | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content   | 2 ++
 .../minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content   | 2 ++
 ...r-us-test1-a-minimal-gce-example-com_metadata_startup-script | 2 +-
 ...mplate_nodes-minimal-gce-example-com_metadata_startup-script | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...r-us-test1-a-minimal-gce-example-com_metadata_startup-script | 2 +-
 ...mplate_nodes-minimal-gce-example-com_metadata_startup-script | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...-test1-a-minimal-gce-ilb-example-com_metadata_startup-script | 2 +-
 ...te_nodes-minimal-gce-ilb-example-com_metadata_startup-script | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...-test1-a-minimal-gce-plb-example-com_metadata_startup-script | 2 +-
 ...te_nodes-minimal-gce-plb-example-com_metadata_startup-script | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test1-a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...t1-a-minimal-gce-private-example-com_metadata_startup-script | 2 +-
 ...odes-minimal-gce-private-example-com_metadata_startup-script | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-fsn1_content         | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes-fsn1_content          | 2 ++
 .../minimal_hetzner/data/hcloud_server_master-fsn1_user_data    | 2 +-
 .../minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data     | 2 +-
 .../aws_s3_object_nodeupconfig-control-plane-fr-par-1_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content      | 2 ++
 .../scaleway_instance_server_control-plane-fr-par-1_user_data   | 2 +-
 .../data/scaleway_instance_server_nodes-fr-par-1_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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1b_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1c_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1b_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-master-us-test-1c_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 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   | 2 ++
 .../nvidia/data/aws_s3_object_nodeupconfig-nodes_content        | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...-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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...aster-us-test-1a.masters.privatecalico.example.com_user_data | 2 +-
 ...ws_launch_template_nodes.privatecalico.example.com_user_data | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content   | 2 ++
 .../privatecalico/data/aws_s3_object_nodeupconfig-nodes_content | 2 ++
 ...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   | 2 ++
 .../privatecanal/data/aws_s3_object_nodeupconfig-nodes_content  | 2 ++
 ...aster-us-test-1a.masters.privatecilium.example.com_user_data | 2 +-
 ...ws_launch_template_nodes.privatecilium.example.com_user_data | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...aster-us-test-1a.masters.privatecilium.example.com_user_data | 2 +-
 ...ws_launch_template_nodes.privatecilium.example.com_user_data | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content   | 2 ++
 .../privatecilium/data/aws_s3_object_nodeupconfig-nodes_content | 2 ++
 ...aster-us-test-1a.masters.privatecilium.example.com_user_data | 2 +-
 ...ws_launch_template_nodes.privatecilium.example.com_user_data | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...-test-1a.masters.privateciliumadvanced.example.com_user_data | 2 +-
 ...h_template_nodes.privateciliumadvanced.example.com_user_data | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ..._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   | 2 ++
 .../privatedns1/data/aws_s3_object_nodeupconfig-nodes_content   | 2 ++
 ..._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   | 2 ++
 .../privatedns2/data/aws_s3_object_nodeupconfig-nodes_content   | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content | 2 ++
 ...master-us-test-1a.masters.privateweave.example.com_user_data | 2 +-
 ...aws_launch_template_nodes.privateweave.example.com_user_data | 2 +-
 .../data/aws_s3_object_nodeupconfig-master-us-test-1a_content   | 2 ++
 .../privateweave/data/aws_s3_object_nodeupconfig-nodes_content  | 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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content | 2 ++
 ...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   | 2 ++
 .../shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content    | 2 ++
 ...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   | 2 ++
 .../data/aws_s3_object_nodeupconfig-nodes_content               | 2 ++
 ...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   | 2 ++
 .../unmanaged/data/aws_s3_object_nodeupconfig-nodes_content     | 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   | 2 ++
 .../vfs-said/data/aws_s3_object_nodeupconfig-nodes_content      | 2 ++
 367 files changed, 551 insertions(+), 183 deletions(-)

diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt
index 3c10f37df2..dd34e061ed 100644
--- a/pkg/model/tests/data/bootstrapscript_0.txt
+++ b/pkg/model/tests/data/bootstrapscript_0.txt
@@ -164,7 +164,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: zDIAdRBBL4WyGNK48mNbIHPiF880KpHglcDi2W/lRCI=
+NodeupConfigHash: GCb0jNcXtzAVnSqH0rScr4llsImDfK0RqOqboVMhYa8=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt
index b3430e0433..4bf4ee5774 100644
--- a/pkg/model/tests/data/bootstrapscript_1.txt
+++ b/pkg/model/tests/data/bootstrapscript_1.txt
@@ -164,7 +164,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: XoIztC5fJ949k8NxIxJyJV2dh4xNLxTrd03SHuBvgiY=
+NodeupConfigHash: ZNmdyE6YmlQsLd6NT8zrQ+0/sS2A72fpwA0C5LRsPLw=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt
index b3430e0433..4bf4ee5774 100644
--- a/pkg/model/tests/data/bootstrapscript_2.txt
+++ b/pkg/model/tests/data/bootstrapscript_2.txt
@@ -164,7 +164,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: XoIztC5fJ949k8NxIxJyJV2dh4xNLxTrd03SHuBvgiY=
+NodeupConfigHash: ZNmdyE6YmlQsLd6NT8zrQ+0/sS2A72fpwA0C5LRsPLw=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt
index f5d58ed33b..6d8de67de7 100644
--- a/pkg/model/tests/data/bootstrapscript_3.txt
+++ b/pkg/model/tests/data/bootstrapscript_3.txt
@@ -149,7 +149,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Node
-NodeupConfigHash: WVr6vm2PJQ4pFyR2PHU7dNAkWkMkBpf0kzTHCaRV48o=
+NodeupConfigHash: SFm5o2UoW/PpcVhYaqBqAFkEPji4gdDDFA39AG2cbRY=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt
index 46cb2a0399..3c33e6b2ac 100644
--- a/pkg/model/tests/data/bootstrapscript_4.txt
+++ b/pkg/model/tests/data/bootstrapscript_4.txt
@@ -149,7 +149,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Node
-NodeupConfigHash: LAOYJWomRdJiAU062yYSNbDL2wFgoVzuHlch+qn+On4=
+NodeupConfigHash: cTeq76tVHjuRHdKj2s4F3JT3J+bTd3rm9gsEhapL3DQ=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt
index 46cb2a0399..3c33e6b2ac 100644
--- a/pkg/model/tests/data/bootstrapscript_5.txt
+++ b/pkg/model/tests/data/bootstrapscript_5.txt
@@ -149,7 +149,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Node
-NodeupConfigHash: LAOYJWomRdJiAU062yYSNbDL2wFgoVzuHlch+qn+On4=
+NodeupConfigHash: cTeq76tVHjuRHdKj2s4F3JT3J+bTd3rm9gsEhapL3DQ=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/nodeupconfig_0.txt b/pkg/model/tests/data/nodeupconfig_0.txt
index ba6503cf4f..6730f13099 100644
--- a/pkg/model/tests/data/nodeupconfig_0.txt
+++ b/pkg/model/tests/data/nodeupconfig_0.txt
@@ -36,3 +36,5 @@ containerdConfig:
   logLevel: info
 docker:
   logLevel: INFO
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/pkg/model/tests/data/nodeupconfig_1.txt b/pkg/model/tests/data/nodeupconfig_1.txt
index 69ddec332e..f3156f640c 100644
--- a/pkg/model/tests/data/nodeupconfig_1.txt
+++ b/pkg/model/tests/data/nodeupconfig_1.txt
@@ -54,3 +54,5 @@ containerdConfig:
   logLevel: info
 docker:
   logLevel: INFO
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/pkg/model/tests/data/nodeupconfig_2.txt b/pkg/model/tests/data/nodeupconfig_2.txt
index 69ddec332e..f3156f640c 100644
--- a/pkg/model/tests/data/nodeupconfig_2.txt
+++ b/pkg/model/tests/data/nodeupconfig_2.txt
@@ -54,3 +54,5 @@ containerdConfig:
   logLevel: info
 docker:
   logLevel: INFO
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/pkg/model/tests/data/nodeupconfig_3.txt b/pkg/model/tests/data/nodeupconfig_3.txt
index 42f0dd01a1..b5bf8ec119 100644
--- a/pkg/model/tests/data/nodeupconfig_3.txt
+++ b/pkg/model/tests/data/nodeupconfig_3.txt
@@ -28,3 +28,5 @@ containerdConfig:
   logLevel: info
 docker:
   logLevel: INFO
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/pkg/model/tests/data/nodeupconfig_4.txt b/pkg/model/tests/data/nodeupconfig_4.txt
index 942b73fab3..06ad71a3e9 100644
--- a/pkg/model/tests/data/nodeupconfig_4.txt
+++ b/pkg/model/tests/data/nodeupconfig_4.txt
@@ -46,3 +46,5 @@ containerdConfig:
   logLevel: info
 docker:
   logLevel: INFO
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/pkg/model/tests/data/nodeupconfig_5.txt b/pkg/model/tests/data/nodeupconfig_5.txt
index 942b73fab3..06ad71a3e9 100644
--- a/pkg/model/tests/data/nodeupconfig_5.txt
+++ b/pkg/model/tests/data/nodeupconfig_5.txt
@@ -46,3 +46,5 @@ containerdConfig:
   logLevel: info
 docker:
   logLevel: INFO
+usesLegacyGossip: false
+usesNoneDNS: false
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 8a7af7b263..038f5b52ed 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
@@ -265,7 +265,7 @@ ClusterName: additionalobjects.example.com
 ConfigBase: memfs://tests/additionalobjects.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: VnmwugvFHdBspn4PuJ5gYCcJ4FUJb5jsPN6aKqm9RPs=
+NodeupConfigHash: zotQWT9xs686IPfxJYs/z/y+2Et8IBcjslZT/wvQSng=
 
 __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 4554771acd..e7cf6e98d1 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
@@ -178,7 +178,7 @@ ConfigServer:
   - https://kops-controller.internal.additionalobjects.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: W0oDi32W/pYn+sPs6orN2sCpEuGFRWy24kreEd9/++0=
+NodeupConfigHash: v9XWiXRBTWNSITcwuFA3CWPrGsrb7hdsJx+zxTNq0HU=
 
 __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 16c567f333..2ed0547a4a 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
@@ -300,3 +300,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 bd67bb264a..7d34253a10 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
@@ -63,3 +63,5 @@ containerdConfig:
   version: 1.6.20
 docker:
   skipInstall: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 c85d51fc55..1c3f22c6cd 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
@@ -155,7 +155,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: apiserver
 InstanceGroupRole: APIServer
-NodeupConfigHash: Ko61FchlLmyobJGtW/i+o4Ivwr6KtUBNZdUpLg6JvIA=
+NodeupConfigHash: VsBHuGU/pUfFhONF8ZOTtFBi+26/tvIyWv4ZlHjRo2k=
 
 __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 77c8511777..c03b374b37 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
@@ -260,7 +260,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Zvv5E41GEV0Uq5tomhsHgk/Aeua35k9wlJ5bjBUBdpM=
+NodeupConfigHash: KFhUMLKahQjxUyJaRBofM2m9Nr8Jp7VaGYpRkwYQFRo=
 
 __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 234d1da545..c90d7ec74c 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
@@ -178,7 +178,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: re6Oa0UKcKlJ44f2ApWpF+i2+P/N8Ul5Lr4h24CSkjU=
+NodeupConfigHash: qGuasZzBC1UvhGSHUsWuP1KS3yQFc7UEI+bBaQoy4yU=
 
 __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 788ab54170..8b4ad62cb8 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
@@ -193,3 +193,5 @@ docker:
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 e318564ecd..3e72f77b47 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
@@ -294,3 +294,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 9bf587bf40..ccfaa71cee 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
@@ -58,3 +58,5 @@ containerdConfig:
   version: 1.4.13
 docker:
   skipInstall: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 7edfdcaef2..ce52ec1e72 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
@@ -258,7 +258,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 97K+ZmY992npJi04OEEF00Qd6KMNz/bTUCypZC/92TM=
+NodeupConfigHash: tIg8fDDEAvlXPcOasXAk2oBDV0H1yLxuAJDTY2id2yw=
 
 __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 50013c2188..b3856b118f 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: QyB/m9nIsoOKrYyaEDWHSa1lQsS8uTqrbVhF/7cbw9c=
+NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y=
 
 __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 c57f806ea8..a79911d2f4 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 014c3abb76..4eced620fc 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 dae6249f94..5516968bed 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
@@ -258,7 +258,7 @@ ClusterName: bastionuserdata.example.com
 ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: W+Nu01jj4vbCUeopMNOHhfYLeXemOik+AIZ9f/wfsc8=
+NodeupConfigHash: RxDJ1J2oXmj4Px8npngc2eI642Qjbe/MqS5kg+snEAY=
 
 __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 cf9c1cafbc..364b3919fc 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
@@ -186,7 +186,7 @@ ConfigServer:
   - https://kops-controller.internal.bastionuserdata.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: KJzDoUF53KlcaH3chLxyUj5ZepO2EZXlBy/ZxKyVJM4=
+NodeupConfigHash: EvHrG5qj5v/Fve1Vojh+7F6sw/e/d7tP4GpjQXIoVJU=
 
 __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 c4c222be2d..e6c1bc6847 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
@@ -60,3 +60,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 ce2f63dc33..60d8c638cd 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 d55c0a7a35..b497bfc746 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 1752fac6ff..06a8a53fd2 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
@@ -256,7 +256,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: RTXkw0/CeorFdKoQ9e47Gbw1BKd3liwxIOvrzOJ2mFY=
+NodeupConfigHash: ZqM+RK7+bJrAova+ZGrfIqkNo7DhDmF79XFKUVRiHy8=
 
 __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 76562672d6..133a4289ed 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
@@ -176,7 +176,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
 InstanceGroupName: nodes-high-priority
 InstanceGroupRole: Node
-NodeupConfigHash: ElkF7DY9oWmxvnk0mepjE+yYSeM0k3sclO6GrP/Ouvw=
+NodeupConfigHash: RGK+8XQTlx3C7inK+OP+r0Pj1HXVUvlEjj2rr+Ju07I=
 
 __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 698f1c5fc2..412afb0fd2 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
@@ -176,7 +176,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
 InstanceGroupName: nodes-low-priority
 InstanceGroupRole: Node
-NodeupConfigHash: ElkF7DY9oWmxvnk0mepjE+yYSeM0k3sclO6GrP/Ouvw=
+NodeupConfigHash: RGK+8XQTlx3C7inK+OP+r0Pj1HXVUvlEjj2rr+Ju07I=
 
 __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 02601d1dde..421862caea 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
@@ -176,7 +176,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: ElkF7DY9oWmxvnk0mepjE+yYSeM0k3sclO6GrP/Ouvw=
+NodeupConfigHash: RGK+8XQTlx3C7inK+OP+r0Pj1HXVUvlEjj2rr+Ju07I=
 
 __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 d7a66034b3..d1b8419b1b 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
@@ -294,3 +294,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 81c5729312..1d34faa520 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
@@ -60,3 +60,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 81c5729312..1d34faa520 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
@@ -60,3 +60,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 81c5729312..1d34faa520 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
@@ -60,3 +60,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 8ad3c3cb52..a3dfdd6b6d 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
@@ -256,7 +256,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: NqLG5g0q62VKnqxInvvkUFzabSH+JSnA7c4TLIUExa4=
+NodeupConfigHash: h5ZXlKpszyiWAiramWrBzuREmJiv/1MwWAJWLJnKyHA=
 
 __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 79bbcf83a9..710da38550 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
@@ -176,7 +176,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander.example.com:3988/
 InstanceGroupName: nodes-high-priority
 InstanceGroupRole: Node
-NodeupConfigHash: bUv62NGrfDhzWuWtg3xCaCOb0fHW/t+sMTsPCp3aR1A=
+NodeupConfigHash: 2NWUGb81jBvP3zHBOF6B6ylq2xil8VzhrmcEBgJEK4c=
 
 __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 c886359fad..8ad6c07f20 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
@@ -176,7 +176,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander.example.com:3988/
 InstanceGroupName: nodes-low-priority
 InstanceGroupRole: Node
-NodeupConfigHash: bUv62NGrfDhzWuWtg3xCaCOb0fHW/t+sMTsPCp3aR1A=
+NodeupConfigHash: 2NWUGb81jBvP3zHBOF6B6ylq2xil8VzhrmcEBgJEK4c=
 
 __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 e2c38643e0..ce137841a8 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
@@ -176,7 +176,7 @@ ConfigServer:
   - https://kops-controller.internal.cas-priority-expander.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: bUv62NGrfDhzWuWtg3xCaCOb0fHW/t+sMTsPCp3aR1A=
+NodeupConfigHash: 2NWUGb81jBvP3zHBOF6B6ylq2xil8VzhrmcEBgJEK4c=
 
 __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 78e5842d4d..5482e7084e 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
@@ -294,3 +294,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 eeaadce6b0..97a7b033fb 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
@@ -60,3 +60,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 eeaadce6b0..97a7b033fb 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
@@ -60,3 +60,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 eeaadce6b0..97a7b033fb 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
@@ -60,3 +60,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 9c761b8513..a72731cf14 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
@@ -273,7 +273,7 @@ ClusterName: complex.example.com
 ConfigBase: memfs://clusters.example.com/complex.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 0+qAO+9mQ4d+7/32f9ll7fizSuRreRaXsPXvEXs62aw=
+NodeupConfigHash: Krl22z/c80fddvh9gVkVx36gO3jTExB26QVmbNHkxkc=
 
 __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 4162c3446c..b137558de1 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
@@ -186,7 +186,7 @@ ConfigServer:
   - https://kops-controller.internal.complex.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: lpf8k/2gUbhktdlvLtDVrTRNNo2rMXYIUchKgZr9Kyg=
+NodeupConfigHash: kcoLcg19T43P/TI08qaHgVCi7NzT9PN8Yvq8lHoScNw=
 
 __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 1370c9f219..864a1ccf4a 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
@@ -303,3 +303,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 0890996212..ac7334aa32 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
@@ -63,3 +63,5 @@ docker:
 packages:
 - nfs-common
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 67fa5688af..ae6905d43c 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 @@ ensure-install-dir
 
 echo "H4sIAAAAAAAA/+xWXW/bNhe+968g+qJ3tWQ3afpW6I1qZ4mW2PXkZNmuApo8lrlQpHZIKvF+/UBSsp00GTYMK3pRFGjM88Xz8ZyHYlI7PtFqLapsQEhNFa1gaTXSCiaSGgMmIxYdDEAx3DZWaNWZE+WkHIBlfCKdsYDGR4AWlA2/+mgYD4SsKLtzTQkWlA8zpVuTkQ+jTguq7Q2HRNEaMnJ6NZnezvJ5fnZa3k7z4vLX20/55OJ6sbwtT69O51fF53nnQkhLpQMfjwdRC2iEVhk5St4l70NpQn1zad25FeSLYgnYxoSolPp+gaIVEirgXe8JoUqrba2dyZ3dZGRNpQniRuSOC1AMQs+HxEdEBRZMYlqWcFhTJ200jddMtFM2I2Mvc3ajUfxBfeEzzSEjubynW5P7NAaErITiOecIxmRklIR/A0ICahaoW8EBMwIPFlBR6cev6EpCzmthfJ0L6SqhutTmtAbTUAaXYg1syyQE8aWohS2pqgDD2WcpGOSM+USDaBqrOMTlofxKS8BQwxKYVjwqZ85SK1S1S+YGVhut74LyZyoFf1k91xxKMBYF82GDrASjHTL4yWlLfamW8djRrr6NtY3J0nT89n3o1Dg7Ho3Gjy0/t4AoeD+tNK7L/551fTsgZA3UOoQzaqFbqsmymIkqlpvfLDPyykPkVdAV6goBYtPzm+W1QqiEX80DK1HTCjISNbhN7v5vEqFTj5shbYSJUGzHyduTMGuvkGAXCGtAhB4OV9umL6JQcfzFIhzPtbF+UcLh9OFAJ3V1CS3IjPjSEH53YOwGKAcMgAMeIBKj0qpCqKjV+NT29MEiPQ8/fVbioXf5ZVhCrS0Mg8Xwqd8ZatdEv6cOQfXU/tr41Gt43sVrB4QYYA5hodFm5Pj4KEgO8VsY43z/+wnTRiSia1jCdN34ZibwQOtGghd8EeHHm4vldVn8gxCpbkAJnrbj9Lf7O7OP2BF1sQjrlpHxaJScHHvEpeOQelywT5TdgeJZAO5RIKmJVha1lICzPXt6smLUgt+WSTEtzZ6urKVsMwX/f+l3kgkJy61iC0CheUbG9cj8JZGwmKoPG/P8cBLzHO+V80DHLzSRhVfKIUz8HaV2foN2xPl194rtujfsH5/9gskIagmBamIyB7JdTx9vjzPwmCgnCNy/YFT2Y/BXL9kGuJNxXl+3aLO7+t/V2hFQ9vIryCq/vlMUnrmI2RoLNd/JS61tRtK/g7bpfHmwFOPRgUaH74f+mHjg79+7KaxcVQlVnVPFpeeKvhBo4wtyTpFnpIZa4zahLRXS+30cj0Yz8UZpDmvzSPy6Fwr/1/yAAB/fvX4T+v2FaS99ZPufzNvPIi7WgvoJpC3FVIpV2g0p3Rt8gdhG80KtkXoqoUIBFs+Dp6HOQHaUnESfGVViDcZ2F4Jl6f4bJ607rSeTBrUFZi+8TnafBvtJ9NV0G+Gbt9OZjbNc36szpAx6ijoKDPWMaoLCCkblQnPj4WIGNfWRL74D9TtQv22g/gkAAP//AQAA///KG9Hm7w0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml
 
-echo "H4sIAAAAAAAA/2zOwUrEMBDG8XueInfpll1WwYAHNwYV1nUVLXgc0qkWM5mQSVofX6Sngvf/j++zgWt/zjyNPWajYRZlQ5WC+QSERnumlFFkgz9AKeDGMynLcRg/DyBoNCENYtrWL2oVtv/qxygFosf7zDUtKwR/tqnSFJTSbGEdvXJAoy3HkjmcA0RUJ+6xpuXIA8iX0e5Srju62l7snlNILn/s8N0P03H/4sbDXP3Uvc1P++Odu/2+Ub8AAAD//wEAAP//eLB3OvcAAAA=" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/2zOwUrEMBDG8XueIvelW6peDHhwg+wWskupB8HbkE5rJcmETKLt24v0VNj7/8f3aUdl6BL9zAMmJeGXhXaFM6YbeFTSko8JmY+4gI8Oj5a80BTGeToBo5Ie/ciqru2mdmF9V7eBMwSL50Qlbise/m1VuMrIuWpgH/XkUElNISdynYOA4kYDlrgduQB/KWmW59NHa2OeWV+M/VzNw3XK703zdNArmEN//n7r3fUxta8v4g8AAP//AQAA//8oNJ5B9wAAAA==" | 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 76e1203641..19f75d0820 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 @@ ensure-install-dir
 
 echo "H4sIAAAAAAAA/2yST2/bMAzF7/4URIHeCttZt2IQeikSrA22DMGyYWfGohWishhQkrd8+0Fu3D9YT4b4e8R70nPnJdulhJ6dqQAGDOhol0TR0dJjjBQNJM1UPeY9eUpFhUHCaZAc73I6GOjRR6oAOqeSjyvlkdRAPMVEg32e/xBJBppyLp5blZFtEdLfRBrQTyTHRLr6vjOwaNv65mPd1ov2FZEBOZj5WHvppkUKuPe0on12joN7wGA96RwdgEbuEkt4QLUGBhpETzWOyL7s3S7adsNXQSz18c34ch5y+cYvSnT76fKKB3T/S+fpG20F0BOmrHSPiWJ5PoDlbr1hp1gi3f3eGbgoOS8mtg4/lWjrs+PCfgUlx+Wyr1Sli24qbYulgWZEbTzvm3NJzYugAvDivtFI3sCHCuAodh16xaWEhBxI1yW2gScbPdWPn2PN0hwxRzLX9c3TzgYD9xTT2ZBSN5looESxGc40FrFKoi59LcyvqMfs00sT82123YFsnh7vmcVDTlb+hHvFjrakLNbAdRvfR0vlxB36rdhYfpdY/QMAAP//AQAA//+ifSCJzQIAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml
 
-echo "H4sIAAAAAAAA/6yUSY+qWBiG9/4K9uaWiIpgchffYVaZZCpqh3hAkHnwqOkf3ymqk5tO33Q6nWLB4n1znsWXJ69Q1OPF6up7dsHdjopIPxOKsR9wZ0Ql3lFxXTYd7vs3/IjKpsBvcV3OhLpKstTB3R13uxlFCSDgbsiSLI4G3O+oP2YURVE/Pj8kKZpBCdLJ1WRNAFea0qnXNQ2dc0GAU5YC0RCkmi43YLRI5AxH5BjwHB1oRXBaxdHOK9GWkEA80FH6kHPwJghKDR+B7orBsAxL/3kuffrjXR9CRiLqNTb0XCLGC1a6GBNTBBJ8Zq9f2QSZihxC/RQSGULRt21RIsvuEuyLuNwUF8V/HQPjqsuEiHa4P9Qf2vUeG2BLCNkgThCHAHFgj8CQtdWro90bd+v6gLuTPNGb194sAptjl+xdWYVWxLSQalt/XR9I4tNPLV1OkHyYq2yythbkZoHlWm5yanjtydWqJMmEFoBIAJEh6BIQMQ1F/0RbYKsLBLYIqaR8HRY4BZbeRSISWhBb1kFHkHBEtacHJkKhJBvK6uXnbnws9kTs9+vFgRf97aG+evAX5J+XB1oCxF3oVRIyZBscmsRk+FZj+E0zMsI6jnjIfMVsUifmJshQ2n3LdvFjWLnz7rzheMsfXnRJFvHBfZg3NlUZQRDmTzV5MuTnz1/eSIb4e2v+r1X30oloE4qwfD98r1Wuzvzeqs/i26zSZVZeRx+XBtMnr3k+bxFqAvIhVOScJNdQMck86dnT5Th67dYWjHJfLqR2O0GCwHxleihmGu+c46IR56yd7WljJbVN43vfaNVRKxsWTrklgspWV23ex4E/rGz+XP2rVb7tPza6N4ygYWyNFl9vlo+hcRmHle9Jxu3XmvCoii81ebT1RGbsr7EvW0OE6yOvJCMXhevDHuG2TTd1Xqzb8lS51/y/WNVPS9Z/TtkP6joMTb9bLG510/+I62ro6qLA3VtWDbirouLtd5O4W/Ect5hpVT9EVYyVrh6brwGt6gvu/16c6gLvKKO+4Nnnb2y+9lSN+uuOwrDRRu/wxOPjrBah+d6HCF75PH1aiuO9W6AekZlvg/sAP2d/AgAA//8BAAD//8lyqpi+BQAA" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/6yUS4+qSBzF934K9ua2CIpgchcFFFgoyEu49A6heCiP4qGlZj78pOlJbibTmUwmzYLFOanf4p9fjlK1t9Tu23uZ4n7LxHSYKdVtGHFvxTXeMklbkx4Pwxt+xDWp8FvS1jOlbbIy93B/x/12xjAKUHA/llmZxCMetswfM4ZhmB8fnwx1ZDEKdH2kIQX4cEqn3kRIPl8UBbhlDiiSQY5MjQCrk1XR8lSRAyfPBKyueJ3uoTOvOlBW6AmYcv7QLuA0QeTcCmRg+mo4LqM6eJ7rgH3/ZY4RB+muSCzzAqn1ArypJvSoAhp+ZK/f2QSZiguITDeiGojUwHFUSJd9GhpVUq+rVA9eh9AqTI1S1YmMffuOintiAQfKsgPUCeJRQD1gyMDSEP/qWf8qXvshFO/0kpnkZRyr0BGFpXDX+ciOuQ7kaBOs2j3NAvaJ8uUEuYzznZCt7AW92sD2bT9ziYSeYruDUKOsAigEILYUEwKq5pEauKwNnN1CBo4Kcqh/HhaIOlieUkihvKCOZgJTBplId8704CjLEdQsnX8FFz85VAZVB2O12EtqsNm3xQn8Bfnn5QELgSymLJ9FHN2Ee5IdOalDnLQmN05ZJbEEykA/ktxLxAky1s7QCX3yGHl/3p/XomQH44ut6SLZ+4/jVch3nKIo8+cue3L058/f3kBL/dqa/2vVvfZi9giqqP61/16rfJP72qqP4tusMjVBW8XvKcGseyLP5zWWSUjflYaes6yI9COdZ4Pgpofbqds4ilUb9QJ2mwkShsdXaUZqiSTvnFREnQtOabAWDztCgtM3WnVANRGAe7FVsBOaAs2HJAxG3pHOzb9aFTjBY22exhtAGNs3W2rXy8dIfM4TtHtWisYKKY+m+lRTkjcnlbsNRRJo9hjj9iDp2U2Mo9XekHHX5ev2Uq262m384vJfrBqmJRs+puwHU4wjGbaLxbUlw4+kbca+rSrcv5XNiPsmrt6+msQtL4niYoaaYYybBOt9eyOfA9q0KR7+XrhthbeM1aZ49vG7kc893cVDsWUO0SZJEuVKLGTA5xwdloVe67sMm1d+8FbqxtVIj7k4ldDP2Z8AAAD//wEAAP//otWHQL4FAAA=" | 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 b218477437..f1f814e70d 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 877cb451f8..2bc9245cbf 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 44f86ed5f8..dd6d21521f 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
@@ -258,7 +258,7 @@ ClusterName: containerd.example.com
 ConfigBase: memfs://clusters.example.com/containerd.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: NovwpYRhYY6jjZoIYnNWc6qjQa4xFSP2UM4q1kjMN6U=
+NodeupConfigHash: QIs3DsGk11J5GCJj/S5iKEngoRq+nrdZYHMk8sU4gXA=
 
 __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 adc8980e8e..36c861f268 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.containerd.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: UlFYJOevZZOP730Rchfss0dWZsmWrPHvYaj9n46dtAQ=
+NodeupConfigHash: IOZZwq0vQmyD5xXlgQxIQK+wU3/0+tZVjwQoWioY+ac=
 
 __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 efd6a970be..30da48bdff 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
@@ -303,3 +303,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 a8affd41a2..4efbffef3c 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
@@ -69,3 +69,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 f9b0923031..077f63a68c 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
@@ -258,7 +258,7 @@ ClusterName: containerd.example.com
 ConfigBase: memfs://clusters.example.com/containerd.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: E3mIYfkqJ3RIXmjmWlnVMnghZ8BM+u/fUadox0KkLKI=
+NodeupConfigHash: WYbYhRDOiO97liwzYUdX/7JoIxKFP8v7OsosF/w4qAg=
 
 __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 41c94ea475..3911ec48e0 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.containerd.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: pxuRpcAx6jTlccsZAvWbOMkYTX42GP9GXGFiQW03ND8=
+NodeupConfigHash: prr4YPhRRH5SdPi89IKxEK1XiThRWr1lm26ocUiIPfk=
 
 __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 0a18bef215..7c9d0ba6ec 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 4586dc2627..9549a7bf4c 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 80257c1f55..43c508d2d4 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
@@ -258,7 +258,7 @@ ClusterName: 123.example.com
 ConfigBase: memfs://clusters.example.com/123.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Rqg6DYZnNw7lq/hHhU7ZF5KFeLsrdwx8CdzoBpgasbA=
+NodeupConfigHash: DRoCIAxpxQIUwxN0eT9QnTUkZDuCYe7IFR36p5GEnwk=
 
 __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 426331d26b..848adacca3 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.123.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: F3oDojUjkGDaTwHP2IFm9dQ/CGkfHJ+Gr0p+1qi27TU=
+NodeupConfigHash: bpteDDaR4ZeYRWFIw/oOSSQO0WbuqmV15JkwElpcOLw=
 
 __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 c4fafc04ca..a1c6126003 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 a92e17c9e7..a476bad7d9 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data
index 9655341292..b6031d8c0d 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data
+++ b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data
@@ -261,7 +261,7 @@ ClusterName: docker.example.com
 ConfigBase: memfs://clusters.example.com/docker.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Pq+0KeWpxqXu+qReNHCYeRDB9OByK8iR3bXB3QY7qpw=
+NodeupConfigHash: j/HryyCqU8VeX4EAPmUjvNJD4e8X+qDnhRkeL0Hx2Sw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data
index 5e1c325691..a127743410 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data
+++ b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data
@@ -178,7 +178,7 @@ ConfigServer:
   - https://kops-controller.internal.docker.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Dlb+pQ8KoBlzBH8NBaC08fSTLfJ2YERlflgvGgDI4Gg=
+NodeupConfigHash: K1Xwhgmx+E2A1CAAezihtmv2R1GN1zx375FSKsP7I8s=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index e9dc4a70cb..d38b4851ed 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -309,3 +309,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content
index 3001c01160..edb3a2bd6d 100644
--- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content
@@ -74,3 +74,5 @@ docker:
     urlArm64: https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz
   storage: overlay2,overlay,aufs
   version: 20.10.17
+usesLegacyGossip: false
+usesNoneDNS: false
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 0447db4e81..ae93b8430d 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
@@ -266,7 +266,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 06GH0HWfKrpd3x4DgozvTAWclDFJKySF2dY459rulaM=
+NodeupConfigHash: 2LdV67Za+XwI/QgANVKHDCGr2X42U+U8jHSr82iCXMM=
 
 __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 6f31362de3..7e69875fdf 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
@@ -266,7 +266,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: GBFk7ZGs4329DeWS3xyBUMrIZZHEAcD0ZXRR90r0/0g=
+NodeupConfigHash: qe7zrCuquuatXA7ZnOau58Stkgj2kCX0CuEgwKlM2cA=
 
 __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 b911f1d0b4..aaa37627f9 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
@@ -266,7 +266,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Y+Xc+3nNYxHhQklxzKd+S2CueJrwnDhNTJvo75GsWuA=
+NodeupConfigHash: G4OiBZhvkXDDpxTGzVm052sZ0sentez2SaeNZEZNUmw=
 
 __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 468707be0a..a7e30b017a 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.existing-iam.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 35Z+keBCrv4Co1sPSU/29h1e7/lbiiGu56f2aAkbAPM=
+NodeupConfigHash: oWB4OjZKI9D+dbNYt5dqE+HBwhdX6i/6QluH3vFEaTs=
 
 __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 1c8bbb77f5..734737c45c 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 486cb9786a..a5b90ce567 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 5e2607e6ad..6e147e9bd9 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 1141dadb88..785b4b0522 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 52b5cb0ab6..7bc04d3169 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
@@ -266,7 +266,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: x5ZCzjXh+ac2dFAdt4C/2crp0fTMZyQbB3N+QJHCJDE=
+NodeupConfigHash: iGciuqPOrec7vUlNTVr+ui58UCMwKgT5v2LH63pQ8Ek=
 
 __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 f36f7207a2..ad9e3a8baa 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
@@ -266,7 +266,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: wHf/zg+CitFZAsUra9tv+S14YK2GGxUMWLzOp9zDweg=
+NodeupConfigHash: 4N14+D9opx+MdHpzKUlQCUNwGVin4ebZLSIaxVT95Pk=
 
 __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 e5a6e2d4bb..53803125ae 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
@@ -266,7 +266,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 5E9vtYcyJqqvja5oMhaEyBaiO2cITWvmtZaxWO3gRYs=
+NodeupConfigHash: Wxck0+9MLZ6M4JiPYvAQCNCuHskosxQUfB+x0Dy05J4=
 
 __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 9eef7e2128..bad064679d 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.existingsg.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: QbmqJd/CYcqHc7ySB5YCwZKYyC14cqF8s0lpddBAiJw=
+NodeupConfigHash: +10Agf0cV4TW3ZfTW1rfFj9MqpfZE2JGWmfflWeaQ0c=
 
 __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 d3ca9fb68f..084d063bd4 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 cbea76d00c..7890b5a444 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 13c88a4068..ae03cb259c 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 a83784ba18..1e9a5882d7 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 a525b705a0..26092711c3 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
@@ -258,7 +258,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 8EajSUc+kAoeKwt0/kCuasagbdryOe+jK68rTaCkb/A=
+NodeupConfigHash: 4SekX4naYQ607iwmpJUls+wgigGpx4PRODGEkzw5xFQ=
 
 __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 50013c2188..b3856b118f 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: QyB/m9nIsoOKrYyaEDWHSa1lQsS8uTqrbVhF/7cbw9c=
+NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y=
 
 __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 d22b259d3b..67cf1b0c32 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 014c3abb76..4eced620fc 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 7edfdcaef2..ce52ec1e72 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
@@ -258,7 +258,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 97K+ZmY992npJi04OEEF00Qd6KMNz/bTUCypZC/92TM=
+NodeupConfigHash: tIg8fDDEAvlXPcOasXAk2oBDV0H1yLxuAJDTY2id2yw=
 
 __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 50013c2188..b3856b118f 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: QyB/m9nIsoOKrYyaEDWHSa1lQsS8uTqrbVhF/7cbw9c=
+NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y=
 
 __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 c57f806ea8..a79911d2f4 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 014c3abb76..4eced620fc 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 d6d962007b..c7d633e168 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
@@ -258,7 +258,7 @@ ClusterName: externallb.example.com
 ConfigBase: memfs://clusters.example.com/externallb.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: VosVuWLQxgI6Vualvjmya8+u15ltpzGoywmYllAQCYg=
+NodeupConfigHash: Yg+cIYg3FAuXTMO1BKGmgl9bq8qmZKeMsgkZyUZQgvY=
 
 __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 7921827309..0c47f30335 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.externallb.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: NcQ6awSGUlbDvjP8taMenpYu5E35j3LG78EFV3d2H9k=
+NodeupConfigHash: cfcqTdfAgL9Gb9m9dtKN/FayZkwcXocHL3Mn1KKmli0=
 
 __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 27682011c0..3e630fbd2e 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 10ac1efe16..979a1f1471 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 f37d75597a..637ef8b258 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
@@ -260,7 +260,7 @@ ClusterName: externalpolicies.example.com
 ConfigBase: memfs://clusters.example.com/externalpolicies.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 7AY+1geMw99dBK4G/6LX/QP/cLmRTDLoHL7qQegAj8g=
+NodeupConfigHash: blHB21oDGWpFYd+TMKlSdlMlvNR2WDsWTuIedhf6/JQ=
 
 __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 9bd9a53e0a..8b926aef71 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.externalpolicies.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: veqN7lOcJEvamC3MwoFSgZp6X4L/RPX1sb+E7gcExfQ=
+NodeupConfigHash: lMANRIKaIC+nWW4cPKrWi18A/a6YUd1jl1jb6ZQXQV0=
 
 __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 27cb4d345e..6a0e0c7663 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
@@ -297,3 +297,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 289554dfb2..c1f3e8cc26 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 4a9c1e8afa..2af4eaceba 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
@@ -266,7 +266,7 @@ ClusterName: ha.example.com
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: grOT8cVmNrCBpk7VZkH39agPF0RM8lYacwtTYYvlEZM=
+NodeupConfigHash: YQc1hXd7dENaIuohvFyMS05Oqq+XNBdb+hEC6aSym2w=
 
 __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 2e0f4dea16..645f087adf 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
@@ -266,7 +266,7 @@ ClusterName: ha.example.com
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: ZMUqKkBJbOt4WJI+gjNbkOsdl5dYtbjljnQNmy4vmHM=
+NodeupConfigHash: AxnhFDHVRBOzwcc5uvWbRCbJRwyKK1A7VZIwL14fQXI=
 
 __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 c0f9229025..a47b3dc4e9 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
@@ -266,7 +266,7 @@ ClusterName: ha.example.com
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 7YXlr/ZEcdvWrp5ZP4UrkDIEJpv0CaQ4VZ/14KTziSQ=
+NodeupConfigHash: GbzmGSXatkw8CoPgm8c4qAu05A1PvPIlAzfOU1SLYrU=
 
 __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 f6e2eed270..1b4537c544 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.ha.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: YslvWZDmLSK3C8bw7nzWb7EivBYgiSUiGlP98RQ6NZ8=
+NodeupConfigHash: EArLqtw1PAlFkT+newQWsPwTQ5fWmRefvdtKj9xqfzo=
 
 __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 c00cd79ae1..62799ca9ab 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 719ebbe84d..9d51ea315b 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 03aecfb21c..872be5caf5 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 52cf7fb394..f0358a6f2f 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 d774bb7c7b..db97bed690 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
@@ -293,3 +293,5 @@ nodeTags: ha-gce-example-com-k8s-io-role-node
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 e22e044276..9270399797 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
@@ -293,3 +293,5 @@ nodeTags: ha-gce-example-com-k8s-io-role-node
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 66c53ffdb6..2aa4029210 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
@@ -293,3 +293,5 @@ nodeTags: ha-gce-example-com-k8s-io-role-node
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 7bd5bc21e6..f879242346 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
@@ -62,3 +62,5 @@ docker:
   skipInstall: true
 multizone: true
 nodeTags: ha-gce-example-com-k8s-io-role-node
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script
index 8bf9ce215b..47e872ca03 100644
--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script
@@ -256,7 +256,7 @@ ClusterName: ha-gce.example.com
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: sz9xIuy1YpJ8DQpLPJEv2ea31JKDESYw3D400He8UGc=
+NodeupConfigHash: zdStJ9CnPdQABjYS4yDuQHfOFH0m/nZn1GGpbiGQm3Y=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script
index dbe204164f..45700598aa 100644
--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script
@@ -256,7 +256,7 @@ ClusterName: ha-gce.example.com
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: qQwu/t6BvpzqKez3Sb4NlMYtqdXxfHzPQO2jiM/p2sk=
+NodeupConfigHash: 54s9ji6iml7v752AUpo2yV7MSA85CF1VGCJipnHUQvk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script
index bfb74a48df..ceba71e822 100644
--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script
@@ -256,7 +256,7 @@ ClusterName: ha-gce.example.com
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 8eYKXdhW4gXnF5Mz829MCVegXeBy1feHC2tREnRzRSU=
+NodeupConfigHash: 7XT1qZHSZTU8YokUHquXUKLMqpShOpe/7cNdMOrOt/Q=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script
index e8cbcc213d..b30e8aed70 100644
--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script
@@ -174,7 +174,7 @@ ConfigServer:
   - https://kops-controller.internal.ha-gce.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 8DU2Rlzo4C1LNBL47QkZqIbt6ZH78z5NCAKG2fmt1n0=
+NodeupConfigHash: PagZ5O7Rk3NltzLMBQgwbOPKC18IlqwMApfvk9IHwqw=
 
 __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 7edfdcaef2..ce52ec1e72 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
@@ -258,7 +258,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 97K+ZmY992npJi04OEEF00Qd6KMNz/bTUCypZC/92TM=
+NodeupConfigHash: tIg8fDDEAvlXPcOasXAk2oBDV0H1yLxuAJDTY2id2yw=
 
 __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 50013c2188..b3856b118f 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: QyB/m9nIsoOKrYyaEDWHSa1lQsS8uTqrbVhF/7cbw9c=
+NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y=
 
 __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 c57f806ea8..a79911d2f4 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 014c3abb76..4eced620fc 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 775db98da6..4de4b59857 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: karpenter-nodes-default
 InstanceGroupRole: Node
-NodeupConfigHash: YLNbDFHoVKna93P89oPTbxIK/sq0rHB5iSgLKcXQI/Q=
+NodeupConfigHash: ZsyRXNTcsN02HN1lnql5L9Wfrsx+ql+60AqopDiQcXc=
 
 __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 cff93722fb..8f2919fe22 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: karpenter-nodes-single-machinetype
 InstanceGroupRole: Node
-NodeupConfigHash: AsLvjLT+JLmySgKyKNy0aTEXqE4J38h7FIpgpCN1ROA=
+NodeupConfigHash: ypeDIQWeZlJi16sJs2ROYNRqQPAp1cGb+FNFf5sXHnE=
 
 __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 75b2a880a7..4bfe032916 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
@@ -258,7 +258,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: d7sJuQwCiSAk2Y7+fEECZtxA//HUcQ6JdX+LneQQ3bA=
+NodeupConfigHash: O90Xwsy8GO+sYQm8DcKw4XMTebrvOCgjJVoupSg82jc=
 
 __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 9c6c2a6571..893c78e1c6 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: h9Y0yNl/LC3sh3rrfC9jzJBMAp15YbMXRdOhXvza71M=
+NodeupConfigHash: jRcAZM0dfnzEtl00xLvFlgwbttjW8pI3/4OZp8Kp4bg=
 
 __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 4eb8a121c0..3a864b35ac 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
@@ -69,3 +69,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 f071879700..974e749028 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
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 59b86fc61f..4e77bab85f 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 77f49e9a3f..9151fae085 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 4fe1724a28..847355515d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -259,7 +259,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 1DknlG2gTd79/t0YA23KzyxiNsJUihmzWsL7BvQrb3I=
+NodeupConfigHash: kduHoVvcEPTEVwhiNbHV4JYFxFa8CEDu8ASeSjXSyjU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
index 3ac5ae1835..b76d141179 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: SpG1ZtAXHoTUlnMcgJqrEopt9PgFaVmgARe05LkreZ8=
+NodeupConfigHash: Ms1i+rXVqBEEA50wUgNWkHYHFRM7CPQsHSZO+l8mIjk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 1d13bcc1c9..0eed6dbe0d 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -297,3 +297,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content
index 91c09d533b..8ddaf0162f 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index a797b1f480..5bcd440cc1 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -261,7 +261,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Qy7VL0knFsvU0PGTWpmSd2GGXqtJMnlIgYLqK/Xyhy0=
+NodeupConfigHash: TWK6qcwDVWK05V0VoQucWrt9mljH/p+0t7MasEREvu4=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data
index 834c29fe53..e744bb5b05 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -178,7 +178,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: ebpiDfh0p4UXCs5d/F6570D8WGfHgX/6BiF+WadZPcg=
+NodeupConfigHash: p1LBFuS6tWxgW/6CVxfKT9IOMipv8QFUuFyBuvAKmdY=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index c9897b9378..28e461ab1a 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -300,3 +300,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content
index b5d43adf14..d7d8d5ae44 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content
@@ -64,3 +64,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 5f86e82cc1..7bb75b2026 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -259,7 +259,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: UU0K0Yfu5d7PI5Zvzh0LCBAxjp4s5948lu2zzTghJpc=
+NodeupConfigHash: JEIeyU+hWbNSAAoJM5zZOirPW7w7s4aNGJTFjPfUWRU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data
index 319f4023b5..6c70de6035 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: aei11V0T9TO4fhyFy8G6Y+i23LqcZ1VLL2qHF8VxvKE=
+NodeupConfigHash: ahxVk0bZA2yHqMHNw0lEh5h+LORMBPYaycNUh1Ku2JU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index b8430aa15d..686ea75ac3 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -297,3 +297,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content
index f6ec4eb01a..705c818d29 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index d606aea470..e71f65a819 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -259,7 +259,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: c3blmTRHdLMIFkVE6Q/NeY1yoP0q5GuEsY3JBFcjpsY=
+NodeupConfigHash: MmBQSJeBAbsGVrHpHv0xeMgZdh0i79qsvKoLaS/FQvQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data
index 2f4579bd44..73b1bb6cf2 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: yq7I3HPq2ua8nT+68Pg4GNn1Gjm5hsL1rHCe58oHCG0=
+NodeupConfigHash: 0iyC5pvvzNYY6UjiSI811A2x9oZK+mBc2NTj0gM3DGw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index a99d437aa4..aa8e4bf319 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -297,3 +297,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content
index e738aac6c6..32cdcb5e3b 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index a9ddeb2e05..5d03f96af3 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -259,7 +259,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: wT7qKRKr4GHskDaECNgAb7563XavqlQ/zMMnUdMElYw=
+NodeupConfigHash: LMPqMKlALyb9Q45AivieeinsOPsmEdks15NkU2rlgyM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data
index c814ecf639..d2c0ed30f2 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: /dxGQEx9k73TrmpePkzFT4e/5+jeYAg+705qy99VRxY=
+NodeupConfigHash: O8Uepex+P1PHuIjgWiSSCQCFGm4dCvYsoC7ZPLvNruM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 512ef35dc8..e7d77573aa 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -297,3 +297,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content
index 1daf369230..4a3ee457d1 100644
--- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 3ac37b56d7..91cade85fe 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -259,7 +259,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: d/FXJoGBWwnvyT0fw9SEt/pDmUNJjSxrtMyeMDmTz5U=
+NodeupConfigHash: vnUcWIikdFsAWLuORvNS8pz9qitNDRpD5L1iMk8EDqY=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data
index 3ac5ae1835..b76d141179 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: SpG1ZtAXHoTUlnMcgJqrEopt9PgFaVmgARe05LkreZ8=
+NodeupConfigHash: Ms1i+rXVqBEEA50wUgNWkHYHFRM7CPQsHSZO+l8mIjk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index d2fa7733ae..5c08e40727 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -297,3 +297,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content
index 91c09d533b..8ddaf0162f 100644
--- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 1b6227b6b4..4af2567db7 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
@@ -294,3 +294,5 @@ nodeTags: minimal-example-com-k8s-io-role-node
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 ab2ae27b93..9675b5dddf 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
@@ -62,3 +62,5 @@ docker:
   skipInstall: true
 multizone: true
 nodeTags: minimal-example-com-k8s-io-role-node
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script
index 0bc5027fd0..269575c4c6 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script
@@ -249,7 +249,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: dtyYzP4X0fNC37aYQrKcfwhYyisxJe6ktkQNaxk2xY4=
+NodeupConfigHash: 325mEhvqdIoIxAW2h5aASS/dYODu4lkxfLsIs1cQtAY=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script
index 1ad996afcd..2d4c1c28b2 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script
@@ -174,7 +174,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: nvwJFGG1mIoCJx+tYAW770wNLQ3u3SdblwmJrANPSwg=
+NodeupConfigHash: RRFxqlOTfXlPy5BuT3DmosHOVwx8B4Yc3HY4TYs+abU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 3ac37b56d7..91cade85fe 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -259,7 +259,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: d/FXJoGBWwnvyT0fw9SEt/pDmUNJjSxrtMyeMDmTz5U=
+NodeupConfigHash: vnUcWIikdFsAWLuORvNS8pz9qitNDRpD5L1iMk8EDqY=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data
index 3ac5ae1835..b76d141179 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: SpG1ZtAXHoTUlnMcgJqrEopt9PgFaVmgARe05LkreZ8=
+NodeupConfigHash: Ms1i+rXVqBEEA50wUgNWkHYHFRM7CPQsHSZO+l8mIjk=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index d2fa7733ae..5c08e40727 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -297,3 +297,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content
index 91c09d533b..8ddaf0162f 100644
--- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 4cc82e831b..d0049d66e9 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -265,7 +265,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: kQPCm26CvRJmxFs5SkLmLujpzlRY+ESvmudErltz4NY=
+NodeupConfigHash: YjNsXTKzljGWjbCGhYgI0rKZbmVgoaTwDtgeEGQUOQE=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data
index 0c81718548..34dfde58fd 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -178,7 +178,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: FyWq185O9MHizTjwHPkEih0Y2sotp32z0xwp78eOFPY=
+NodeupConfigHash: joqP9y/sQWaleutOu4u5b7c4ZCZhWPkdkf6SFIf1Sns=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index c6e577852d..5ae8e6d470 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -298,3 +298,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content
index bc28bbb804..d70ca8665a 100644
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content
@@ -63,3 +63,5 @@ containerdConfig:
   version: 1.6.20
 docker:
   skipInstall: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index a373a59edd..cf54bba3a8 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -262,7 +262,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: mFX9PHba4MWp94GtNcf/KXPV4TnlMBOEG8M/UJB6Wr8=
+NodeupConfigHash: GTmyxHLxY4dMkGoFneYGGG5uekT6tZG9n7e3bJ5nbV8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data
index 9843378e3c..23592ce6cc 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: TvlIQht8dSXo7u2ZdcjuuDcvycgQjQMhejpicWmXeHM=
+NodeupConfigHash: ntEKKYRXFHWZew4/uSAb89jQqKCIZUkTulO5nzl7DGg=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 782bea8dcd..78175afb14 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -296,3 +296,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content
index d090dac268..942ef5b999 100644
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 10b50a5538..3116cf31af 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
@@ -262,7 +262,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: C7E25b52UDCraZ6o8ybeZrQBiiPcAUPVfjPhYF8HILY=
+NodeupConfigHash: +uc3VRHCu1WUn+oRm2fw69p63ItS4JL4RQTLe81WtWM=
 
 __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 cb7b57560b..d5875451cb 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: lbeidK1VwdQ2u27gshnYuCmf/ttI6mc2kf8PuhV0/OE=
+NodeupConfigHash: WRhP79F6brGpdVmRzjHBMmKNfrs86MoyVhTf4b2WHjQ=
 
 __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 aa074dddf1..e85a8532c4 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
@@ -296,3 +296,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 0faa1ac903..19865258b3 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
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 2a1e36d959..0b94eb8712 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
@@ -262,7 +262,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: fDj5DsGJsfhOeyuxUzT8GYFraXZ4B7bw9INMPFPiKgo=
+NodeupConfigHash: 1mcBMqcOG/8x5FGk9YjYGO1pZdxGc3bLXHquWHOtSI0=
 
 __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 261a94caa2..76d2b62d53 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 7D6lnu1r983MdCP1dr9lPOfo0OMnsaqJXaGbmvafmTw=
+NodeupConfigHash: XR2CT363R0cxF08p+6LUoWc7nNCWGboqAFdjvCW5Wus=
 
 __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 85432d03ba..0b26f214cf 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
@@ -296,3 +296,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 f0291bba56..f792bcab84 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
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 2a1e36d959..60dc8ad788 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
@@ -262,7 +262,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: fDj5DsGJsfhOeyuxUzT8GYFraXZ4B7bw9INMPFPiKgo=
+NodeupConfigHash: eqXdxQZGsWxsNId4XBJahfVxhKrgVJo0qFk1J8g+Tuw=
 
 __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 261a94caa2..9f14e77fc8 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 7D6lnu1r983MdCP1dr9lPOfo0OMnsaqJXaGbmvafmTw=
+NodeupConfigHash: QY3CF/l6Jra5wZwacioPoQNgup+fL+8BZ/O3yc7cN+8=
 
 __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 85432d03ba..a8879e9f3f 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
@@ -296,3 +296,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: true
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 f0291bba56..cf3925f01c 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
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: true
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 690410e4bf..a91ce60f9f 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
@@ -269,7 +269,7 @@ ClusterName: minimal-etcd.example.com
 ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: hP0dAY1mRhYmSx3ydzintveBcTvSNigWPTNuDfx7NyM=
+NodeupConfigHash: HCk88G/gHWHACqhfNtkOfvtPkwaVOHxPr97ixvqV19s=
 
 __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 6a5c6eff35..916653bd8f 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-etcd.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: BfV3PQwnZIqOrx27EY1RlN6T7Xxf0ySdq4TuG00aksM=
+NodeupConfigHash: aGg+Xrg2ZWjlOGywoZzIWj/5EYBnVaC+v4Lk0BepIkI=
 
 __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 81e2f89c39..450ff7fc6b 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 b9e3cd4f56..0f9095c708 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 bc9e5dfe9a..14cc007c77 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
@@ -264,7 +264,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 8EajSUc+kAoeKwt0/kCuasagbdryOe+jK68rTaCkb/A=
+NodeupConfigHash: 4SekX4naYQ607iwmpJUls+wgigGpx4PRODGEkzw5xFQ=
 
 __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 50013c2188..b3856b118f 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: QyB/m9nIsoOKrYyaEDWHSa1lQsS8uTqrbVhF/7cbw9c=
+NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y=
 
 __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 d22b259d3b..67cf1b0c32 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 014c3abb76..4eced620fc 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
index 56c1094ae1..130a7f70fb 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
@@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: T8r8sYe94RsW8OkfF2TQbVU96q2tjEz3Rg2/ye7IcdQ=
+NodeupConfigHash: yZpD1R5xTpzBcEeyoJbFsG6pbJgnAB3DDzAvTWAb5L8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
index e8976fae8f..2d3546f23e 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-ipv6.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Vsahoc8mxBNbR9r2GvKO6SxnnTnKsOaLoioVf2Vj5lI=
+NodeupConfigHash: 7gBbN1io5bE7oczyoIEcEF86p4AvABPE7hormeyJGtw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 662dbf1227..44e2f933fd 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -298,3 +298,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content
index 7e9d148692..bef9a7a48c 100644
--- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
index b38609606f..ad9d34f8d8 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
@@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: u8sCWqeDSixSPyiXf7xj2YVbDOYRfI5TSJpHb2Q/pZI=
+NodeupConfigHash: imFrt0N3J/RlGkI0MAiUUHLjTYE8FsdE2LuOin8PzG8=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
index df01aa32e4..1802071a55 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-ipv6.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: v8fccCA9c8WJS7uiAIqwWW1FYlzi4qMANKp/rLi891c=
+NodeupConfigHash: 8Drpu/riG04+/Rnj2domVAEgfNJ59lvX/fPhT5mLBcQ=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 031bdaa141..c396e4eb60 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -298,3 +298,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content
index a609b42ed4..e999416b65 100644
--- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 54d70fdde2..002dedda60 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
@@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: x8uDhH+0WqupMx1Gpm18zGj3z3nUfKRQylg/qXUWrto=
+NodeupConfigHash: tzyDb8RW5zKmocwRToo4rtFUkyyMZyU+KK+J/Yhlflc=
 
 __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 fa699e81c5..3e453194e2 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-ipv6.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: zJIAA6zcJYv2d7lnUPez+zjQi8m0FaE29B8Vspc+zVI=
+NodeupConfigHash: xkq6xvdWZJjO91MGloMgnbNQU+R0KylELTgwPQ0wvKs=
 
 __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 f527d6b1bf..0f28a30d18 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
@@ -297,3 +297,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 e204e2a8c6..25727553fe 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
@@ -60,3 +60,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 54d70fdde2..002dedda60 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
@@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: x8uDhH+0WqupMx1Gpm18zGj3z3nUfKRQylg/qXUWrto=
+NodeupConfigHash: tzyDb8RW5zKmocwRToo4rtFUkyyMZyU+KK+J/Yhlflc=
 
 __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 fa699e81c5..3e453194e2 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-ipv6.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: zJIAA6zcJYv2d7lnUPez+zjQi8m0FaE29B8Vspc+zVI=
+NodeupConfigHash: xkq6xvdWZJjO91MGloMgnbNQU+R0KylELTgwPQ0wvKs=
 
 __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 f527d6b1bf..0f28a30d18 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
@@ -297,3 +297,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 e204e2a8c6..25727553fe 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
@@ -60,3 +60,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 371bb0595f..516f7b17d1 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
@@ -256,7 +256,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: +p+G4c56gS7rsGjlfNeJ0e7iqFoEIPU3s8Ushbq/dXY=
+NodeupConfigHash: AbMATywXLFMOSd0NL+yj++qWBnYERmV4eESLYWrWJZg=
 
 __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 e08cbae949..4249754bac 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
@@ -176,7 +176,7 @@ ConfigServer:
   - https://kops-controller.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: pSaCZUv/vVt+jJXhL5TcuZu9K7nL0x17IldoR5HE6pk=
+NodeupConfigHash: GfZ5rPW9IA1otaZJEQP/wNLJJeTyQTCAPWeBKC7fp2U=
 
 __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 c84b16e105..1290ab2505 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
@@ -294,3 +294,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 db4aa9de1a..fbe80cc113 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
@@ -60,3 +60,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data
index 9b6d3178f2..812321ca21 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data
@@ -258,7 +258,7 @@ ClusterName: minimal-warmpool.example.com
 ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: x+WOGyngRajUB2TIaDEFUERh8MsbIG3tDvf0XptjqHU=
+NodeupConfigHash: RgOSmG2PTd7Yq18sy3UJe6jhParDo6XPqYzy3XrYg6c=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data
index c3d5f14945..11df171c9c 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-warmpool.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 5V2bnzHDJRoiwwGYY/DdiQG+I+weWVu+1PEocNRgc0o=
+NodeupConfigHash: etxF12d5FOTWEiQyh5jdrDOmYecD639XnWKCQk3xF+Q=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 36408a3cb6..46530cf546 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -296,3 +296,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content
index eebe258c5e..4ae20b61d2 100644
--- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content
@@ -63,6 +63,8 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
 warmPoolImages:
 - quay.io/cilium/cilium:v1.12.5
 - quay.io/cilium/operator:v1.12.5
diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 7dc634171d..dd1e53de6f 100644
--- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -251,7 +251,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Q8YfyZ01FrJoFj3BHdJIugpn1cny1S+QVPSd+62CaUs=
+NodeupConfigHash: ls4y0MnitZ7M7k7jjECDzyE6Xv6RkQ2wXQpYqpVOoEM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data
index 82605570ab..b1df303300 100644
--- a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -175,7 +175,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: QrZGVvjDcvclRWRKDeUnQva9HojwCR/+W55pKgQw/AA=
+NodeupConfigHash: 72Ms8WK/aTXRvvHcrobYf2ucLeBTbVtnMSVuYeFBbIY=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index ddc9f0601c..61aa0bb483 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -294,3 +294,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content
index 33bb60123a..86b18d04e4 100644
--- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 d41a6f0c7d..7acfcd8abd 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
@@ -293,3 +293,5 @@ nodeTags: minimal-gce-example-com-k8s-io-role-node
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 ef5c28b0d7..bbeb9faa1d 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
@@ -62,3 +62,5 @@ docker:
   skipInstall: true
 multizone: true
 nodeTags: minimal-gce-example-com-k8s-io-role-node
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script
index dd5f78df48..441569f5e7 100644
--- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script
@@ -248,7 +248,7 @@ ClusterName: minimal-gce.example.com
 ConfigBase: memfs://tests/minimal-gce.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: lNtR0Qz/xlmI3dVWAcDJlTH1Uqf/52qaovJcpSBGYUY=
+NodeupConfigHash: NrrSCmtp2nI/oI8RJKL8Rgwr02lpU4phJxXl6yMlTTw=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script
index a14ddec3c5..11e67b6dbd 100644
--- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script
@@ -174,7 +174,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: XgSRR7guQBzwnu43dO/8KChyskplAKPgvx0Gn6GjvYs=
+NodeupConfigHash: +WsOVIuidJ9JnEK/IKV6qGOMy2xSbEAPcBY/Cit2A7Y=
 
 __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 d41a6f0c7d..3ba6a71a16 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
@@ -293,3 +293,5 @@ nodeTags: minimal-gce-example-com-k8s-io-role-node
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: true
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 ef5c28b0d7..ba90d5d4cc 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
@@ -62,3 +62,5 @@ docker:
   skipInstall: true
 multizone: true
 nodeTags: minimal-gce-example-com-k8s-io-role-node
+usesLegacyGossip: false
+usesNoneDNS: true
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_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script
index dd5f78df48..6bbc3f53a5 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script
@@ -248,7 +248,7 @@ ClusterName: minimal-gce.example.com
 ConfigBase: memfs://tests/minimal-gce.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: lNtR0Qz/xlmI3dVWAcDJlTH1Uqf/52qaovJcpSBGYUY=
+NodeupConfigHash: M8i+AXNikNzSB1HqtiGs1zSl1TPOaPukDLUahmw9viQ=
 
 __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_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script
index a14ddec3c5..033c0d914a 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script
@@ -174,7 +174,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: XgSRR7guQBzwnu43dO/8KChyskplAKPgvx0Gn6GjvYs=
+NodeupConfigHash: 1cfYdFzwbUwENfJbW6MVxqxQILfQma+cm4Ca2e9LszY=
 
 __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 3461120c1e..e5924458ee 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
@@ -293,3 +293,5 @@ nodeTags: minimal-gce-ilb-example-com-k8s-io-role-node
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 ee8893d4c6..86a1ac8583 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
@@ -62,3 +62,5 @@ docker:
   skipInstall: true
 multizone: true
 nodeTags: minimal-gce-ilb-example-com-k8s-io-role-node
+usesLegacyGossip: false
+usesNoneDNS: false
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_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script
index b3dbf55971..9a3c30e15d 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script
@@ -248,7 +248,7 @@ ClusterName: minimal-gce-ilb.example.com
 ConfigBase: memfs://tests/minimal-gce-ilb.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: gn3SyANzFpfmSxKWGRPAQUMBnhXnkiPEY4u9ZKNgfbA=
+NodeupConfigHash: uLvfuqngiDIxFtBYmk91Fc4s5+fyjM368nDFcNcnYYw=
 
 __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_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script
index 4c79d0c792..bafd845817 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script
@@ -174,7 +174,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce-ilb.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: MnH7r4JVi1cO63plfuDvnxNQWQ754291hrwU1vMsyts=
+NodeupConfigHash: xVCn7tvpx0V7qytFOAXp1HFrvn0NhsHfK8rxNFB3ko4=
 
 __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 ef85ca0262..aced80856b 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
@@ -293,3 +293,5 @@ nodeTags: minimal-gce-with-a-very-very-very-very--96dqvi-k8s-io-role-node
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 b8890fc71a..bbb4c3638e 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
@@ -62,3 +62,5 @@ docker:
   skipInstall: true
 multizone: true
 nodeTags: minimal-gce-with-a-very-very-very-very--96dqvi-k8s-io-role-node
+usesLegacyGossip: false
+usesNoneDNS: false
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_startup-script 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_startup-script
index 604edca6ec..0d05741a04 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_startup-script
+++ 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_startup-script
@@ -248,7 +248,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: o11mkBrXrPvUg8a8OisdZwi1vzei/smYxIM8mAvLJ/o=
+NodeupConfigHash: jT+AhIAfUuvNLQ+UiyduEOMzaqPcBLewzbuLTIpjGb4=
 
 __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_startup-script 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_startup-script
index fe52d5b79d..a89a7043d2 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_startup-script
+++ 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_startup-script
@@ -174,7 +174,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: AbETKXFCsT2ZUxa4O+Gn7LyDzsMyB6JCsuljySURZkg=
+NodeupConfigHash: 45wSOgsSDfRQ67U3qAfamGSNr4r0USMR8SL/dnW3c6g=
 
 __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 ef85ca0262..aced80856b 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
@@ -293,3 +293,5 @@ nodeTags: minimal-gce-with-a-very-very-very-very--96dqvi-k8s-io-role-node
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 b8890fc71a..bbb4c3638e 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
@@ -62,3 +62,5 @@ docker:
   skipInstall: true
 multizone: true
 nodeTags: minimal-gce-with-a-very-very-very-very--96dqvi-k8s-io-role-node
+usesLegacyGossip: false
+usesNoneDNS: false
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 604edca6ec..0d05741a04 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
@@ -248,7 +248,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: o11mkBrXrPvUg8a8OisdZwi1vzei/smYxIM8mAvLJ/o=
+NodeupConfigHash: jT+AhIAfUuvNLQ+UiyduEOMzaqPcBLewzbuLTIpjGb4=
 
 __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 fe52d5b79d..a89a7043d2 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
@@ -174,7 +174,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: AbETKXFCsT2ZUxa4O+Gn7LyDzsMyB6JCsuljySURZkg=
+NodeupConfigHash: 45wSOgsSDfRQ67U3qAfamGSNr4r0USMR8SL/dnW3c6g=
 
 __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 ed07718140..09772883c6 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
@@ -293,3 +293,5 @@ nodeTags: minimal-gce-plb-example-com-k8s-io-role-node
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 11e48187e7..a0f18765c6 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
@@ -62,3 +62,5 @@ docker:
   skipInstall: true
 multizone: true
 nodeTags: minimal-gce-plb-example-com-k8s-io-role-node
+usesLegacyGossip: false
+usesNoneDNS: false
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_startup-script b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script
index 8357512c53..2a86186fa4 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script
@@ -248,7 +248,7 @@ ClusterName: minimal-gce-plb.example.com
 ConfigBase: memfs://tests/minimal-gce-plb.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 3iLJLWDr/cZcwR7/WNkxrJ4IOgR1f73uqlQhGH0S0cE=
+NodeupConfigHash: kU6IhwwBg06N+xO0O0+aA16WKhhuh1m0FMOESJI5dRo=
 
 __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_startup-script b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_startup-script
index e5524bab26..a9c1890110 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_startup-script
@@ -174,7 +174,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce-plb.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: WYXiNRckAz2kroupW5HI9C9GX1vHiaxWL7UgES0H/EA=
+NodeupConfigHash: YOvsA0LLKU5nLtmCUjrrWuUDNhBtTgpj9A7VxgZPUCM=
 
 __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 d2c0ae708d..08a6a8d506 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
@@ -293,3 +293,5 @@ nodeTags: minimal-gce-private-example-com-k8s-io-role-node
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 a4e96cbafb..cf3e3aa13e 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
@@ -62,3 +62,5 @@ docker:
   skipInstall: true
 multizone: true
 nodeTags: minimal-gce-private-example-com-k8s-io-role-node
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script
index 41567c5080..33488761bc 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script
@@ -248,7 +248,7 @@ ClusterName: minimal-gce-private.example.com
 ConfigBase: memfs://tests/minimal-gce-private.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: kRGL1wtobc4z2VFgYGHP9FNvE7ELGTGSd/tQpJ2SIyo=
+NodeupConfigHash: dHTgqt70/+OXIbarfSC6TPRKjU4nPc+Z1yzRUnKfnpc=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script
index 0702b19758..9a98b8509a 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script
@@ -174,7 +174,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-gce-private.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: soMbdhFP3KHbUEcM2q+9fi1nEm7cy4VJ6Zvb28QMvAs=
+NodeupConfigHash: Y4siienVMamIm7jhv4/stUoh04gJFDsVOcZVPGmI6zM=
 
 __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 3636330e06..5b7e2d2635 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
@@ -258,7 +258,7 @@ ClusterName: minimal.k8s.local
 ConfigBase: memfs://clusters.example.com/minimal.k8s.local
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: E5Ib+Vaqaf7QOGqDTtdKtRFoqlROPXt39RzH3CmyjEs=
+NodeupConfigHash: 1PUiVdbKfNt42heq9MedmlqOXRuFEOEuLasC7TWJIIQ=
 
 __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 5f33465001..72e57c1f44 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
@@ -154,7 +154,7 @@ ClusterName: minimal.k8s.local
 ConfigBase: memfs://clusters.example.com/minimal.k8s.local
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: k+Ba+9mFbKwRbX3gCyq0+p0/807J4BnKvbpY466YGL8=
+NodeupConfigHash: QwPtzN3lbFjX5VAwxKkZbAUSz/2M2nlrK9yds8Obh6Y=
 
 __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 f6b886576a..8a65f175f0 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: true
+usesNoneDNS: false
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 7816608441..95a7c873d1 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
@@ -86,3 +86,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: true
+usesNoneDNS: false
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 9571863926..e699837a67 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
@@ -258,7 +258,7 @@ ClusterName: minimal.k8s.local
 ConfigBase: memfs://clusters.example.com/minimal.k8s.local
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 9Xutr9YK0IklfviZ8KJVZo3IlUkLxp4GNsRAsZsv5fw=
+NodeupConfigHash: bqgzaAoMjqe4ecCVWbXyw7bMwmsOL/mtAdOGbCRWrzs=
 
 __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 5f33465001..72e57c1f44 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
@@ -154,7 +154,7 @@ ClusterName: minimal.k8s.local
 ConfigBase: memfs://clusters.example.com/minimal.k8s.local
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: k+Ba+9mFbKwRbX3gCyq0+p0/807J4BnKvbpY466YGL8=
+NodeupConfigHash: QwPtzN3lbFjX5VAwxKkZbAUSz/2M2nlrK9yds8Obh6Y=
 
 __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 86862fd131..9d968d517c 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: true
+usesNoneDNS: false
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 7816608441..95a7c873d1 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
@@ -86,3 +86,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: true
+usesNoneDNS: false
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 a4577bfc83..8bb2a2cb1f 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
@@ -288,3 +288,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: true
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 27087cfecd..8b460c419b 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
@@ -57,3 +57,5 @@ containerdConfig:
   version: 1.6.20
 docker:
   skipInstall: true
+usesLegacyGossip: false
+usesNoneDNS: true
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 da6376d431..0520672c95 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
@@ -247,7 +247,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-fsn1
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: RkpZHom3GAstM+fYDcWitMv3eT5mqhgAxaJv8Ho+QvM=
+NodeupConfigHash: 5pZ6X4hcSGaih6FFJoqIJ6bPdH+r0ZpGIKKPnvGriEI=
 
 __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 fca78f1731..45961afd4d 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
@@ -173,7 +173,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes-fsn1
 InstanceGroupRole: Node
-NodeupConfigHash: H0n8BPEQxjJ33K13fD6vMt6gjd+HTa0E5uLLUdlT2WQ=
+NodeupConfigHash: uf+DUChkf7KJEiWf+hyWBiIMG/51VD78TpguhJGGFOA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content
index e3d860659c..386f6613db 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content
@@ -285,3 +285,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: true
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content
index ce78a5e824..85321bc3f9 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content
+++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-nodes-fr-par-1_content
@@ -81,3 +81,5 @@ containerdConfig:
   version: 1.6.20
 docker:
   skipInstall: true
+usesLegacyGossip: true
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data
index 1abd1fc35a..a185cbd886 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data
+++ b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data
@@ -249,7 +249,7 @@ ClusterName: scw-minimal.k8s.local
 ConfigBase: memfs://tests/scw-minimal.k8s.local
 InstanceGroupName: control-plane-fr-par-1
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: adzC+C+zv0hno4Qm7fQAgmTWl5a49Ma7MGvLZSIjkqg=
+NodeupConfigHash: jKEtxsHZO5+OHL66/MYUPT34T8z6YjE5BJVgH6JYxRA=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data
index 33f43a6432..6fee07127d 100644
--- a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data
+++ b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data
@@ -153,7 +153,7 @@ ClusterName: scw-minimal.k8s.local
 ConfigBase: memfs://tests/scw-minimal.k8s.local
 InstanceGroupName: nodes-fr-par-1
 InstanceGroupRole: Node
-NodeupConfigHash: MWSZsDqWyS1C8817sqQQ56g9jFp2uUO9nI46HqL/vqI=
+NodeupConfigHash: ThbM3OQQUCmecnKq4GQW0fdWp6sjwEiAjfmqga3QcXY=
 
 __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 d0c9f8177b..9911460c63 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
@@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: dBSS/ziIjLBIikb5YeEjVFKSyRzqzyWtderNE3OgRww=
+NodeupConfigHash: M0fBsZX0zp0t/fhJEfzB/RlLNlE331COokwrJ6QCRB8=
 
 __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 63b722df26..0d406f628d 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
@@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: +M95L2XLEAZrU7AXJGjuS0OwciKg7HIof7AQKej5oRI=
+NodeupConfigHash: O+pGStyQXJ7Qfrl4xCQf5gb0fmYT0l5/S4vkYwME+VI=
 
 __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 1e05af8acc..a9eb91685a 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
@@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: GzWxipdofRTX0ZhG07h6eFpXanJBzMxRyrfcyk7xrMM=
+NodeupConfigHash: VdmnVBn9Ts2c/2AuX+c0vivj5J6m470bVQKClVpm5bQ=
 
 __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 f1aaf9b989..1c350ba16d 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.mixedinstances.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: TwobeSMtHTifRoVmtnmwbvq06NGwKLzydznLvU3eF3o=
+NodeupConfigHash: xav+zYd94DNkY5u0fKxaOYL/H78vCaxOMwSYA8mpezg=
 
 __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 ed1d9eaada..404f687373 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 da5824c374..0357033155 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 17b6dc5745..cc0dcdfd4c 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 c7b2a61de6..5ffcdbdb9e 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 d0c9f8177b..9911460c63 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
@@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: dBSS/ziIjLBIikb5YeEjVFKSyRzqzyWtderNE3OgRww=
+NodeupConfigHash: M0fBsZX0zp0t/fhJEfzB/RlLNlE331COokwrJ6QCRB8=
 
 __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 63b722df26..0d406f628d 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
@@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: +M95L2XLEAZrU7AXJGjuS0OwciKg7HIof7AQKej5oRI=
+NodeupConfigHash: O+pGStyQXJ7Qfrl4xCQf5gb0fmYT0l5/S4vkYwME+VI=
 
 __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 1e05af8acc..a9eb91685a 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
@@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: GzWxipdofRTX0ZhG07h6eFpXanJBzMxRyrfcyk7xrMM=
+NodeupConfigHash: VdmnVBn9Ts2c/2AuX+c0vivj5J6m470bVQKClVpm5bQ=
 
 __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 f1aaf9b989..1c350ba16d 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.mixedinstances.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: TwobeSMtHTifRoVmtnmwbvq06NGwKLzydznLvU3eF3o=
+NodeupConfigHash: xav+zYd94DNkY5u0fKxaOYL/H78vCaxOMwSYA8mpezg=
 
 __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 ed1d9eaada..404f687373 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 da5824c374..0357033155 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 17b6dc5745..cc0dcdfd4c 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 c7b2a61de6..5ffcdbdb9e 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 bd315b3600..17366a5aa1 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
@@ -258,7 +258,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com
 ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: a321KigUyygRZQBqAXULlU2mYXzKuFrM/Hf+nOH8Gnc=
+NodeupConfigHash: Olxo/iCnCYjoKdTjwWRM0mlqerLkrYSB1yIDpEQkTxU=
 
 __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 cbe32acdfa..e5f2467b76 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: b+YxX/5u6gVu0ET4vTT+Ab0vw3Orpx2yNYcM4ch4pd4=
+NodeupConfigHash: LHbtLGBKSJGZKF6vJGwgd6QF2o9AzOI4n+xSkyFxYGA=
 
 __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 9fabd1938a..0b8afbbb5d 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 b6b4045263..20ba32cfb2 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 1523f2bec7..b57efed464 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
@@ -258,7 +258,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com
 ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: hPgHFmZ7s/bksuEAWgM1NQFg5ko35+tUMztlz09vfGw=
+NodeupConfigHash: HawEqLsO5KmxEyWacLleRPUrvc0Kous+MaYI7ZUTGu4=
 
 __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 cbe32acdfa..e5f2467b76 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: b+YxX/5u6gVu0ET4vTT+Ab0vw3Orpx2yNYcM4ch4pd4=
+NodeupConfigHash: LHbtLGBKSJGZKF6vJGwgd6QF2o9AzOI4n+xSkyFxYGA=
 
 __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 16fed34941..75d5872574 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 b6b4045263..20ba32cfb2 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 c26aff9270..24d7ca039f 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
@@ -258,7 +258,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: ytCT3mYUugU+a1mxpFFVpO4vy+k6l9GKd1winSjROss=
+NodeupConfigHash: p8BaPZKCsyDRs02crWh4A2YfLaKpY3ZBMVpIDHF5NZo=
 
 __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 b8e889a487..a8c7e23a26 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: kzDJcE0W0+5gmLSPGXizFxIK2WjIA8kdsPSc+xXh9/Q=
+NodeupConfigHash: oHu0Ffuu25EI2ZdD22GmczarTzEeIuMwpZVyLDDn8vA=
 
 __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 5a5aca7e02..d982d6e953 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
@@ -301,3 +301,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 3f878ab93b..499489544c 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
@@ -70,3 +70,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 5ceccbf6db..1ffc2e81f2 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
@@ -258,7 +258,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: /GII3HYgAsZ9Uo0NRQIEKpcX/8bu+XqYN/6HVhzQjYU=
+NodeupConfigHash: TXTZwquCAH62q9FV1qoeIkwXL+YVXT2D+oL/bsFelG4=
 
 __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 e0487dfe19..bff3e87c10 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.private-shared-ip.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: q1//4TyjX7J/V/u4r/zPNbAlYfcQNmHRhgX/u1We0og=
+NodeupConfigHash: csAOVD7MKX97FOt/YeL+EIBoLA5fN9ZTuw6Mjd1dRcs=
 
 __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 7c8a094f14..ea5f7bc4bc 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 937a9bb644..b59bd24290 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 6752d4e706..b5ba409382 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
@@ -258,7 +258,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: /r5HItjaD++420gorvRFvnnsBhuXfv69N7gdj+4JAT8=
+NodeupConfigHash: emtryZbJcW3ux0E+L3rrPHwQ8clYD651RZ22ZrrSJz8=
 
 __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 0864d07049..707fdf5153 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.private-shared-subnet.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: t18Nt7F6DKYTdeuJxRkrTDdANjJzXVPJ8YeZO0U0/ho=
+NodeupConfigHash: VTTbHs5+QF7unbkMYiy5wMUPAqurejfI5y4gT+BAfc8=
 
 __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 dc6d5a9fda..e4e6deb395 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 1c201eb5be..bb613a4ca4 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data
index 0e1f616791..b44fcb4b19 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data
+++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data
@@ -258,7 +258,7 @@ ClusterName: privatecalico.example.com
 ConfigBase: memfs://clusters.example.com/privatecalico.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Er4YIqxZCcIqUrMdoB74lJzU3iQDxhX5JnVjeHiSsE4=
+NodeupConfigHash: 4zAKJ4H8rG7iKUSBFammVc6XWE1hwEnpSrGzgY6+UW0=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data
index 52e27cbebd..d7e06a51e5 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data
+++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.privatecalico.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: fim0mCmjG5jpZEFnZnIY/wNgOVEUNvHSoTT2OiUHZac=
+NodeupConfigHash: ysqqSsFhy64tzvCgMd2mxETrR2zrJwTfwWBxH6RMBtI=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index e67e4518b0..bc9123a537 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -296,3 +296,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content
index b3d4f0c212..25c2c8e0b9 100644
--- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 9321c6b00a..44450bd551 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
@@ -258,7 +258,7 @@ ClusterName: privatecanal.example.com
 ConfigBase: memfs://clusters.example.com/privatecanal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: U2XOviD5gSFw78t1lFhLqzTXV/n5VxBMEuAmta27cLg=
+NodeupConfigHash: SAQArkSz9fAJet9q25bXhmh9vw4ha/nKQB7BZ6By3pU=
 
 __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 5554283e28..bcdbe5d3e3 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.privatecanal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Wcsm0QY2yr6wAt1buoHy2nl5R/BZ3fs4fBGA8KLQuUY=
+NodeupConfigHash: ddMndU7m0axkgUrwLCWKWIAEIB+w/Lsp1nHhI5Gv9OY=
 
 __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 5d7b694ca0..05a1314a80 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 196323fa0c..ec1c431536 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
index f88542fe59..afc79a0b6c 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
@@ -258,7 +258,7 @@ ClusterName: privatecilium.example.com
 ConfigBase: memfs://clusters.example.com/privatecilium.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: l8BtFx3Fd5+Iy7wGbmosAvAn3kbe2rmssldrZK7UXYo=
+NodeupConfigHash: I95bPNMeuAg62sR/yCtXsBnuOsEsbUmZIcezB/O39p4=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data
index 5b71d58eb2..297cee7675 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.privatecilium.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: ayUwmFl+s98FA2+SLATlTbsjauvi+1IU/yqhfnS/24c=
+NodeupConfigHash: u6FlpkakLgdiBjQHZ4+S8DBj+rWFLoWX3vSsOzc5UHM=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 7d74625526..7c92603352 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -297,3 +297,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content
index 195f28f05f..353d9b47d5 100644
--- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content
@@ -63,3 +63,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
index 4d67e33c00..71b4b7c843 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
@@ -258,7 +258,7 @@ ClusterName: privatecilium.example.com
 ConfigBase: memfs://clusters.example.com/privatecilium.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: hse7F+UvpiUXluMD9ElfGH5AjaOCk3Cb5pL0AnJmEgw=
+NodeupConfigHash: 8Nxi5ImiyQVfRbrQ5TyY3tAUp7LC3GQWsyTc2GU2hls=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data
index a691a5dbd9..9510908ab3 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.privatecilium.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: KTiewJU0jnqm+u2NkGzutpRr52O9RSa59Y9nW8C9V4A=
+NodeupConfigHash: nU0ehjpyBdYrrSIWsywVI22dHapb31wW6YxeP8vipyY=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 844be62e1e..65dd1d4708 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -296,3 +296,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content
index d9a1e6f09d..62cfcfca4f 100644
--- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
index 5f02d838cb..fb95bc8400 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
@@ -258,7 +258,7 @@ ClusterName: privatecilium.example.com
 ConfigBase: memfs://clusters.example.com/privatecilium.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: rH79SE8YMnRi4l3FQb3fAV1JKgzHEmzRdTCmXXDm8to=
+NodeupConfigHash: /oElx9KwUPLY653eQolwzoNw8jTORn9KbvrOuZby27g=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data
index a0c2a74259..f92f7d677f 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.privatecilium.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Wpj9O4V7Icqvyrdb8x8IMykfb007Sf2hMRllohYm0O4=
+NodeupConfigHash: ifW04cp9jbM/63UhQJRIDBD07ciy75nGK0TPJBD6pD0=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 657b2d1c51..a03c713b5f 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -296,3 +296,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content
index d5bb442f03..9fad219c09 100644
--- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data
index bf94d69059..ed61973651 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data
@@ -265,7 +265,7 @@ ClusterName: privateciliumadvanced.example.com
 ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 6CknVqihnsm5SI86dYioEvPapN7CaAW6Df8jpIF56JI=
+NodeupConfigHash: BwyH7+97sEYBSsf9TfipcV0wiD5I6bhSIAjwhUZAiMc=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data
index c6a522fefc..b63169d601 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.privateciliumadvanced.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: SHuIEtZg2G5IbDFCic1zyNdcSey/BzYwUHIxHRpLZG4=
+NodeupConfigHash: DbJny4v/z3uSq6eN6r7TNpZd0Sms0pal8OOhTRsztzU=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 6ba904537e..b46fa0966b 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -365,3 +365,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content
index cf3a30265f..66a0ea4675 100644
--- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content
@@ -84,3 +84,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 72049e3f91..e4da92ba9b 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
@@ -260,7 +260,7 @@ ClusterName: privatedns1.example.com
 ConfigBase: memfs://clusters.example.com/privatedns1.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: KjG5XIBA2WlkRTJEJMzz8w4X2AeG2S+8X1w/oUdm1lY=
+NodeupConfigHash: sPTsUjcrPcWUj1bKt0t0dZGon6wWe7EjNC1UkqGl4wg=
 
 __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 82e2e584e0..e769f0548c 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
@@ -178,7 +178,7 @@ ConfigServer:
   - https://kops-controller.internal.privatedns1.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 8Scke9oGK/nQ671FxKf6ZSJDAMClfR6jGT0n9yR0wTU=
+NodeupConfigHash: L1Tx70p0KK5EYfSzoaL5/OEoQuPibe3YPwZ+8DgF+HM=
 
 __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 9e2f152c7a..d5b6bb1ef6 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
@@ -293,3 +293,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
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 b6b5b32e83..4bae3e075b 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
@@ -58,3 +58,5 @@ containerdConfig:
   version: 1.4.13
 docker:
   skipInstall: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 5fd750e858..2bfe0654a2 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
@@ -258,7 +258,7 @@ ClusterName: privatedns2.example.com
 ConfigBase: memfs://clusters.example.com/privatedns2.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 7mmGxPBuO7X6vH/k+oX8HecNtYTD7qSYrGAHDLLqp8s=
+NodeupConfigHash: nwRh9CIwzGxAsG0TVkf+8BaZ130jlvkuCqvunr1j/eg=
 
 __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 927e7c2483..cd4841be40 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.privatedns2.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: JbYJ+WVGdx7GJimFc4yC0xSUrIf7TA2kLp26vcWxPOg=
+NodeupConfigHash: TKAsYEgaA45kLtL5B1FM0UwIXanWEcqd2pZpD/Jtzmw=
 
 __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 455f220cab..20c08b2aea 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 530b5a3afd..edf2972ef8 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 0fe1d71221..fa5a100a3f 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
@@ -258,7 +258,7 @@ ClusterName: privateflannel.example.com
 ConfigBase: memfs://clusters.example.com/privateflannel.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: FgkGa4bMpzESSMQLFAiNbPDXlANIJXCi/UfTBNqMPcI=
+NodeupConfigHash: 1adoM5g8RUNJ67zEEJFP6vF9hd53GoFm5k7JMHef1Yc=
 
 __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 af7de162eb..55a47fb8de 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.privateflannel.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: G/5cgsF62oTYBsKSVrNgDdGOb1Oxo46UyhtU7xQN9Lg=
+NodeupConfigHash: J4Gf0utPR/kWHxp6nrzgkgIEezjf4pP+cAWzAvqYH24=
 
 __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 657e4b544a..5ade80d071 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
@@ -296,3 +296,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 51d5569657..f159a368ee 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
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 a0e12acfde..020c3b68f6 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
@@ -258,7 +258,7 @@ ClusterName: privatekopeio.example.com
 ConfigBase: memfs://clusters.example.com/privatekopeio.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: r5bx3cPyrGQbpz+y2h3darTaajC4KyGGlyggPmXwvo0=
+NodeupConfigHash: tufJzrMS9D05lbNFs68faA6BeSf5e/jDBFuSij7u0qM=
 
 __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 41b070e0bc..36a6700fcd 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.privatekopeio.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: xU4BtZ7xKyqWAaoZxW//5DzCjag3LkOAbEhsjjh5rNM=
+NodeupConfigHash: lDHNbpYixaLfjQ5L01+MLfh7H7WNFYyyYEeeV87c9p0=
 
 __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 6395eb12e4..4641707850 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
@@ -296,3 +296,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 9dca7957d4..b539acbeb7 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
@@ -62,3 +62,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data
index 106e3d904b..cd4ce67f97 100644
--- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data
+++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data
@@ -260,7 +260,7 @@ ClusterName: privateweave.example.com
 ConfigBase: memfs://clusters.example.com/privateweave.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: XcYHWLW61sNZUp0jugbs7rqyhJTMZ7trku2Q3pfA+ao=
+NodeupConfigHash: hxBY39lKI4eo119+5Wdid/+qy/X2MNMJUe4BZnz2C78=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data
index ff8f89cb26..b344d448e0 100644
--- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data
+++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data
@@ -178,7 +178,7 @@ ConfigServer:
   - https://kops-controller.internal.privateweave.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 3FjeQUCYKio6QnlUKdR4Fc+6yQXVZ69uVlF4b12t3gw=
+NodeupConfigHash: 2zpo3YGwUiYABue1lgLyAmznhfR9zvPyYJkF51jYcps=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 802f992040..52cce6d968 100644
--- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -293,3 +293,5 @@ etcdManifests:
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
+usesLegacyGossip: false
+usesNoneDNS: false
diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content
index 095125cb00..3a001c6af8 100644
--- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content
+++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content
@@ -58,3 +58,5 @@ containerdConfig:
   version: 1.4.13
 docker:
   skipInstall: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 921f575248..6d7bc68000 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
@@ -259,7 +259,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: IbbHZP32jTgVZ6XoSC1sQofVrL2azv9w+GB+LXeLpo0=
+NodeupConfigHash: oiGPzJUUmjMyrL/5MgIWB+8SA7Wb0fCZ+AzFdpwE5rM=
 
 __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 957ef4d1d5..d03ea8ac51 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: /7WqWX1GEPOSm5TY/KO4t9eRu+P84lfwSf7XQ70Okxs=
+NodeupConfigHash: EOgU4HX3sYLnU5Agg3BwBG12sY9Hr/SluIaQp66icgc=
 
 __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 665130bf1b..8d1e48b5a8 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
@@ -296,3 +296,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 c6db76110d..79f94c56c7 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 13adae215d..afa03a823a 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
@@ -258,7 +258,7 @@ ClusterName: sharedsubnet.example.com
 ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: d2xvWeVyzil3pnFhCTWVBsJTGQ/rdo98t1tXmYMGwD4=
+NodeupConfigHash: pUcfj3mLzZYXnq+YW04YVYJNHY3PNzr3MHf5F8Otkq8=
 
 __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 e7a61665fa..5218f411aa 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.sharedsubnet.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Zl+P5pEubDaifKd/jyuG+tVWOEcYdt5mkYDPF1xDvPs=
+NodeupConfigHash: gBmt5FOVljz3NBhRYmwJO9JfveJZXzuMBnWKhwT0c9c=
 
 __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 78303285dc..da6ec451f1 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 b21f0080dd..bec7a02392 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 c3d595a70e..097e82138e 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
@@ -258,7 +258,7 @@ ClusterName: sharedvpc.example.com
 ConfigBase: memfs://clusters.example.com/sharedvpc.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: psNs5fPbdslgihvrji55fVwdbqWR2H6qBBzylS1ArrA=
+NodeupConfigHash: MT0Ex2OTXXlOe7quhCuPCURxJk5L1VepeyuazWOQQ64=
 
 __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 22cc31647c..2765525e5a 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.sharedvpc.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Ro4V6IJLa6rjWBoYQin05894Qh31CipMhyvJd0bZm4I=
+NodeupConfigHash: POaxrGsrWHwC6/JGerTZK/3AVU/rlfOS7q4dw2JSzDc=
 
 __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 c165bd5474..559f0e5830 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 a84aed3e35..6e674e7aa6 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 54d70fdde2..002dedda60 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
@@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: x8uDhH+0WqupMx1Gpm18zGj3z3nUfKRQylg/qXUWrto=
+NodeupConfigHash: tzyDb8RW5zKmocwRToo4rtFUkyyMZyU+KK+J/Yhlflc=
 
 __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 fa699e81c5..3e453194e2 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal-ipv6.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: zJIAA6zcJYv2d7lnUPez+zjQi8m0FaE29B8Vspc+zVI=
+NodeupConfigHash: xkq6xvdWZJjO91MGloMgnbNQU+R0KylELTgwPQ0wvKs=
 
 __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 f527d6b1bf..0f28a30d18 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
@@ -297,3 +297,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 e204e2a8c6..25727553fe 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
@@ -60,3 +60,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 7cacf6f668..dcb79c3b27 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
@@ -258,7 +258,7 @@ ClusterName: unmanaged.example.com
 ConfigBase: memfs://clusters.example.com/unmanaged.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Th5z49Pq7FvfIbr2+n6xt963pauvHVAfPb9RLM732Vg=
+NodeupConfigHash: 6VlwmvUYvD0W4LqOIWQsBatD+XhBHld6SBjpeyGzM40=
 
 __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 803375d642..7e7fdc473b 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.unmanaged.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: 5OLdyfFhkNxAwTKiX2t/tsK/Oo/z4FzJKR7ZkX7kzEU=
+NodeupConfigHash: 1RtU/JPvDNJTdbhGfIkUC27+ReALmNbgQUJY65XX37s=
 
 __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 05cec2f99b..c472b06c4c 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 bc5e640b84..b9ad1cd638 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 7edfdcaef2..ce52ec1e72 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
@@ -258,7 +258,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 97K+ZmY992npJi04OEEF00Qd6KMNz/bTUCypZC/92TM=
+NodeupConfigHash: tIg8fDDEAvlXPcOasXAk2oBDV0H1yLxuAJDTY2id2yw=
 
 __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 50013c2188..b3856b118f 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
@@ -177,7 +177,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: QyB/m9nIsoOKrYyaEDWHSa1lQsS8uTqrbVhF/7cbw9c=
+NodeupConfigHash: jWZOrTE8Frz9AopOoJHcOUE60rC3duQ0hC775fuCX/Y=
 
 __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 c57f806ea8..a79911d2f4 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
@@ -295,3 +295,5 @@ staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false
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 014c3abb76..4eced620fc 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
@@ -61,3 +61,5 @@ containerdConfig:
 docker:
   skipInstall: true
 useInstanceIDForNodeName: true
+usesLegacyGossip: false
+usesNoneDNS: false