update scope, generate mocks, add privatedns to conditions summary

kubernetes-sigs · Jan 26, 2022 · 03a1542 · 03a1542
1 parent f8bdf24
commit 03a1542
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 23 deletions.
diff --git a/azure/scope/cluster.go b/azure/scope/cluster.go
@@ -24,6 +24,8 @@ import (
 	"strconv"
 	"strings"
 
+	"sigs.k8s.io/cluster-api-provider-azure/azure/services/privatedns"
+
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/pkg/errors"
@@ -371,35 +373,49 @@ func (s *ClusterScope) VNetSpec() azure.VNetSpec {
 }
 
 // PrivateDNSSpec returns the private dns zone spec.
-func (s *ClusterScope) PrivateDNSSpec() *azure.PrivateDNSSpec {
-	var specs *azure.PrivateDNSSpec
+func (s *ClusterScope) PrivateDNSSpec() (zoneSpec azure.ResourceSpecGetter, linkSpec, recordSpec []azure.ResourceSpecGetter) {
 	if s.IsAPIServerPrivate() {
-		links := make([]azure.PrivateDNSLinkSpec, 1+len(s.Vnet().Peerings))
-		links[0] = azure.PrivateDNSLinkSpec{
-			VNetName:          s.Vnet().Name,
+		zone := privatedns.ZoneSpec{
+			Name:           s.GetPrivateDNSZoneName(),
+			ResourceGroup:  s.ResourceGroup(),
+			ClusterName:    s.ClusterName(),
+			AdditionalTags: nil,
+		}
+
+		links := make([]azure.ResourceSpecGetter, 1+len(s.Vnet().Peerings))
+		links[0] = privatedns.LinkSpec{
+			Name:              azure.GenerateVNetLinkName(s.Vnet().Name),
+			ZoneName:          s.GetPrivateDNSZoneName(),
 			VNetResourceGroup: s.Vnet().ResourceGroup,
-			LinkName:          azure.GenerateVNetLinkName(s.Vnet().Name),
+			VNetName:          s.Vnet().Name,
+			ResourceGroup:     s.ResourceGroup(),
+			ClusterName:       s.ClusterName(),
 		}
 		for i, peering := range s.Vnet().Peerings {
-			links[i+1] = azure.PrivateDNSLinkSpec{
-				VNetName:          peering.RemoteVnetName,
+			links[i+1] = privatedns.LinkSpec{
+				Name:              azure.GenerateVNetLinkName(peering.RemoteVnetName),
+				ZoneName:          s.GetPrivateDNSZoneName(),
 				VNetResourceGroup: peering.ResourceGroup,
-				LinkName:          azure.GenerateVNetLinkName(peering.RemoteVnetName),
+				VNetName:          peering.RemoteVnetName,
+				ResourceGroup:     s.ResourceGroup(),
+				ClusterName:       s.ClusterName(),
 			}
 		}
-		specs = &azure.PrivateDNSSpec{
-			ZoneName: s.GetPrivateDNSZoneName(),
-			Links:    links,
-			Records: []infrav1.AddressRecord{
-				{
-					Hostname: azure.PrivateAPIServerHostname,
-					IP:       s.APIServerPrivateIP(),
-				},
+
+		records := make([]azure.ResourceSpecGetter, 1)
+		records[0] = privatedns.RecordSpec{
+			Record: infrav1.AddressRecord{
+				Hostname: azure.PrivateAPIServerHostname,
+				IP:       s.APIServerPrivateIP(),
 			},
+			ZoneName:      s.GetPrivateDNSZoneName(),
+			ResourceGroup: s.ResourceGroup(),
 		}
+
+		return zone, links, records
 	}
 
-	return specs
+	return nil, nil, nil
 }
 
 // IsAzureBastionEnabled returns true if the azure bastion is enabled.
@@ -662,6 +678,7 @@ func (s *ClusterScope) PatchObject(ctx context.Context) error {
 			infrav1.NATGatewaysReadyCondition,
 			infrav1.LoadBalancersReadyCondition,
 			infrav1.BastionHostReadyCondition,
+			infrav1.PrivateDNSReadyCondition,
 		),
 	)
 
@@ -678,6 +695,7 @@ func (s *ClusterScope) PatchObject(ctx context.Context) error {
 			infrav1.NATGatewaysReadyCondition,
 			infrav1.LoadBalancersReadyCondition,
 			infrav1.BastionHostReadyCondition,
+			infrav1.PrivateDNSReadyCondition,
 		}})
 }
 

diff --git a/azure/services/privatedns/mock_privatedns/doc.go b/azure/services/privatedns/mock_privatedns/doc.go
@@ -15,8 +15,6 @@ limitations under the License.
 */
 
 // Run go generate to regenerate this mock.
-//go:generate ../../../../hack/tools/bin/mockgen -destination client_mock.go -package mock_privatedns -source ../client.go Client
 //go:generate ../../../../hack/tools/bin/mockgen -destination privatedns_mock.go -package mock_privatedns -source ../privatedns.go Scope
-//go:generate /usr/bin/env bash -c "cat ../../../../hack/boilerplate/boilerplate.generatego.txt client_mock.go > _client_mock.go && mv _client_mock.go client_mock.go"
 //go:generate /usr/bin/env bash -c "cat ../../../../hack/boilerplate/boilerplate.generatego.txt privatedns_mock.go > _privatedns_mock.go && mv _privatedns_mock.go privatedns_mock.go"
 package mock_privatedns //nolint
diff --git a/azure/services/privatedns/mock_privatedns/privatedns_mock.go b/azure/services/privatedns/mock_privatedns/privatedns_mock.go