dns record use uuid in domain name (#10)

* add uuid to dns name

* go mod update fix test

* select last 12 characters

* use 6 char suffix for dns

Co-authored-by: jzhoucliqr <[email protected]>

Author: sadysnaat

go.mod

@@ -5,6 +5,7 @@ go 1.15
 require (
 	github.com/go-logr/logr v0.3.0
 	github.com/golang/mock v1.2.0
+	github.com/google/uuid v1.2.0
 	github.com/onsi/gomega v1.10.1
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/common v0.10.0

go.sum

@@ -357,8 +357,6 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spectrocloud/maas-client-go v0.0.1-beta1 h1:OZGxJl5AR+4mM2w+ylJewYIORBGBCMy2kMh/iMCkZsw=
-github.com/spectrocloud/maas-client-go v0.0.1-beta1/go.mod h1:ih7QvZPySD8fiIo56wO+W40w1ojiqNnpLP0Zb6nKvKk=
 github.com/spectrocloud/maas-client-go v0.0.1-beta1.0.20210805102600-28f250f3bdc7 h1:4HsJjvyBXs8co1ss78oEh7OQbBG+h8E7cRx1WRaRtE0=
 github.com/spectrocloud/maas-client-go v0.0.1-beta1.0.20210805102600-28f250f3bdc7/go.mod h1:ih7QvZPySD8fiIo56wO+W40w1ojiqNnpLP0Zb6nKvKk=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=

pkg/maas/dns/dns_test.go

@@ -46,14 +46,15 @@ func TestDNS(t *testing.T) {
 		mockDNSResources.EXPECT().List(context.Background(), gomock.Any()).Return(nil, nil)
 		mockClientSetInterface.EXPECT().DNSResources().Return(mockDNSResources)
 		mockDNSResources.EXPECT().Builder().Return(mockDNSResourceBuilder)
-		mockDNSResourceBuilder.EXPECT().WithFQDN("a.b.com").Return(mockDNSResourceBuilder)
+		mockDNSResourceBuilder.EXPECT().WithFQDN(gomock.Any()).Return(mockDNSResourceBuilder)
 		mockDNSResourceBuilder.EXPECT().WithAddressTTL("10").Return(mockDNSResourceBuilder)
 		mockDNSResourceBuilder.EXPECT().WithIPAddresses(nil).Return(mockDNSResourceBuilder)
 		mockDNSResourceBuilder.EXPECT().Create(context.Background())
 		err := s.ReconcileDNS()
 
 		g.Expect(err).ToNot(HaveOccurred())
-		g.Expect(s.scope.GetDNSName()).To(BeEquivalentTo("a.b.com"))
+		g.Expect(s.scope.GetDNSName()).To(ContainSubstring(cluster.Name))
+		g.Expect(s.scope.GetDNSName()).To(ContainSubstring(maasCluster.Spec.DNSDomain))
 	})
 
 	t.Run("update dns attachment", func(t *testing.T) {

pkg/maas/scope/cluster.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/go-logr/logr"
+	"github.com/google/uuid"
 	"github.com/pkg/errors"
 	infrav1 "github.com/spectrocloud/cluster-api-provider-maas/api/v1alpha3"
 	v1 "k8s.io/api/core/v1"
@@ -21,6 +22,10 @@ import (
 	"time"
 )
 
+const (
+	DnsSuffixLength = 6
+)
+
 // ClusterScopeParams defines the input parameters used to create a new Scope.
 type ClusterScopeParams struct {
 	Client              client.Client
@@ -118,7 +123,19 @@ func (s *ClusterScope) SetDNSName(dnsName string) {
 // GetDNSName sets the Network systemID in spec.
 // This can't do a lookup on Status.Network.DNSDomain name since it's derviced from here
 func (s *ClusterScope) GetDNSName() string {
-	return fmt.Sprintf("%s.%s", s.Cluster.Name, s.MaasCluster.Spec.DNSDomain)
+	if !s.Cluster.Spec.ControlPlaneEndpoint.IsZero() {
+		return s.Cluster.Spec.ControlPlaneEndpoint.Host
+	}
+
+	if s.MaasCluster.Status.Network.DNSName != "" {
+		return s.MaasCluster.Status.Network.DNSName
+	}
+
+	uid := uuid.New().String()
+	dnsName := fmt.Sprintf("%s-%s.%s", s.Cluster.Name, uid[len(uid)-DnsSuffixLength:], s.MaasCluster.Spec.DNSDomain)
+
+	s.SetDNSName(dnsName)
+	return dnsName
 }
 
 // GetActiveMaasMachines all MaaS machines NOT being deleted

pkg/maas/scope/cluster_test.go

@@ -1,14 +1,15 @@
 package scope
 
 import (
+	"testing"
+
 	"github.com/onsi/gomega"
 	infrav1 "github.com/spectrocloud/cluster-api-provider-maas/api/v1alpha3"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/klogr"
 	"sigs.k8s.io/cluster-api/api/v1alpha3"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	"testing"
 )
 
 func TestNewCluster(t *testing.T) {
@@ -43,4 +44,28 @@ func TestNewCluster(t *testing.T) {
 		g.Expect(scope).ToNot(gomega.BeNil())
 
 	})
+
+	t.Run("new dns name", func(t *testing.T) {
+		g := gomega.NewGomegaWithT(t)
+		scheme := runtime.NewScheme()
+		client := fake.NewFakeClientWithScheme(scheme)
+		clusterCopy := cluster.DeepCopy()
+		clusterCopy.Name = "dns-test"
+		maasClusterCopy := maasCluster.DeepCopy()
+		maasClusterCopy.Spec.DNSDomain = "maas.com"
+		log := klogr.New()
+		scope, err := NewClusterScope(ClusterScopeParams{
+			Client:      client,
+			Logger:      log,
+			Cluster:     clusterCopy,
+			MaasCluster: maasClusterCopy,
+		})
+
+		g.Expect(err).ToNot(gomega.HaveOccurred())
+		g.Expect(scope.GetDNSName()).ToNot(gomega.BeNil())
+		g.Expect(scope.GetDNSName()).To(gomega.ContainSubstring(clusterCopy.Name))
+		g.Expect(scope.GetDNSName()).To(gomega.ContainSubstring(maasClusterCopy.Spec.DNSDomain))
+		dnsLengh := len("dns-test-") + DnsSuffixLength + len(".maas.com")
+		g.Expect(len(scope.GetDNSName())).To(gomega.Equal(dnsLengh))
+	})
 }