Remove references to ClusterSpec.API from nodeup

kubernetes · Jul 15, 2023 · 62f7faa · 62f7faa
1 parent ef284b1
commit 62f7faa
Show file tree

Hide file tree

Showing 193 changed files with 369 additions and 103 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,5 @@
 APIServerConfig:
+  API: {}
   KubeAPIServer:
     image: CoreOS
   ServiceAccountPublicKeys: ""

diff --git a/...ata/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data b/...ata/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/...pdate_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...pdate_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/...piservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data b/...piservernodes/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/...vernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...vernodes/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/...tegration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content b/...tegration/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/...n/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...n/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/...ntroller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...ntroller/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/...pdate_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...pdate_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/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/.../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/...ter/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ter/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/...nch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data b/...nch_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/...scaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...scaler-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/...aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data b/...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/...er-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...er-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/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/.../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/...egration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...egration/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/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/...ompress/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/...gration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...gration/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/...ustom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/...ustom/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/...pdate_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...pdate_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/...inerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/...inerd/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/...ation/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ation/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/...luster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data b/...luster/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/...ntegration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ntegration/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/...er-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data b/...er-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/...on/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...on/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/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/...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/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/...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/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/...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/...ion/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ion/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/...ion/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/...ion/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/...ion/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/...ion/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/...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/...ng_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