Change GeneratePrivateFQDN to use zone name instead of cluster name

kubernetes-sigs · Nov 29, 2021 · 4c2d709 · 4c2d709
1 parent 1ebc3a6
commit 4c2d709
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/azure/defaults.go b/azure/defaults.go
@@ -139,6 +139,11 @@ func GeneratePrivateDNSZoneName(clusterName string) string {
 	return fmt.Sprintf("%s.capz.io", clusterName)
 }
 
+// GeneratePrivateFQDN generates the FQDN for a private API Server based on the private DNS zone name.
+func GeneratePrivateFQDN(zoneName string) string {
+	return fmt.Sprintf("%s.%s", PrivateAPIServerHostname, zoneName)
+}
+
 // GenerateVNetLinkName generates the name of a virtual network link name based on the vnet name.
 func GenerateVNetLinkName(vnetName string) string {
 	return fmt.Sprintf("%s-link", vnetName)

diff --git a/azure/scope/cluster.go b/azure/scope/cluster.go
@@ -639,7 +639,7 @@ func (s *ClusterScope) APIServerPort() int32 {
 // APIServerHost returns the hostname used to reach the API server.
 func (s *ClusterScope) APIServerHost() string {
 	if s.IsAPIServerPrivate() {
-		return fmt.Sprintf("%s.%s", azure.PrivateAPIServerHostname, s.GetPrivateDNSZoneName())
+		return azure.GeneratePrivateFQDN(s.GetPrivateDNSZoneName())
 	}
 	return s.APIServerPublicIP().DNSName
 }