From 62f7faa4da79ae8fa303a066e666395985a72c07 Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Sun, 9 Jul 2023 22:04:14 -0700
Subject: [PATCH] Remove references to ClusterSpec.API from nodeup

---
 nodeup/pkg/model/etc_hosts.go                        |  4 ++--
 nodeup/pkg/model/kube_apiserver.go                   | 12 ++++++------
 pkg/apis/nodeup/config.go                            | 12 ++++++++++++
 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/nodeupconfig_0.txt              |  1 +
 pkg/model/tests/data/nodeupconfig_1.txt              |  1 +
 pkg/model/tests/data/nodeupconfig_2.txt              |  1 +
 ...a.masters.additionalobjects.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...piserver.apiservers.minimal.example.com_user_data |  2 +-
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 .../aws_s3_object_nodeupconfig-apiserver_content     |  3 +++
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-1a.masters.bastionuserdata.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...as-priority-expander-custom.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...sters.cas-priority-expander.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.complex.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...us-test-1a.masters.compress.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-test-1a.masters.containerd.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-test-1a.masters.containerd.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...ster-us-test-1a.masters.123.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...r-us-test-1a.masters.docker.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...est-1a.masters.existing-iam.example.com_user_data |  2 +-
 ...est-1b.masters.existing-iam.example.com_user_data |  2 +-
 ...est-1c.masters.existing-iam.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test-1b_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test-1c_content |  3 +++
 ...-test-1a.masters.existingsg.example.com_user_data |  2 +-
 ...-test-1b.masters.existingsg.example.com_user_data |  2 +-
 ...-test-1c.masters.existingsg.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ..._s3_object_nodeupconfig-master-us-test-1b_content |  2 ++
 ..._s3_object_nodeupconfig-master-us-test-1c_content |  2 ++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-test-1a.masters.externallb.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...1a.masters.externalpolicies.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...aster-us-test-1a.masters.ha.example.com_user_data |  2 +-
 ...aster-us-test-1b.masters.ha.example.com_user_data |  2 +-
 ...aster-us-test-1c.masters.ha.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test-1b_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test-1c_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test1-a_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test1-b_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test1-c_content |  3 +++
 ...-us-test1-a-ha-gce-example-com_metadata_user-data |  2 +-
 ...-us-test1-b-ha-gce-example-com_metadata_user-data |  2 +-
 ...-us-test1-c-ha-gce-example-com_metadata_user-data |  2 +-
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test1-a_content |  3 +++
 ...us-test1-a-minimal-example-com_metadata_user-data |  2 +-
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...est-1a.masters.minimal-etcd.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...est-1a.masters.minimal-ipv6.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...est-1a.masters.minimal-ipv6.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...est-1a.masters.minimal-ipv6.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...est-1a.masters.minimal-ipv6.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...y.long.cluster-name.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...1a.masters.minimal-warmpool.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test1-a_content |  3 +++
 ...est1-a-minimal-gce-example-com_metadata_user-data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test1-a_content |  4 ++++
 ...est1-a-minimal-gce-example-com_metadata_user-data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test1-a_content |  4 ++++
 ...-a-minimal-gce-ilb-example-com_metadata_user-data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test1-a_content |  4 ++++
 ...ery-very-long-name-example-com_metadata_user-data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test1-a_content |  3 +++
 ...ery-very-long-name-example-com_metadata_user-data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test1-a_content |  4 ++++
 ...-a-minimal-gce-plb-example-com_metadata_user-data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test1-a_content |  3 +++
 ...inimal-gce-private-example-com_metadata_user-data |  2 +-
 ...er-us-test-1a.masters.minimal.k8s.local_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...er-us-test-1a.masters.minimal.k8s.local_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 .../aws_s3_object_nodeupconfig-master-fsn1_content   |  1 +
 .../data/hcloud_server_master-fsn1_user_data         |  2 +-
 ...bject_nodeupconfig-control-plane-fr-par-1_content |  1 +
 ..._instance_server_control-plane-fr-par-1_user_data |  2 +-
 ...t-1a.masters.mixedinstances.example.com_user_data |  2 +-
 ...t-1b.masters.mixedinstances.example.com_user_data |  2 +-
 ...t-1c.masters.mixedinstances.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test-1b_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test-1c_content |  3 +++
 ...t-1a.masters.mixedinstances.example.com_user_data |  2 +-
 ...t-1b.masters.mixedinstances.example.com_user_data |  2 +-
 ...t-1c.masters.mixedinstances.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test-1b_content |  3 +++
 ..._s3_object_nodeupconfig-master-us-test-1c_content |  3 +++
 ...dsprocessor.longclustername.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...dsprocessor.longclustername.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...a.masters.private-shared-ip.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...sters.private-shared-subnet.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...st-1a.masters.privatecalico.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...est-1a.masters.privatecanal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...st-1a.masters.privatecilium.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...st-1a.masters.privatecilium.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...st-1a.masters.privatecilium.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...sters.privateciliumadvanced.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...test-1a.masters.privatedns1.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...test-1a.masters.privatedns2.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...t-1a.masters.privateflannel.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...st-1a.masters.privatekopeio.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...est-1a.masters.sharedsubnet.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...s-test-1a.masters.sharedvpc.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 ...est-1a.masters.minimal-ipv6.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...s-test-1a.masters.unmanaged.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  2 ++
 ...-us-test-1a.masters.minimal.example.com_user_data |  2 +-
 ..._s3_object_nodeupconfig-master-us-test-1a_content |  3 +++
 193 files changed, 369 insertions(+), 103 deletions(-)

diff --git a/nodeup/pkg/model/etc_hosts.go b/nodeup/pkg/model/etc_hosts.go
index 172bf2b45c197..06ca64e428afa 100644
--- a/nodeup/pkg/model/etc_hosts.go
+++ b/nodeup/pkg/model/etc_hosts.go
@@ -40,9 +40,9 @@ func (b *EtcHostsBuilder) Build(c *fi.NodeupModelBuilderContext) error {
 			Hostname:  b.APIInternalName(),
 			Addresses: []string{"127.0.0.1"},
 		})
-		if b.Cluster.Spec.API.PublicName != "" {
+		if b.NodeupConfig.APIServerConfig.API.PublicName != "" {
 			task.Records = append(task.Records, nodetasks.HostRecord{
-				Hostname:  b.Cluster.Spec.API.PublicName,
+				Hostname:  b.NodeupConfig.APIServerConfig.API.PublicName,
 				Addresses: []string{"127.0.0.1"},
 			})
 		}
diff --git a/nodeup/pkg/model/kube_apiserver.go b/nodeup/pkg/model/kube_apiserver.go
index 94d04d7570423..3f9ddff37467c 100644
--- a/nodeup/pkg/model/kube_apiserver.go
+++ b/nodeup/pkg/model/kube_apiserver.go
@@ -398,11 +398,11 @@ func (b *KubeAPIServerBuilder) writeServerCertificate(c *fi.NodeupModelBuilderCo
 		}
 
 		// Names specified in the cluster spec
-		if b.Cluster.Spec.API.PublicName != "" {
-			alternateNames = append(alternateNames, b.Cluster.Spec.API.PublicName)
+		if b.NodeupConfig.APIServerConfig.API.PublicName != "" {
+			alternateNames = append(alternateNames, b.NodeupConfig.APIServerConfig.API.PublicName)
 		}
 		alternateNames = append(alternateNames, b.APIInternalName())
-		alternateNames = append(alternateNames, b.Cluster.Spec.API.AdditionalSANs...)
+		alternateNames = append(alternateNames, b.NodeupConfig.APIServerConfig.API.AdditionalSANs...)
 
 		// Load balancer IPs passed in through NodeupConfig
 		alternateNames = append(alternateNames, b.NodeupConfig.ApiserverAdditionalIPs...)
@@ -745,12 +745,12 @@ func (b *KubeAPIServerBuilder) buildAnnotations() map[string]string {
 		return annotations
 	}
 
-	if b.Cluster.Spec.API.LoadBalancer == nil || !b.Cluster.Spec.API.LoadBalancer.UseForInternalAPI {
+	if b.NodeupConfig.APIServerConfig.API.LoadBalancer == nil || !b.NodeupConfig.APIServerConfig.API.LoadBalancer.UseForInternalAPI {
 		annotations["dns.alpha.kubernetes.io/internal"] = b.APIInternalName()
 	}
 
-	if b.Cluster.Spec.API.DNS != nil && b.Cluster.Spec.API.PublicName != "" {
-		annotations["dns.alpha.kubernetes.io/external"] = b.Cluster.Spec.API.PublicName
+	if b.NodeupConfig.APIServerConfig.API.DNS != nil && b.NodeupConfig.APIServerConfig.API.PublicName != "" {
+		annotations["dns.alpha.kubernetes.io/external"] = b.NodeupConfig.APIServerConfig.API.PublicName
 	}
 
 	return annotations
diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go
index 08cca697f5237..ff1e6b9de3ebc 100644
--- a/pkg/apis/nodeup/config.go
+++ b/pkg/apis/nodeup/config.go
@@ -170,6 +170,8 @@ type StaticManifest struct {
 type APIServerConfig struct {
 	// KubeAPIServer is a copy of the KubeAPIServerConfig from the cluster spec.
 	KubeAPIServer *kops.KubeAPIServerConfig
+	// API controls how the Kubernetes API is exposed.
+	API kops.APISpec
 	// Authentication is a copy of the AuthenticationSpec from the cluster spec.
 	Authentication *kops.AuthenticationSpec `json:",omitempty"`
 	// EncryptionConfigSecretHash is a hash of the encryptionconfig secret.
@@ -298,6 +300,10 @@ func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (*Confi
 	if instanceGroup.HasAPIServer() {
 		config.APIServerConfig = &APIServerConfig{
 			KubeAPIServer: cluster.Spec.KubeAPIServer,
+			API: kops.APISpec{
+				PublicName:     cluster.Spec.API.PublicName,
+				AdditionalSANs: cluster.Spec.API.AdditionalSANs,
+			},
 		}
 		if cluster.Spec.Authentication != nil {
 			config.APIServerConfig.Authentication = cluster.Spec.Authentication
@@ -306,6 +312,12 @@ func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (*Confi
 				config.APIServerConfig.Authentication.AWS = &kops.AWSAuthenticationSpec{}
 			}
 		}
+		if cluster.Spec.API.DNS != nil {
+			config.APIServerConfig.API.DNS = &kops.DNSAccessSpec{}
+		}
+		if cluster.Spec.API.LoadBalancer != nil && cluster.Spec.API.LoadBalancer.UseForInternalAPI {
+			config.APIServerConfig.API.LoadBalancer = &kops.LoadBalancerAccessSpec{UseForInternalAPI: true}
+		}
 	}
 
 	if instanceGroup.HasAPIServer() || cluster.UsesLegacyGossip() {
diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt
index dd34e061ed6ee..f9ac38290b007 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: GCb0jNcXtzAVnSqH0rScr4llsImDfK0RqOqboVMhYa8=
+NodeupConfigHash: cfESNiGdHk5bVuUZZ7h7LLEpaAs2yzSv2frMh7V0vRE=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt
index 4bf4ee5774414..865ba884e92a5 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: ZNmdyE6YmlQsLd6NT8zrQ+0/sS2A72fpwA0C5LRsPLw=
+NodeupConfigHash: gZIjP/+m/3G/gxExW307TetMn6jPY2zSaXMZcPuBtl4=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt
index 4bf4ee5774414..865ba884e92a5 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: ZNmdyE6YmlQsLd6NT8zrQ+0/sS2A72fpwA0C5LRsPLw=
+NodeupConfigHash: gZIjP/+m/3G/gxExW307TetMn6jPY2zSaXMZcPuBtl4=
 
 __EOF_KUBE_ENV
 
diff --git a/pkg/model/tests/data/nodeupconfig_0.txt b/pkg/model/tests/data/nodeupconfig_0.txt
index 6730f13099c9a..49360cc4bfc1c 100644
--- a/pkg/model/tests/data/nodeupconfig_0.txt
+++ b/pkg/model/tests/data/nodeupconfig_0.txt
@@ -1,4 +1,5 @@
 APIServerConfig:
+  API: {}
   KubeAPIServer:
     image: CoreOS
   ServiceAccountPublicKeys: ""
diff --git a/pkg/model/tests/data/nodeupconfig_1.txt b/pkg/model/tests/data/nodeupconfig_1.txt
index f3156f640c679..42fbe0aaf0094 100644
--- a/pkg/model/tests/data/nodeupconfig_1.txt
+++ b/pkg/model/tests/data/nodeupconfig_1.txt
@@ -1,4 +1,5 @@
 APIServerConfig:
+  API: {}
   KubeAPIServer:
     image: CoreOS
   ServiceAccountPublicKeys: ""
diff --git a/pkg/model/tests/data/nodeupconfig_2.txt b/pkg/model/tests/data/nodeupconfig_2.txt
index f3156f640c679..42fbe0aaf0094 100644
--- a/pkg/model/tests/data/nodeupconfig_2.txt
+++ b/pkg/model/tests/data/nodeupconfig_2.txt
@@ -1,4 +1,5 @@
 APIServerConfig:
+  API: {}
   KubeAPIServer:
     image: CoreOS
   ServiceAccountPublicKeys: ""
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 3b6a854ea5505..673db3be7bde6 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
@@ -259,7 +259,7 @@ ClusterName: additionalobjects.example.com
 ConfigBase: memfs://tests/additionalobjects.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: oyi0g5mOAZ/GaGGcsrTZO72NsCJFjJavIKue+IOkW/A=
+NodeupConfigHash: yfocVAU4NKoXOhCdBgF6uiXu21a3xAhbPgv5c1QYnH8=
 
 __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 020dd72c9b903..ffb67664a55ba 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.additionalobjects.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 ab14870de2f6c..90985b21e266c 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
@@ -153,7 +153,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: apiserver
 InstanceGroupRole: APIServer
-NodeupConfigHash: PWoLV0n5BXdHt+IXY3lx73jt/CbT6t4GFHAhW6XsJXw=
+NodeupConfigHash: Y58Bik7rUJfbwq1WNriHF5cJT/TupqllK/ouiBn+ihM=
 
 __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 1de17e7a4442b..cecc9640517c5 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
@@ -247,7 +247,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: eqz+91ktDxdS8bg3Pu3LXKD0crf87N54bl8hPed6uEc=
+NodeupConfigHash: uOQK6YBGDbfHNEFwNSKXG8GD7COvNbURPvEtnr46Uxk=
 
 __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 b28e65fdd9d1a..7dc07387dd229 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 fbb521fc7e44a..4f167450a5cd9 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 796b04945ea22..e22047c3c9183 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
@@ -252,7 +252,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: DfaKflY87UmuAKrFMGZ//l9Lcwnme+Ans5rfG9aLzzM=
+NodeupConfigHash: Xa54EBSBrx06PU9tbqmGiUghc5YZDirV4WrHn6J1a8U=
 
 __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 04f0555b40d92..b2f7f71d1b995 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 fac10d48cc3d7..7e35e8debf2f2 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
@@ -252,7 +252,7 @@ ClusterName: bastionuserdata.example.com
 ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: mjEx2K5Ybwv0+x1YMnKdWsYGn5t7qBZWBoORkWJ7B1Q=
+NodeupConfigHash: gfbUe2i6/fXdumDdBCgj0jkog5V90Rxn+h7J3r3Wf5c=
 
 __EOF_KUBE_ENV
 
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 26e6df0ea08f8..9c6df6f7e84a7 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.bastionuserdata.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 2a9a2558fe71f..988e8dfe66962 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
@@ -250,7 +250,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: 0QWkxW3Vr6PUtzprxrAQ4iTWPo80jbQix9IAFrLHnRs=
+NodeupConfigHash: had0Rdq8zWTup9cSBapCcU2zsDv2HknFN2hThJbWxB8=
 
 __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 c5912322260f0..b6ddec2ee831b 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.cas-priority-expander-custom.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 a2f3f07b1df40..fe233d3c7a62f 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
@@ -250,7 +250,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: NoUGt4lv5jODIs8UcIk+sgyzOhxGwfRKEi5EMfXW0j8=
+NodeupConfigHash: MNAfxvBzNuLLrX5gW/yNI2FRTGYJ8oenV3FKFiWaBow=
 
 __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 4fc9e20a3b3e1..788aea3c62bab 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.cas-priority-expander.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 a0ed76475bf96..f03bd07082206 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
@@ -267,7 +267,7 @@ ClusterName: complex.example.com
 ConfigBase: memfs://clusters.example.com/complex.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: cNloBK/3TsTihoCnSsS0/tA1jUTT3u566K3IazjRfRI=
+NodeupConfigHash: V3z1n541Tviy++WJN2NqfetmXO50s1yAfQ3TcYgfhMI=
 
 __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 bb02bbbf28063..68b3467fb3090 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.complex.example.com
   Authentication:
     aws: {}
   KubeAPIServer:
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 655e0d6d39d7d..b9b07ec078162 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+qJ3tWQ1ad9V6I1nd43XOvPsZNktTR7LnClSOySVeL9+OKRkO1/DhmLFLooAsXS+eD6e81BC2yAn1mxUVQ4Yq7nhFay8RV7BRHPnwJXMY4ABGIH7xitrOnNmgtYD8EJOdHAe0FEEaMH4+NRHw/TC2JqLXWiW4MFQmCnfu5K9G0VtC+iUNSU7y95k72ImynxplF1Yw3gxWwG2yZ9rbW8XqFqloQLZVcYYN9bsaxvcOPhtyTZcuyhu1DhIBUZArGjIKCIa8OAy14pMwoYH7ZNpOmZig/ElK0gW/Nai+oNTnnMroWRjfcv3bkxpDBhbKyPHUiI4V7JRFv8GjMWZLNC2SgKWDO48oOGammv4WsNY1spRnQsdKmW61C55Da7hAj6rDYi90BDFn1Wt/JKbCjC+U5ZKwFgISjSKpqmK06mfyq+sBow1rEBYI5NyHjz3ylSHZG5gvbV2F5W/cK3k8+pLK2EJzqMSFDbKluBsQAE/B+s5leqFTB3t6tt637gyz4vX/4+dKsrz0ai4b/lTC4hK9tPKExj/96Tr6wFjG+A+IHzkHjrITlazuapSueObVcleEEReRN3MXCFAavr4ZnVtECpFwD+xUjWvoGRJg/ts953LlM0JN0PeKJeg2BbZ67dx1qTQ4BcIG0CEHg5X+6YvYmbS+GeL+HphnTe8TsP9cHei07b6DC3oklFpCL8HcH4LXAJGwIGMEElReVUhVNxbfGj74c4jv4iPlJW6611+HS6hth6G0WL40O8j2tAkv4cOUfXQ/tpR6jU87ULaAWMOREBYWPQlOz8/i5JT/M6cC9T/fsK8UZnqGpYJWzfUzAzueN1oIMGjCD/efFpdL2f/IERuGzBK5m2R/3a7c8eIHQ3OFnHdSlaMRtnbc0JcXsTU04J9z8UOjCwjcM8iSU2s8Wi1BpwfyY7ISnAPtC2T2XTpjnTlPRfbKdD/Je2kUBpWeyMWgMrKkhX1yP0lkYiUKoVNeb57m/IsjkpCS8meaaKId0BAmNAZSxtogw7E+XX3Shy6N+zviuOC6QRqDZFqUjInskNP729PcHCfKCcIki4crvsx0NErsQUZdJrX1y3aHY7+slo7AiqfvwVFRes7RUXMxdzeeajlQb601pcs/ztom16uTpaiGJ1obLzu+9eMgH+876awDlWlTHXBjdTEFX0h0KYb5IKjLFkNtcV9xluuNPm9L0ajuXplrISNuyd+2QsV/bofEOD9m5evYr8fmfbSe7b/yrxpFmmxFpwmkLccc63WeTek/GjwCLGNlTOzQU5UwpUBnD0NnoYHB+VZ/MZqrJxzozbgfHcgeJEfv3HyutMSmTRoPQj/iXS6+zQ4TqKvptsIat5B57bBS3trPiIX0FPUWWSoJ1QTVF4JrhdWOoKLG9ScIn/6BtRvQP1vA/VPAAAA//8BAAD///QUjT9NDQAA" | base64 -d | gzip -d > conf/cluster_spec.yaml
 
-echo "H4sIAAAAAAAA/2zOy07DMBCF4b2fwi+QGlBpkSU2tSouoWkEiMtysCcQsD2WxyY8PkJZRWL/fzrHeKquz/Q9OsxawsTC+MoFcwcBtbQUUkbmFf5ASB5XloIwFIfxfQeMWgYMA2ul7KwWofpX30QuEC1eZappXgnwZ5vKTUEuzSkso3vyqKWhWDL53kNE0ZHDmuYj18AfWsKtfWb7eH7yNb08HQ+vb+N2bTbr3dRuHrbd51m7P7RO+Yvj3f5S/AIAAP//AQAA//9FlrBE9wAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/2zOTUsDMRDG8Xs+Re6yjfUgNeDFCGahlkXEQ29DdvqimUyaSdr67UX2tND7/8fzuMhtHAqfjyMWq+EiysUmFcsGCK0OTLmgyAKvQDniIjApx2l33L+AoNWEtBNrTJjULDQ3dZ+kQgr4VrjlaYXg33ZNuopSuyXMow+OaLXjVAvHIUJCteERW56OeJCD1Ubutof9a0C/7suyPvX36XtLl8/39rB6/PXXs/86DeufFk+rZ/UHAAD//wEAAP//X2yYCvcAAAA=" | 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 e75483d59f8b8..5e702682adb71 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.compress.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 ee552605d0e4a..5fdfc5641e9b1 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
@@ -252,7 +252,7 @@ ClusterName: containerd.example.com
 ConfigBase: memfs://clusters.example.com/containerd.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: M8eJSK74gm1DVgZdbXfSfieaCHiMS1swoLeVi9ob6mo=
+NodeupConfigHash: 3rVN+OZgm7FvGcWJDn3rI1KMuEHYNNXmQ6WUgOpW0AY=
 
 __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 83c5b138ae388..cf04e3267d12c 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.containerd.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 702734375047e..511a4c1c6379b 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
@@ -252,7 +252,7 @@ ClusterName: containerd.example.com
 ConfigBase: memfs://clusters.example.com/containerd.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: mL0CgZH+RQQdMpSzJHSeBoYc0/KZIDb1EncRcf0L3hA=
+NodeupConfigHash: Wp5hOpXiOLMan4ZTNa5X29sqSgazYLa/pNnpWfrHbPM=
 
 __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 8ef39cc4bbab2..6ca43c1765dae 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.containerd.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 bfd825373566b..b087b8d91ffee 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
@@ -252,7 +252,7 @@ ClusterName: 123.example.com
 ConfigBase: memfs://clusters.example.com/123.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: iEB7Ln5BIw81tqpNIz3OANdpuvecdKzzwX840Fdv1es=
+NodeupConfigHash: 90mv+O/BzaB/D97sFBTlWNdlxv+2WGz+yUxC9QCq4+w=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 284e09af68d99..66ad7ae6b6f22 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.123.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 67962dc2ef00a..e586d074ac1ed 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
@@ -255,7 +255,7 @@ ClusterName: docker.example.com
 ConfigBase: memfs://clusters.example.com/docker.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: B4rKa5UHBPimd0zJlarGgvyZOYJt4DbnnE3JA6+LI+Y=
+NodeupConfigHash: fuBKpDs424ZgKFE6erJ9RNsTx/5mml9S9vjHhVLxuFE=
 
 __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 45ea236b889fa..ff0062291e8f6 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.docker.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 50cf9f71d92ae..fc55c9fa7eb34 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
@@ -252,7 +252,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: egWYlOz3Z0EC9KSGqYKtFzGTsXtFAeYsn5GCORfBz04=
+NodeupConfigHash: gaQc0sNrFTZYaa4K5DaPklquYgBbxuSp47KR7OhzpCU=
 
 __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 b3042329f8a59..1c00541855f54 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
@@ -252,7 +252,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 049S+Di0UZNVXFYKP1rWeyYoBEUUIyUZRqRVtGWRGQA=
+NodeupConfigHash: tsJssXnQR9Eu7CJ9HQq94PXSaQxN6klBZjJ2CY0XGq8=
 
 __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 6fdfb5cad2e92..a8652840baeb1 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
@@ -252,7 +252,7 @@ ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 2BpUwPjNDKcro8FnkbedILsu4B2E9Yw4s+3XuDjZLFM=
+NodeupConfigHash: KvSh9DYMGifuQSnL9NlxdfGGQO5SxkrEtK32p06/sqA=
 
 __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 152de84583aee..86bbefb72d321 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.existing-iam.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 9368a8f8f818d..8040b23c72390 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.existing-iam.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 bb7bfd5e09732..b6fe0218c7a95 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.existing-iam.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 a9869c3df6f26..361fd6ca8fabc 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
@@ -252,7 +252,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: b0yB6njvl9fK69k5+Tl5eoZsgzoithdFmslPxFedxMk=
+NodeupConfigHash: Cqy2la5mOGUsFqf5UI9w3vpcezoqvQq16ZOsvWKWI6I=
 
 __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 458929783ee24..5ea6f9e9a6c94 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
@@ -252,7 +252,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: ohty4ITWVRZJN7K5P5dslNUtSg0FkS/UgvVJlJblUv8=
+NodeupConfigHash: hhgRsYj1ghb8NMKCaYX6lnvvC0c0MAtrucD7RmU7ts0=
 
 __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 3d180277b30ab..fc550015e5517 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
@@ -252,7 +252,7 @@ ClusterName: existingsg.example.com
 ConfigBase: memfs://clusters.example.com/existingsg.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Cu7mP7u7vmOAouEw5NLyDeg7uqYJZILDzgmyVwUr3SQ=
+NodeupConfigHash: T3HXSN1X12fHrr5VNS0EM9pKJ35XvU59cy9f5alaevA=
 
 __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 c3052a2fc2c4a..eaa42aba6a2c2 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.existingsg.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 5a455c5073bcd..e74940802ca82 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.existingsg.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 9667b25e8f38d..8f73c6842944e 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.existingsg.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 0624dbfea4e93..497d58a588509 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
@@ -252,7 +252,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: CcTwkgwAzn4wcJrP+6nmYq6IZJ58ka4Z84WwinIk3I0=
+NodeupConfigHash: Yf24FmLjefTw2xz1JuTWe+FFCOrng+x1sfWcLEKevY0=
 
 __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 15589fb934c28..27cd632f4a65d 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 796b04945ea22..e22047c3c9183 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
@@ -252,7 +252,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: DfaKflY87UmuAKrFMGZ//l9Lcwnme+Ans5rfG9aLzzM=
+NodeupConfigHash: Xa54EBSBrx06PU9tbqmGiUghc5YZDirV4WrHn6J1a8U=
 
 __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 04f0555b40d92..b2f7f71d1b995 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 419f1baf2fdab..885c0fa7f4984 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
@@ -252,7 +252,7 @@ ClusterName: externallb.example.com
 ConfigBase: memfs://clusters.example.com/externallb.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: TtMrqZcxn/81EzcGX8nMLY+d/m6xiYoxFwQdEw8EEV8=
+NodeupConfigHash: Sim3IHveAzKH8iGgCFEzfJSVvAmWpYg2kUGIWIv9spM=
 
 __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 c1d1bae2f4ffd..a4edd6efc2f4d 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.externallb.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 f94f575dfa87d..a0da54019a5e9 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
@@ -254,7 +254,7 @@ ClusterName: externalpolicies.example.com
 ConfigBase: memfs://clusters.example.com/externalpolicies.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Ls7wjfJXPUjjEaRqQ92ytpZ1G9P2ET3kECUB8KNkFfk=
+NodeupConfigHash: Xey9KZencFdAf5Hbhb5mYmyPJu+yjOpWao08rTfEhtE=
 
 __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 9af0bdc9701a2..71954f4f3df78 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.externalpolicies.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 ba835c3c0aaaf..09831792ff086 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
@@ -252,7 +252,7 @@ ClusterName: ha.example.com
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: FbXFAEfSdtRchzoiMcdpsCpIogjtmwb2YV2U5q3LiPE=
+NodeupConfigHash: Hbrft9KQcvdMho3CKT9LP2UfppLVCPxxkkdpP273m50=
 
 __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 bac46d611d75d..85913cf94bcd4 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
@@ -252,7 +252,7 @@ ClusterName: ha.example.com
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: iXG+AN/N9WvwkZYHu0M7F1DDKthKyAACoL7ty10WHuA=
+NodeupConfigHash: 8klyPiWTcTiENRkufDU+jx9Kux7PpfDT6KVflPtKdtk=
 
 __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 d6c5dc3c8480a..71d4d7a522407 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
@@ -252,7 +252,7 @@ ClusterName: ha.example.com
 ConfigBase: memfs://tests/ha.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: lxyRC09AAH52n+TGoyTNL+IBb0G6pqki7kMq0wSpGuw=
+NodeupConfigHash: BexifdTTgROHJypU5KWYMNl6R96SkGC/MOCmkEH2CiE=
 
 __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 fdd0677dab29b..187b9db07fa1c 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.ha.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 aa02f1814e448..2f0bdb481627d 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.ha.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 afe015d629b3c..72c49a7194bde 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.ha.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 00bc47b781d9e..5bead311bb22c 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.ha-gce.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 aef921f4bd436..e0b31efd1fcfa 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.ha-gce.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 8f4ac50c71d56..cb212c3a5d1a9 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.ha-gce.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: false
diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data
index 361d196815302..ad21f7427c8ed 100644
--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data
@@ -242,7 +242,7 @@ ClusterName: ha-gce.example.com
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: ZcQAqIP5pVRyBVug/TW63Lk4mUB8k43SVU6AeK663gc=
+NodeupConfigHash: MGt3RCdbtYXWRvdwryYUo45u/YYmGW0x1AHMk3nLmck=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data
index b6844d91e845d..45cad408a92d2 100644
--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data
@@ -242,7 +242,7 @@ ClusterName: ha-gce.example.com
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 4gaMIWU6Rbwxfe0N7HVyPNnFWYRp1QV/AVjn/VgYUXc=
+NodeupConfigHash: ylabGJLp1C/uuTOnaDcqfIp67YUS91Qwz8B0zgbcA5M=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data
index 7f354421cd8cb..b33abf3ca3ec6 100644
--- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data
@@ -242,7 +242,7 @@ ClusterName: ha-gce.example.com
 ConfigBase: memfs://tests/ha-gce.example.com
 InstanceGroupName: master-us-test1-c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: KOC9exX1t4FCY8ln2FCTI+ara9HernwTs/rltSDzhMA=
+NodeupConfigHash: LIAO2s4g5aB3QFWdIvMs50MjLf8aAnMEVIdqE8AbAso=
 
 __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 796b04945ea22..e22047c3c9183 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
@@ -252,7 +252,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: DfaKflY87UmuAKrFMGZ//l9Lcwnme+Ans5rfG9aLzzM=
+NodeupConfigHash: Xa54EBSBrx06PU9tbqmGiUghc5YZDirV4WrHn6J1a8U=
 
 __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 04f0555b40d92..b2f7f71d1b995 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: false
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 fe98a3710a609..67b4d1de6c0cb 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
@@ -252,7 +252,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: HB40NGq8es7y6+kYT6SzxCHO3tfW/AApAkdv6SHrb4g=
+NodeupConfigHash: SY2kufH7c2HEJfc1QPXpfDRVe5pCpXcW6XjayDtsnA0=
 
 __EOF_KUBE_ENV
 
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 5c76961b419f2..0f29213ebb67e 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 f58205d8150c3..363b5e1274d0e 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
@@ -253,7 +253,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: rZ6RVWavd7OV5/j2+tBLdkdK1D2bzEUesyU1Bx+sMnI=
+NodeupConfigHash: LUPv7mQsjVadx4WrNJ+AeHhj0oyOZmFX04qVOIGP7Yo=
 
 __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 dc80dca2a1627..2c89ad017ebda 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 21a7ec36f8c9b..a739a4ac78130 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
@@ -255,7 +255,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 8bXUDBN8oDp7KOvDrKM0DTHg6w4E98egZbqdfm0Zq9o=
+NodeupConfigHash: NyytsYbUcOGgUymb4/LK+oxbTfUrWibhdQe4ZLh7w3o=
 
 __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 855d11acf87fe..8a692e017816a 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 864f566d3a537..d1109422eddc4 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
@@ -253,7 +253,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 307jSCj6OYd0UHy5j/2E33K4Bko3/ia/zP1SwQ2i6kc=
+NodeupConfigHash: qN/GwJqy0j5JVxKjo5TX02qk67HCh3SRhg22yZHXxpw=
 
 __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 1c6f9731d01c9..639dd58ec7b41 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 3c3d6aae88d9b..94aa085e85ae2 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
@@ -253,7 +253,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: JUGToPDpcibHcyeIWfKYIq89KegCyyXAKv0+XGXPfFY=
+NodeupConfigHash: VPGiNrJgSjrowr+pLk8VuOBzKxyCnn7cixuIOEgtDFw=
 
 __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 5f9a4dcbd15f9..33c7030202e68 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 5f6df460ea917..b8ab5b6c73c93 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
@@ -253,7 +253,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: aRp7puWLIxVPNngAzKoQ5S2SrPOUFWJTPgFCSufmBX4=
+NodeupConfigHash: wrqNChjL+zyjNgjv4B+2/hOtpvlRP4aFG7PiUd64XV0=
 
 __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 30423dee64703..e14a1f654b19c 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 668e2fd67d667..1eeb0c0ecc913 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
@@ -253,7 +253,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: /zjy6DoRGLSJQorIGau0uORTLPLq0Acf8uCGp9v8DTw=
+NodeupConfigHash: g0nJmhk0OEcVTXrpDeyZBIdGIrHm1Rlse4E/0zkxnGU=
 
 __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 4f0972cecaf8b..4333b6ff35a8b 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 63f32e6949ebc..385a7ed2e5ee5 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: false
diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data
index 8b811cecb09e5..d1cf100805de2 100644
--- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data
@@ -243,7 +243,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 42pY30jvbUjyevyabEkevx5jis3pDCep6Czs7KmrTTk=
+NodeupConfigHash: XalL/KZE9f3dD8FXaw/7S72xAohpatza8MDcYSG64Ss=
 
 __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 668e2fd67d667..1eeb0c0ecc913 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
@@ -253,7 +253,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: /zjy6DoRGLSJQorIGau0uORTLPLq0Acf8uCGp9v8DTw=
+NodeupConfigHash: g0nJmhk0OEcVTXrpDeyZBIdGIrHm1Rlse4E/0zkxnGU=
 
 __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 4f0972cecaf8b..4333b6ff35a8b 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 d3c913da0e882..d72a0c0b233a9 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
@@ -259,7 +259,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: zpQADfYPuMopWvx7zwGAiGGoWDzG0ZZEXtYi+njIqvc=
+NodeupConfigHash: HZP3IE0G8Rv9V3WF/nRhyIhA+/SgMEgMS6MYu0fkXfc=
 
 __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 2840a6e4cdb69..184af55683cf5 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 2689d36996451..cd3ff0db6c113 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
@@ -256,7 +256,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: IlIQMbnnilXOBrxHOlD5peJpCA9/boNmnFTUaDk8d2w=
+NodeupConfigHash: 407Irvc4ALYBmWiuSQFqTpolcmrnxUMsxe/CUad5dk8=
 
 __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 ab38a07da12c3..a7dc166d1cd2d 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 40ac76a66c860..98d752c556b1f 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
@@ -256,7 +256,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: iPIYVnHV3VGUE6wQicukCu7+UKiIZx5ByKQ/9M2hbBE=
+NodeupConfigHash: yZYwn4cLjzIBhrpy1ywRFaaajCB9w/l3mZ+K99Jvt+I=
 
 __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 fb4125a29d1c2..a122847fc439f 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 a8e94fcd37f9b..a8b307d1dd34c 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
@@ -256,7 +256,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 6t/GWNntsnf1AlLasg6TBeppMaH2NVg4NUik3SznZvA=
+NodeupConfigHash: Sc2l0gZrBgAjnvz6CiMaZZWMpKxJcKOxxCN0swj2aeA=
 
 __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 e2406b164c12e..dc55802908c26 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: false
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
index 2b9156a6c107b..f72bd86e5100b 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -251,7 +251,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: uQmaxBDLrA6ekU6l0Yxl2IS3G5+JQJx4fqkC5/ZkqWY=
+NodeupConfigHash: rrSp9cdqeeSLMm1ERes/TA4AA41IOu8p+micJ73l3zg=
 
 __EOF_KUBE_ENV
 
diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
index 94efe08f3c721..47a3aa7b3a84e 100644
--- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
+++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 ac135706e7bc4..33575291bfc81 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
@@ -256,7 +256,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: fNjrWZlEy2F0+wcQPDAqSrbSOl8xlBxY2K/9i1kv5EQ=
+NodeupConfigHash: OmEFX9ah/c/5m8sU/deT0cxvQHO7GNKIsG0cX8MXjGg=
 
 __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 fa39732e4347b..f9befd2a4cc05 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: false
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 2fd60644aadf9..3c8a31cd22eb7 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
@@ -264,7 +264,7 @@ ClusterName: minimal-etcd.example.com
 ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: oISD1zRZMir+06/2Hw13WWwCfPvnHOTzVwbRlDPZEoY=
+NodeupConfigHash: 2Y/8tszsUAEOr7SarSI0hUohAAhzK5RIUcID8nB0UFQ=
 
 __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 9c82e3752a15b..7ca9663b96a96 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal-etcd.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 3a9e98f8baef8..14997614edbb0 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
@@ -258,7 +258,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: CcTwkgwAzn4wcJrP+6nmYq6IZJ58ka4Z84WwinIk3I0=
+NodeupConfigHash: Yf24FmLjefTw2xz1JuTWe+FFCOrng+x1sfWcLEKevY0=
 
 __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 15589fb934c28..27cd632f4a65d 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 35226a4779bd7..cd00844e6bc3f 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
@@ -254,7 +254,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: wQmqMo5nckX3lcvPTtuyBIIiZngji+sdROxEVj9KrxA=
+NodeupConfigHash: HPwnN/7nLq2Yu0fXkFVPfq7cU06WdG8SDVFt8pfVuwU=
 
 __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 8fc41b5433ba8..30d4b222a51a5 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.minimal-ipv6.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 4a0c2782e3056..86f2c1cc23695 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
@@ -254,7 +254,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: AaHEMCqR1vO/F81lpqM1P/XS4RMkGW7gU7xW9uYsPME=
+NodeupConfigHash: ExYqBFjWrtrm3XarqwPq/9WisORE2ROLlkmI2j3+3OY=
 
 __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 ee3794f3d8a4f..2984788a95754 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.minimal-ipv6.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 9dd528956bd6e..fafd69377d145 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
@@ -254,7 +254,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: JHPpfbsIPJTW0SP5UW6NvuEJ/h2i8tdpIXSqfezNDAk=
+NodeupConfigHash: iE9Q1GNfvMy6Uk/qFn0s3u2NvLopq35eVL7owM93tQE=
 
 __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 a559bbcaa7e4b..cb48490aeed6e 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.minimal-ipv6.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 9dd528956bd6e..fafd69377d145 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
@@ -254,7 +254,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: JHPpfbsIPJTW0SP5UW6NvuEJ/h2i8tdpIXSqfezNDAk=
+NodeupConfigHash: iE9Q1GNfvMy6Uk/qFn0s3u2NvLopq35eVL7owM93tQE=
 
 __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 a559bbcaa7e4b..cb48490aeed6e 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.minimal-ipv6.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 ebd6511e44abd..683d6480aa23c 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
@@ -250,7 +250,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: 7q+QZYqAxtyVkoVfE2mYSA5fqApfkreAAcSQ2mZZgWQ=
+NodeupConfigHash: F6wZepW+wvutIqWACFsgtkbGycChB9fX+rjuf+2T8wc=
 
 __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 d3c6168fe00da..2d730ffdb9c6c 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.this.is.truly.a.really.really.long.cluster-name.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 54b9fdd7099d1..3c49c4ed49b2c 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
@@ -252,7 +252,7 @@ ClusterName: minimal-warmpool.example.com
 ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: xOZ3B8wnlnKtr58wVR/LeI5N00SY6xInI4RdNngMeQ0=
+NodeupConfigHash: VbTtewq+v2psQSOoWNPS23wszaGq9o+30He8i5PmcXU=
 
 __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 252a98dc507f7..8d63eb6bb3be9 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal-warmpool.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: false
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 f526755ddd640..5a32b538efe30 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
@@ -245,7 +245,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Fpnr65NWckLM46Jjfpf5NOia6oLMjoIrxg6dv04NTFU=
+NodeupConfigHash: 5r+bo9KogqEGbgVDXLlzms5lYe+6wPMTs/YLSQ26k4Q=
 
 __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 c5302677e4e58..6ea015bfe3a24 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 b03760976b6bb..433c2759e347a 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal-gce.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: false
diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
index d0e2463a7f16e..9b8baf9be70ab 100644
--- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
@@ -242,7 +242,7 @@ ClusterName: minimal-gce.example.com
 ConfigBase: memfs://tests/minimal-gce.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: A129imrAo4mFxX+l2zZ8EBGD6lWhhZO0nfGzqyqiFIw=
+NodeupConfigHash: OYu2sg6TGwGxLVxj12GupO1NSWcuz0qY7yvlhPq5FTs=
 
 __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 f08a796e2d67c..fcbd43b373418 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
@@ -1,4 +1,8 @@
 APIServerConfig:
+  API:
+    loadBalancer:
+      useForInternalAPI: true
+    publicName: api.minimal-gce.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: false
diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
index cc56a1be62a14..7d1763ddc1444 100644
--- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data
@@ -242,7 +242,7 @@ ClusterName: minimal-gce.example.com
 ConfigBase: memfs://tests/minimal-gce.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: tv8bxYz1hCsk9K+bsU6IOETGMCLNoaPXKHcH+5FtE2M=
+NodeupConfigHash: LaRVYDY7/ez+QRpjJedYHMEqdjyWXne+InMryW20XAU=
 
 __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 348e5f44dd6ee..7a7ce374f658f 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
@@ -1,4 +1,8 @@
 APIServerConfig:
+  API:
+    loadBalancer:
+      useForInternalAPI: true
+    publicName: api.minimal-gce-ilb.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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_user-data b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data
index d84aa84e657ed..67aec31b4fe17 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data
@@ -242,7 +242,7 @@ ClusterName: minimal-gce-ilb.example.com
 ConfigBase: memfs://tests/minimal-gce-ilb.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: kYDxi9CQz1pOsyZ4Cu8AttY3tzNaUNwqWdxl+M+T8Zg=
+NodeupConfigHash: NshhJVM9O3squUQ4JatGBlLvUcxzVDJ01oiV7/BS8A0=
 
 __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 02ac83809035b..d8d9e94cf873f 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
@@ -1,4 +1,8 @@
 APIServerConfig:
+  API:
+    loadBalancer:
+      useForInternalAPI: true
+    publicName: api.minimal-gce-with-a-very-very-very-very-very-long-name.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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_user-data b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
index 9ec04d0ab6e8d..2aab195769396 100644
--- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_user-data
@@ -242,7 +242,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: +O6sjXij0Y2eoc76w1YtPUDAxRfSbDQnvUOgq9x7NIw=
+NodeupConfigHash: N68atr7BFhlGukbbk7lmcWMlpM1kCm+dtsG3P51M19I=
 
 __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 02ac83809035b..f891d97ee8803 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal-gce-with-a-very-very-very-very-very-long-name.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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_user-data 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_user-data
index 9ec04d0ab6e8d..7e9838334e7a7 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_user-data
+++ 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_user-data
@@ -242,7 +242,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: +O6sjXij0Y2eoc76w1YtPUDAxRfSbDQnvUOgq9x7NIw=
+NodeupConfigHash: L4uNX99s09kDZ00xCFGsz603Casi1M740n8jOxZaNsU=
 
 __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 5c0ff4aedca52..2d9d69335c472 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
@@ -1,4 +1,8 @@
 APIServerConfig:
+  API:
+    loadBalancer:
+      useForInternalAPI: true
+    publicName: api.minimal-gce-plb.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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_user-data b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data
index 62d9fa97782da..faf705c9b905e 100644
--- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data
@@ -242,7 +242,7 @@ ClusterName: minimal-gce-plb.example.com
 ConfigBase: memfs://tests/minimal-gce-plb.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: jNPgRRW2w9KMhwaiHGyRl/mrhYxvO36EEvvLH/nrnp4=
+NodeupConfigHash: y8vPT0GklxEmoO7aF6FRtc51Sy+nvs//o6BHFrKV+RI=
 
 __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 f1ffca7ca1f3c..d927560244b01 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal-gce-private.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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_user-data b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data
index 248cc163762d9..089e98f9ddfc3 100644
--- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data
+++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data
@@ -242,7 +242,7 @@ ClusterName: minimal-gce-private.example.com
 ConfigBase: memfs://tests/minimal-gce-private.example.com
 InstanceGroupName: master-us-test1-a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: iN67c4k7pZ5i7Dy/amchSeb9VswSpqKj2q1OEYVFV2s=
+NodeupConfigHash: VVbspxeCAgGbXRYf5Qk6AsnI+SzHWq/CX/JC6+WMpl4=
 
 __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 4056ad5e8dac9..93d2e910e653c 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
@@ -252,7 +252,7 @@ ClusterName: minimal.k8s.local
 ConfigBase: memfs://clusters.example.com/minimal.k8s.local
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: loYmiB+q6Y7r4N08h2tFvrzfPtOEg2/7TLjXb2v0AP0=
+NodeupConfigHash: O+vHkOuTaOrsuNi8+sCYLgD2IESxpKWGWKQ7YaX+Ffw=
 
 __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 509d38dde5ed6..21efad3d81392 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.k8s.local
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 9d7b3597a176c..47735b20582b8 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
@@ -252,7 +252,7 @@ ClusterName: minimal.k8s.local
 ConfigBase: memfs://clusters.example.com/minimal.k8s.local
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: rRbRk1RbbVU1R+fChoKLSRZy/0A5fdx1iSrheldLm8s=
+NodeupConfigHash: 5CW3R8luUnvmvbo8hRkIwaPP0eTBBVzzWS8YCajrncg=
 
 __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 43f9c5e3401a5..5c208d024e460 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.k8s.local
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 007b940957bd7..7f72c7dcf51c6 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
@@ -1,4 +1,5 @@
 APIServerConfig:
+  API: {}
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: false
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 71e2c10bf48ab..274e84aa97148 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
@@ -241,7 +241,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://tests/minimal.example.com
 InstanceGroupName: master-fsn1
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: YzyTWIAuYX4R2Q2kWcgIiymNyLQf3QQkjFkcvHnDRM4=
+NodeupConfigHash: AbmTZcz1AsioWqOZh8MIEWrCcNmn6L8qU5grC1KyasM=
 
 __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 77c6663113ffa..25cbfe5303991 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
@@ -1,4 +1,5 @@
 APIServerConfig:
+  API: {}
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 cefe7162976ff..66c47aa1b30da 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
@@ -243,7 +243,7 @@ ClusterName: scw-minimal.k8s.local
 ConfigBase: memfs://tests/scw-minimal.k8s.local
 InstanceGroupName: control-plane-fr-par-1
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: FmRPx+bq82phZfN/chCDgrJSYQWtID17d9stamPAz6s=
+NodeupConfigHash: gUdqc+XNQKcd5AX1IxahoKx/c0xJiGDBHHFKkHZlzck=
 
 __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 a8d5899ca2cbf..c913a10b98485 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
@@ -252,7 +252,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: I/SReCbiEC/Uefzr72HLUiBFpWka0K0zaPEuXazDoJg=
+NodeupConfigHash: Nqfroji30tY5vfZzP4EfIhEdvkdCI6is694/fRrAyD0=
 
 __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 6daa2ff8f28a1..d909fe45f19ce 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
@@ -252,7 +252,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: mLvCL6PfGuOpkLfrqaOlUgNpIh/VBA9eBl2XT1mFlRE=
+NodeupConfigHash: R/a+mvdaaBzGQ2UR/3YWDTWRtzP/ISCdIqPWL0o4TKY=
 
 __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 8a32d3a13dbf8..1ff8f75f5c2d2 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
@@ -252,7 +252,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: WTGuLQGw2TmyfF5iAKQiz4OAdQ3hYWFkGCvlrbvAgq0=
+NodeupConfigHash: PnuiM2O1snZ/wZrQEbMgJ0qiTksmMi6tbkBOMRHT3oQ=
 
 __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 d6a0f5c712531..11cf89e098f56 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.mixedinstances.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 1772e12a3e761..7cb21f9ead003 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.mixedinstances.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 fa48620c5c7c9..01e0aac6d42a5 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.mixedinstances.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 a8d5899ca2cbf..c913a10b98485 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
@@ -252,7 +252,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: I/SReCbiEC/Uefzr72HLUiBFpWka0K0zaPEuXazDoJg=
+NodeupConfigHash: Nqfroji30tY5vfZzP4EfIhEdvkdCI6is694/fRrAyD0=
 
 __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 6daa2ff8f28a1..d909fe45f19ce 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
@@ -252,7 +252,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1b
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: mLvCL6PfGuOpkLfrqaOlUgNpIh/VBA9eBl2XT1mFlRE=
+NodeupConfigHash: R/a+mvdaaBzGQ2UR/3YWDTWRtzP/ISCdIqPWL0o4TKY=
 
 __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 8a32d3a13dbf8..1ff8f75f5c2d2 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
@@ -252,7 +252,7 @@ ClusterName: mixedinstances.example.com
 ConfigBase: memfs://clusters.example.com/mixedinstances.example.com
 InstanceGroupName: master-us-test-1c
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: WTGuLQGw2TmyfF5iAKQiz4OAdQ3hYWFkGCvlrbvAgq0=
+NodeupConfigHash: PnuiM2O1snZ/wZrQEbMgJ0qiTksmMi6tbkBOMRHT3oQ=
 
 __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 d6a0f5c712531..11cf89e098f56 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.mixedinstances.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 1772e12a3e761..7cb21f9ead003 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.mixedinstances.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 fa48620c5c7c9..01e0aac6d42a5 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.mixedinstances.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 1b4887daf8502..c6bd13e3c887f 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
@@ -252,7 +252,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com
 ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: zk+nda7ekqigl4j2xjDbA5M1HPNDwlR/gnn2/ghL5vs=
+NodeupConfigHash: uO28BwvOWOq2N6IB1vTraOcS8i8XM+MNYdaEMGdJUi0=
 
 __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 127d1ddcb63d9..5d0635a5341e3 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.nthimdsprocessor.longclustername.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 165be1e0a6649..2edd2341343a8 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
@@ -252,7 +252,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com
 ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: PZLkFB/7xPa0fR7vUaXSHYdlJ5ACxzrKj7FEEJzjGVw=
+NodeupConfigHash: vf82Zy9ItGAnKq0sKstY8HXQ99BpVUhVQIkSNQNJAyI=
 
 __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 dd97b35152f50..69f0da009e81a 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.nthimdsprocessor.longclustername.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 61a0d62ad1b0f..e1e0213d6912b 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
@@ -252,7 +252,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 1g1QOOOGCRlpxDMXUi5k3tp7uIT2RwpYgwEkr1uyCUQ=
+NodeupConfigHash: 8TMJqncefeVgpPyFdYYPLtFVTZFDI/zyhdKx+4FCMQc=
 
 __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 9d24cf15fe5eb..329a3675f8647 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 de02710a6128f..40cb9b9f40e9e 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
@@ -252,7 +252,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: IBIiZ4EJty1b0DspGXGLBekYn78C1WdCDdmH5oMay54=
+NodeupConfigHash: 6LOIqtfeoV2kvapxeFuZ5cC5DoiZuEcz9PFCJS7wyRM=
 
 __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 f28f3517e3354..5b47177d8168a 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.private-shared-ip.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 4a5a80d36d504..c014f2b3a5c68 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
@@ -252,7 +252,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: 2MgFGmPSSZ/mq1EM0z3ljMrW+244FlfJRKb0jUSEsR4=
+NodeupConfigHash: uQBxMUTAq71r8UBnaKcrwql9GR7rag0tM/xuAqyTRlk=
 
 __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 37971b46e9af9..0e17a2e4a959f 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.private-shared-subnet.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 ab1397f049dc7..c098c7b448ff7 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
@@ -252,7 +252,7 @@ ClusterName: privatecalico.example.com
 ConfigBase: memfs://clusters.example.com/privatecalico.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: SEyXC5Crgh2KaszgK18Rwf4VwndwUDNgwyVffzJd7F4=
+NodeupConfigHash: WDRUuJQA6GvMc1TwBJpmrhx70whsyNquLxDAC9C5cXs=
 
 __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 5a10881a30a03..0de080477143a 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.privatecalico.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 45856bfbcead8..e1f18bb66ba6e 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
@@ -252,7 +252,7 @@ ClusterName: privatecanal.example.com
 ConfigBase: memfs://clusters.example.com/privatecanal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: y+P15y/QlCKDVIsk804ow4aatcG0A5dY2eNxiaRuYv4=
+NodeupConfigHash: f86ZltywvKOgzJmhF/4jRfahVEH0ziupTzhrv6sqonY=
 
 __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 20c3c1cc4c5f4..d6c3f30965105 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.privatecanal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 dd71f2ec3c78b..392d6b6948d80 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
@@ -252,7 +252,7 @@ ClusterName: privatecilium.example.com
 ConfigBase: memfs://clusters.example.com/privatecilium.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: igYk3HfUtIJRB0NS1LVrozpy1nIB5AVOU6ZdcOR9eKY=
+NodeupConfigHash: OYYdVuOfZJi2O6XDWiqFi5o2da9hw+uLEq9ih2e/Mqw=
 
 __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 08636d60d12d4..388ced2180621 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.privatecilium.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 b70fa7f8e5c38..c94ed8f5e7430 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
@@ -252,7 +252,7 @@ ClusterName: privatecilium.example.com
 ConfigBase: memfs://clusters.example.com/privatecilium.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: zb5IH6b2AqHrXvZ3bwBT53VnXhQnE/6PAPj33mBBf9Q=
+NodeupConfigHash: GHRNhv18KFLwdpX3EbuhgWHGxHCEe3UFpt8ezER8fTQ=
 
 __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 3b488d6efd476..c74aa4ab613ed 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.privatecilium.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 111abe01f233f..c3cdfe32df35f 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
@@ -252,7 +252,7 @@ ClusterName: privatecilium.example.com
 ConfigBase: memfs://clusters.example.com/privatecilium.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 1J2TdtHBgQxKE2CHnGqGZUoP5dHelG4leq3P4nfDhrw=
+NodeupConfigHash: M+XJ7nWu9ubz4yGvhvtXr1r8Ko1kJypt+zS5AqSsBA8=
 
 __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 a1447022636c1..3fb6b24dcf420 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.privatecilium.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 f407aa593053b..6a6ba8fd23554 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
@@ -256,7 +256,7 @@ ClusterName: privateciliumadvanced.example.com
 ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Ynj2EN+tUO5YXTMDAiuRyYH+TKe7JCueY+Y1pxAZwYU=
+NodeupConfigHash: rh0Hx+2vHfv7KwQxaXMsEzgzlOarxoSpZZpKBmoEqZk=
 
 __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 31ef178b17345..e7bae62191410 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.privateciliumadvanced.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 26014b5091f96..d4d98c291fb39 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
@@ -247,7 +247,7 @@ ClusterName: privatedns1.example.com
 ConfigBase: memfs://clusters.example.com/privatedns1.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 91rhU68bjHBvXgAdyTaKzfShk60Su3eS8U0ftbIISgg=
+NodeupConfigHash: ET1SrjWZGkpgSZ1Y6ik9B+RQ8jL7yeL5YG+vtkBcmoo=
 
 __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 44ccc0fe0e4c7..3e8623824f470 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.privatedns1.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 677244f69acab..c1a129eaf0cc9 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
@@ -252,7 +252,7 @@ ClusterName: privatedns2.example.com
 ConfigBase: memfs://clusters.example.com/privatedns2.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: +858DCqczlkNe7+PP2L6tRIazSbD+CqA1Zay7LVStkw=
+NodeupConfigHash: MK6MNzij6GrQQz60IIOqjc3FHrVEFai+aJtuf8nwRG0=
 
 __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 f5b08e4ed4cc6..05264cdc0dd60 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.privatedns2.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 9cb8eb3c3cd7d..828c1c2b30b6e 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
@@ -252,7 +252,7 @@ ClusterName: privateflannel.example.com
 ConfigBase: memfs://clusters.example.com/privateflannel.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: xEDUxV9E3VC0LiNTo7GZ4ke1T28ZrASs66EXmM5Mrvw=
+NodeupConfigHash: nI8qijabzJn2XZ4Vg9BnW45muTB5PWQZHNp/FJ3+wz0=
 
 __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 7a0e7efcac48b..a8c8b6d116481 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.privateflannel.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 2f927c448e720..9211593ecde70 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
@@ -252,7 +252,7 @@ ClusterName: privatekopeio.example.com
 ConfigBase: memfs://clusters.example.com/privatekopeio.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: ra5Gs5+TC2cD3Mp9+76oQw7S0zPIN0wL/Ng8GHqokgk=
+NodeupConfigHash: ODDQbpKDcZSS2r7Yp6Vs6zwJDVT0uuYEKvgxtkoQpF0=
 
 __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 a44cdcf7a5152..67ef17309909b 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.privatekopeio.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 99b2663aea3e6..0ed4f806cdd59 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
@@ -253,7 +253,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: Jm1iFIf670x6t+W1MrRBb8Bgpn67XrVfKrvcR1FSa5Y=
+NodeupConfigHash: 2/fw98CesEKrg3xXzT+s8EkuClXW3PD1QqCHB0O5W/E=
 
 __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 6991cbddb636c..df9bb37072e6e 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 62283d45de879..b985fcc313c4c 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
@@ -252,7 +252,7 @@ ClusterName: sharedsubnet.example.com
 ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: i74nPuJdEtKH8LZK3m9VNxLcc8qOPJsJHJuZsWxv3ps=
+NodeupConfigHash: jiQCl/DNPx65ksRqX1dlGxsYqW/mkzcYUWlmBE6Xfk0=
 
 __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 41616ebb106bf..f487ca0aa26ec 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.sharedsubnet.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 5bbb916c306c5..560c8ee669051 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
@@ -252,7 +252,7 @@ ClusterName: sharedvpc.example.com
 ConfigBase: memfs://clusters.example.com/sharedvpc.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: 0MV+k3hUI3SpHgIn+W1ScsRy1I8s/84OS1ulThgY6Vw=
+NodeupConfigHash: W7KV2Q4hu065s5oo+k05I8GO6s9bleHaPD0nWOKhPNY=
 
 __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 18af5fa9f10cb..0c0fcedb6c0cb 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.sharedvpc.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 9dd528956bd6e..fafd69377d145 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
@@ -254,7 +254,7 @@ ClusterName: minimal-ipv6.example.com
 ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: JHPpfbsIPJTW0SP5UW6NvuEJ/h2i8tdpIXSqfezNDAk=
+NodeupConfigHash: iE9Q1GNfvMy6Uk/qFn0s3u2NvLopq35eVL7owM93tQE=
 
 __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 a559bbcaa7e4b..cb48490aeed6e 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.minimal-ipv6.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 f0b8af0cc78c6..33dc9259ed2fa 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
@@ -252,7 +252,7 @@ ClusterName: unmanaged.example.com
 ConfigBase: memfs://clusters.example.com/unmanaged.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: I1nKmiLXCuhLPjK0SDZEzvkX7Kyym8eypfkTrQqTX0U=
+NodeupConfigHash: tcGWH02TIqcxbFndZdVogcWDBHKIvWVMufIAI0fEwDs=
 
 __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 2fb684f12e454..d4045a1da6071 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
@@ -1,4 +1,6 @@
 APIServerConfig:
+  API:
+    publicName: api.unmanaged.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: 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 796b04945ea22..e22047c3c9183 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
@@ -252,7 +252,7 @@ ClusterName: minimal.example.com
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: DfaKflY87UmuAKrFMGZ//l9Lcwnme+Ans5rfG9aLzzM=
+NodeupConfigHash: Xa54EBSBrx06PU9tbqmGiUghc5YZDirV4WrHn6J1a8U=
 
 __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 04f0555b40d92..b2f7f71d1b995 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
@@ -1,4 +1,7 @@
 APIServerConfig:
+  API:
+    dns: {}
+    publicName: api.minimal.example.com
   KubeAPIServer:
     allowPrivileged: true
     anonymousAuth: false