Segregate DNS related code to separate controller

federation/cmd/federation-controller-manager/app/controllermanager.go

@@ -35,7 +35,6 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
 	"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"
-	"k8s.io/kubernetes/federation/pkg/dnsprovider"
 	"k8s.io/kubernetes/federation/pkg/federatedtypes"
 	clustercontroller "k8s.io/kubernetes/federation/pkg/federation-controller/cluster"
 	deploymentcontroller "k8s.io/kubernetes/federation/pkg/federation-controller/deployment"
@@ -137,17 +136,20 @@ func StartControllers(s *options.CMServer, restClientCfg *restclient.Config) err
 	clustercontroller.StartClusterController(restClientCfg, stopChan, s.ClusterMonitorPeriod.Duration)
 
 	if controllerEnabled(s.Controllers, serverResources, servicecontroller.ControllerName, servicecontroller.RequiredResources, true) {
-		dns, err := dnsprovider.InitDnsProvider(s.DnsProvider, s.DnsConfigFile)
-		if err != nil {
-			glog.Fatalf("Cloud provider could not be initialized: %v", err)
+		if controllerEnabled(s.Controllers, serverResources, servicecontroller.DNSControllerName, servicecontroller.RequiredResources, true) {
+			serviceDNScontrollerClientset := federationclientset.NewForConfigOrDie(restclient.AddUserAgent(restClientCfg, servicecontroller.DNSUserAgentName))
+			serviceDNSController, err := servicecontroller.NewServiceDNSController(serviceDNScontrollerClientset, s.DnsProvider, s.DnsConfigFile, s.FederationName, s.ServiceDnsSuffix, s.ZoneName, s.ZoneID)
+			if err != nil {
+				glog.Fatalf("Failed to start service dns controller: %v", err)
+			} else {
+				go serviceDNSController.DNSControllerRun(s.ConcurrentServiceSyncs, wait.NeverStop)
+			}
 		}
+
 		glog.V(3).Infof("Loading client config for service controller %q", servicecontroller.UserAgentName)
 		scClientset := federationclientset.NewForConfigOrDie(restclient.AddUserAgent(restClientCfg, servicecontroller.UserAgentName))
-		servicecontroller := servicecontroller.New(scClientset, dns, s.FederationName, s.ServiceDnsSuffix, s.ZoneName, s.ZoneID)
-		glog.V(3).Infof("Running service controller")
-		if err := servicecontroller.Run(s.ConcurrentServiceSyncs, wait.NeverStop); err != nil {
-			glog.Fatalf("Failed to start service controller: %v", err)
-		}
+		serviceController := servicecontroller.New(scClientset)
+		go serviceController.Run(s.ConcurrentServiceSyncs, wait.NeverStop)
 	}
 
 	if controllerEnabled(s.Controllers, serverResources, namespacecontroller.ControllerName, namespacecontroller.RequiredResources, true) {

federation/pkg/federation-controller/service/dns_test.go

@@ -50,13 +50,11 @@ func TestServiceController_ensureDnsRecords(t *testing.T) {
 		{
 			name: "ServiceWithSingleLBIngress",
 			service: v1.Service{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "servicename",
-					Namespace: "servicenamespace",
-					Annotations: map[string]string{
-						FederatedServiceIngressAnnotation: NewFederatedServiceIngress().
-							AddEndpoints(cluster1Name, []string{"198.51.100.1"}).
-							String()},
+				ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{
+					FederatedServiceIngressAnnotation: NewFederatedServiceIngress().
+						AddEndpoints(cluster1Name, []string{"198.51.100.1"}).
+						AddEndpoints(cluster2Name, []string{}).
+						String()},
 				},
 			},
 			expected: []string{
@@ -73,10 +71,7 @@ func TestServiceController_ensureDnsRecords(t *testing.T) {
 			{
 				name: "withname",
 				service: v1.Service{
-					ObjectMeta: metav1.ObjectMeta{
-						Name: "servicename",
-						Namespace: "servicenamespace",
-					},
+					ObjectMeta: metav1.ObjectMeta{},
 				},
 				expected: []string{
 					"example.com:"+globalDNSName+":A:180:[198.51.100.1]",
@@ -88,9 +83,11 @@ func TestServiceController_ensureDnsRecords(t *testing.T) {
 		{
 			name: "ServiceWithNoLBIngress",
 			service: v1.Service{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "servicename",
-					Namespace: "servicenamespace",
+				ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{
+					FederatedServiceIngressAnnotation: NewFederatedServiceIngress().
+						AddEndpoints(cluster1Name, []string{}).
+						AddEndpoints(cluster2Name, []string{}).
+						String()},
 				},
 			},
 			expected: []string{
@@ -103,14 +100,11 @@ func TestServiceController_ensureDnsRecords(t *testing.T) {
 		{
 			name: "ServiceWithMultipleLBIngress",
 			service: v1.Service{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "servicename",
-					Namespace: "servicenamespace",
-					Annotations: map[string]string{
-						FederatedServiceIngressAnnotation: NewFederatedServiceIngress().
-							AddEndpoints(cluster1Name, []string{"198.51.100.1"}).
-							AddEndpoints(cluster2Name, []string{"198.51.200.1"}).
-							String()},
+				ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{
+					FederatedServiceIngressAnnotation: NewFederatedServiceIngress().
+						AddEndpoints(cluster1Name, []string{"198.51.100.1"}).
+						AddEndpoints(cluster2Name, []string{"198.51.200.1"}).
+						String()},
 				},
 			},
 			expected: []string{
@@ -124,14 +118,12 @@ func TestServiceController_ensureDnsRecords(t *testing.T) {
 		{
 			name: "ServiceWithLBIngressAndServiceDeleted",
 			service: v1.Service{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:              "servicename",
-					Namespace:         "servicenamespace",
+				ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{
+					FederatedServiceIngressAnnotation: NewFederatedServiceIngress().
+						AddEndpoints(cluster1Name, []string{"198.51.100.1"}).
+						AddEndpoints(cluster2Name, []string{"198.51.200.1"}).
+						String()},
 					DeletionTimestamp: &metav1.Time{Time: time.Now()},
-					Annotations: map[string]string{
-						FederatedServiceIngressAnnotation: NewFederatedServiceIngress().
-							AddEndpoints(cluster1Name, []string{"198.51.100.1"}).
-							String()},
 				},
 			},
 			expected: []string{
@@ -145,15 +137,12 @@ func TestServiceController_ensureDnsRecords(t *testing.T) {
 		{
 			name: "ServiceWithMultipleLBIngressAndOneLBIngressGettingRemoved",
 			service: v1.Service{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "servicename",
-					Namespace: "servicenamespace",
-					Annotations: map[string]string{
-						FederatedServiceIngressAnnotation: NewFederatedServiceIngress().
-							AddEndpoints(cluster1Name, []string{"198.51.100.1"}).
-							AddEndpoints(cluster2Name, []string{"198.51.200.1"}).
-							RemoveEndpoint(cluster2Name, "198.51.200.1").
-							String()},
+				ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{
+					FederatedServiceIngressAnnotation: NewFederatedServiceIngress().
+						AddEndpoints(cluster1Name, []string{"198.51.100.1"}).
+						AddEndpoints(cluster2Name, []string{"198.51.200.1"}).
+						RemoveEndpoint(cluster2Name, "198.51.200.1").
+						String()},
 				},
 			},
 			expected: []string{
@@ -167,16 +156,13 @@ func TestServiceController_ensureDnsRecords(t *testing.T) {
 		{
 			name: "ServiceWithMultipleLBIngressAndAllLBIngressGettingRemoved",
 			service: v1.Service{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "servicename",
-					Namespace: "servicenamespace",
-					Annotations: map[string]string{
-						FederatedServiceIngressAnnotation: NewFederatedServiceIngress().
-							AddEndpoints(cluster1Name, []string{"198.51.100.1"}).
-							AddEndpoints(cluster2Name, []string{"198.51.200.1"}).
-							RemoveEndpoint(cluster1Name, "198.51.100.1").
-							RemoveEndpoint(cluster2Name, "198.51.200.1").
-							String()},
+				ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{
+					FederatedServiceIngressAnnotation: NewFederatedServiceIngress().
+						AddEndpoints(cluster1Name, []string{"198.51.100.1"}).
+						AddEndpoints(cluster2Name, []string{"198.51.200.1"}).
+						RemoveEndpoint(cluster1Name, "198.51.100.1").
+						RemoveEndpoint(cluster2Name, "198.51.200.1").
+						String()},
 				},
 			},
 			expected: []string{
@@ -195,22 +181,30 @@ func TestServiceController_ensureDnsRecords(t *testing.T) {
 		}
 		fakeClient := &fakefedclientset.Clientset{}
 		RegisterFakeClusterGet(&fakeClient.Fake, &v1beta1.ClusterList{Items: []v1beta1.Cluster{*cluster1, *cluster2}})
-		serviceController := ServiceController{
+		d := ServiceDNSController{
 			federationClient: fakeClient,
 			dns:              fakedns,
 			dnsZones:         fakednsZones,
-			serviceDnsSuffix: "federation.example.com",
+			serviceDNSSuffix: "federation.example.com",
 			zoneName:         "example.com",
 			federationName:   "myfederation",
 		}
 
-		err := serviceController.ensureDnsRecords(cluster1Name, &test.service)
+		dnsZones, err := getDNSZones(d.zoneName, d.zoneID, d.dnsZones)
 		if err != nil {
-			t.Errorf("Test failed for %s, unexpected error %v", test.name, err)
+			t.Errorf("Test failed for %s, Get DNS Zones failed: %v", test.name, err)
 		}
-		err = serviceController.ensureDnsRecords(cluster2Name, &test.service)
+		d.dnsZone = dnsZones[0]
+		test.service.Name = "servicename"
+		test.service.Namespace = "servicenamespace"
+
+		ingress, err := ParseFederatedServiceIngress(&test.service)
 		if err != nil {
-			t.Errorf("Test failed for %s, unexpected error %v", test.name, err)
+			t.Errorf("Error in parsing lb ingress for service %s/%s: %v", test.service.Namespace, test.service.Name, err)
+			return
+		}
+		for _, clusterIngress := range ingress.Items {
+			d.ensureDNSRecords(clusterIngress.Cluster, &test.service)
 		}
 
 		zones, err := fakednsZones.List()

federation/pkg/federation-controller/service/servicecontroller_test.go

@@ -32,7 +32,6 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/kubernetes/federation/apis/federation/v1beta1"
 	fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake"
-	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns" // Only for unit testing purposes.
 	fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util"
 	. "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"
 	"k8s.io/kubernetes/pkg/api/v1"
@@ -101,8 +100,7 @@ func TestServiceController(t *testing.T) {
 		}
 	}
 
-	fakedns, _ := clouddns.NewFakeInterface()
-	sc := New(fedClient, fakedns, "myfederation", "federation.example.com", "example.com", "")
+	sc := New(fedClient)
 	ToFederatedInformerForTestOnly(sc.federatedInformer).SetClientFactory(fedInformerClientFactory)
 	ToFederatedInformerForTestOnly(sc.endpointFederatedInformer).SetClientFactory(fedInformerClientFactory)
 	sc.clusterAvailableDelay = 100 * time.Millisecond