kubernetes · k8s-github-robot · Jun 21, 2016 · Jun 19, 2016
diff --git a/federation/pkg/dnsprovider/dns.go b/federation/pkg/dnsprovider/dns.go
@@ -27,6 +27,11 @@ type Interface interface {
 type Zones interface {
 	// List returns the managed Zones, or an error if the list operation failed.
 	List() ([]Zone, error)
+	// Add creates and returns a new managed zone, or an error if the operation failed
+	Add(Zone) (Zone, error)
+	// New allocates a new Zone, which can then be passed to Add()
+	// Arguments are as per the Zone interface below.
+	New(name string) (Zone, error)
 }
 
 type Zone interface {

diff --git a/federation/pkg/dnsprovider/providers/aws/route53/zones.go b/federation/pkg/dnsprovider/providers/aws/route53/zones.go
@@ -18,7 +18,9 @@ package route53
 
 import (
 	"github.com/aws/aws-sdk-go/service/route53"
+
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
+	"k8s.io/kubernetes/pkg/util"
 )
 
 // Compile time check for interface adeherence
@@ -43,3 +45,19 @@ func (zones Zones) List() ([]dnsprovider.Zone, error) {
 	}
 	return zoneList, nil
 }
+
+func (zones Zones) Add(zone dnsprovider.Zone) (dnsprovider.Zone, error) {
+	dnsName := zone.Name()
+	input := route53.CreateHostedZoneInput{Name: &dnsName}
+	output, err := zones.interface_.service.CreateHostedZone(&input)
+	if err != nil {
+		return nil, err
+	}
+	return &Zone{output.HostedZone, &zones}, nil
+}
+
+func (zones Zones) New(name string) (dnsprovider.Zone, error) {
+	id := string(util.NewUUID())
+	managedZone := route53.HostedZone{Id: &id, Name: &name}
+	return &Zone{&managedZone, &zones}, nil
+}
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/change.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/change.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.Change = Change{}
 
 type Change struct{ impl *dns.Change }

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_create_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_create_call.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ChangesCreateCall = ChangesCreateCall{}
 
 type ChangesCreateCall struct{ impl *dns.ChangesCreateCall }

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/changes_service.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ChangesService = ChangesService{}
 
 type ChangesService struct{ impl *dns.ChangesService }

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces/interfaces.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces/interfaces.go
@@ -133,10 +133,11 @@ type (
 
 	ManagedZonesService interface {
 		// NewManagedZonesService(s *Service) *ManagedZonesService // TODO: Add to service if needed
-		Create(project string, managedzone ManagedZone) ManagedZonesCreateCall
+		Create(project string, managedZone ManagedZone) ManagedZonesCreateCall
 		Delete(project string, managedZone string) ManagedZonesDeleteCall
 		Get(project string, managedZone string) ManagedZonesGetCall
 		List(project string) ManagedZonesListCall
+		NewManagedZone(dnsName string) ManagedZone
 	}
 
 	Project interface {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZone = ManagedZone{}
 
 type ManagedZone struct{ impl *dns.ManagedZone }

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone_create_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zone_create_call.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesCreateCall = ManagedZonesCreateCall{}
 
 type ManagedZonesCreateCall struct{ impl *dns.ManagedZonesCreateCall }

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_delete_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_delete_call.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesDeleteCall = ManagedZonesDeleteCall{}
 
 type ManagedZonesDeleteCall struct{ impl *dns.ManagedZonesDeleteCall }

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_get_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_get_call.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesGetCall = ManagedZonesGetCall{}
 
 type ManagedZonesGetCall struct{ impl *dns.ManagedZonesGetCall }

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_call.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesListCall = &ManagedZonesListCall{}
 
 type ManagedZonesListCall struct{ impl *dns.ManagedZonesListCall }

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_response.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_list_response.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesListResponse = &ManagedZonesListResponse{}
 
 type ManagedZonesListResponse struct{ impl *dns.ManagedZonesListResponse }

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/managed_zones_service.go
@@ -19,8 +19,10 @@ package internal
 import (
 	dns "google.golang.org/api/dns/v1"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
+	"k8s.io/kubernetes/pkg/util"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesService = &ManagedZonesService{}
 
 type ManagedZonesService struct{ impl *dns.ManagedZonesService }
@@ -40,3 +42,7 @@ func (m *ManagedZonesService) Get(project, managedZone string) interfaces.Manage
 func (m *ManagedZonesService) List(project string) interfaces.ManagedZonesListCall {
 	return &ManagedZonesListCall{m.impl.List(project)}
 }
+
+func (m *ManagedZonesService) NewManagedZone(dnsName string) interfaces.ManagedZone {
+	return &ManagedZone{impl: &dns.ManagedZone{Name: string(util.NewUUID()), DnsName: dnsName}}
+}
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrset.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrset.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ResourceRecordSet = ResourceRecordSet{}
 
 type ResourceRecordSet struct{ impl *dns.ResourceRecordSet }

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_call.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ResourceRecordSetsListCall = &ResourceRecordSetsListCall{}
 
 type ResourceRecordSetsListCall struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_response.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_list_response.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ResourceRecordSetsListResponse = &ResourceRecordSetsListResponse{}
 
 type ResourceRecordSetsListResponse struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/rrsets_service.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ResourceRecordSetsService = &ResourceRecordSetsService{}
 
 type ResourceRecordSetsService struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/service.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.Service = &Service{}
 
 type Service struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/change.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/change.go
@@ -18,6 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
+// Compile time check for interface adeherence
 var _ interfaces.Change = &Change{}
 
 type Change struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_create_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_create_call.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ChangesCreateCall = ChangesCreateCall{}
 
 type ChangesCreateCall struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/changes_service.go
@@ -18,6 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
+// Compile time check for interface adeherence
 var _ interfaces.ChangesService = &ChangesService{}
 
 type ChangesService struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone.go
@@ -18,6 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZone = ManagedZone{}
 
 type ManagedZone struct {

diff --git a/...tion/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone_create_call.go b/...tion/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zone_create_call.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesCreateCall = ManagedZonesCreateCall{}
 
 type ManagedZonesCreateCall struct {

diff --git a/...ion/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_delete_call.go b/...ion/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_delete_call.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesDeleteCall = ManagedZonesDeleteCall{}
 
 type ManagedZonesDeleteCall struct {

diff --git a/...ration/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_get_call.go b/...ration/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_get_call.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesGetCall = ManagedZonesGetCall{}
 
 type ManagedZonesGetCall struct {

diff --git a/...ation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_call.go b/...ation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_call.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesListCall = &ManagedZonesListCall{}
 
 type ManagedZonesListCall struct {

diff --git a/...n/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_response.go b/...n/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_list_response.go
@@ -18,6 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesListResponse = &ManagedZonesListResponse{}
 
 type ManagedZonesListResponse struct{ ManagedZones_ []interfaces.ManagedZone }

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/managed_zones_service.go
@@ -18,6 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
+// Compile time check for interface adeherence
 var _ interfaces.ManagedZonesService = &ManagedZonesService{}
 
 type ManagedZonesService struct {
@@ -39,3 +40,7 @@ func (m *ManagedZonesService) Get(project string, managedZone string) interfaces
 func (m *ManagedZonesService) List(project string) interfaces.ManagedZonesListCall {
 	return &ManagedZonesListCall{m, project, nil, nil, ""}
 }
+
+func (m *ManagedZonesService) NewManagedZone(dnsName string) interfaces.ManagedZone {
+	return &ManagedZone{Service: m, Name_: dnsName}
+}
diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrset.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrset.go
@@ -18,6 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
+// Compile time check for interface adeherence
 var _ interfaces.ResourceRecordSet = ResourceRecordSet{}
 
 type ResourceRecordSet struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_call.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_call.go
@@ -21,6 +21,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ResourceRecordSetsListCall = &ResourceRecordSetsListCall{}
 
 type ResourceRecordSetsListCall struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_response.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_list_response.go
@@ -18,6 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
+// Compile time check for interface adeherence
 var _ interfaces.ResourceRecordSetsListResponse = &ResourceRecordSetsListResponse{}
 
 type ResourceRecordSetsListResponse struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/rrsets_service.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"
 )
 
+// Compile time check for interface adeherence
 var _ interfaces.ResourceRecordSetsService = &ResourceRecordSetsService{}
 
 type ResourceRecordSetsService struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/service.go b/federation/pkg/dnsprovider/providers/google/clouddns/internal/stubs/service.go
@@ -18,6 +18,7 @@ package stubs
 
 import "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 
+// Compile time check for interface adeherence
 var _ interfaces.Service = &Service{}
 
 type Service struct {

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/rrset.go b/federation/pkg/dnsprovider/providers/google/clouddns/rrset.go
@@ -17,10 +17,14 @@ limitations under the License.
 package clouddns
 
 import (
+	"k8s.io/kubernetes/federation/pkg/dnsprovider"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"
 )
 
+// Compile time check for interface adeherence
+var _ dnsprovider.ResourceRecordSet = ResourceRecordSet{}
+
 type ResourceRecordSet struct {
 	impl   interfaces.ResourceRecordSet
 	rrsets *ResourceRecordSets

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/rrsets.go b/federation/pkg/dnsprovider/providers/google/clouddns/rrsets.go
@@ -24,6 +24,9 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"
 )
 
+// Compile time check for interface adeherence
+var _ dnsprovider.ResourceRecordSets = ResourceRecordSets{}
+
 type ResourceRecordSets struct {
 	zone *Zone
 	impl interfaces.ResourceRecordSetsService

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/zone.go b/federation/pkg/dnsprovider/providers/google/clouddns/zone.go
@@ -21,6 +21,9 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
+var _ dnsprovider.Zone = &Zone{}
+
 type Zone struct {
 	impl  interfaces.ManagedZone
 	zones *Zones

diff --git a/federation/pkg/dnsprovider/providers/google/clouddns/zones.go b/federation/pkg/dnsprovider/providers/google/clouddns/zones.go
@@ -21,6 +21,9 @@ import (
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns/internal/interfaces"
 )
 
+// Compile time check for interface adeherence
+var _ dnsprovider.Zones = Zones{}
+
 type Zones struct {
 	impl       interfaces.ManagedZonesService
 	interface_ *Interface
@@ -39,6 +42,20 @@ func (zones Zones) List() ([]dnsprovider.Zone, error) {
 	return zoneList, nil
 }
 
+func (zones Zones) Add(zone dnsprovider.Zone) (dnsprovider.Zone, error) {
+	managedZone := zones.impl.NewManagedZone(zone.Name())
+	response, err := zones.impl.Create(zones.project(), managedZone).Do()
+	if err != nil {
+		return nil, err
+	}
+	return &Zone{response, &zones}, nil
+}
+
+func (zones Zones) New(name string) (dnsprovider.Zone, error) {
+	managedZone := zones.impl.NewManagedZone(name)
+	return &Zone{managedZone, &zones}, nil
+}
+
 func (zones Zones) project() string {
 	return zones.interface_.project()
 }
diff --git a/federation/pkg/federation-controller/service/servicecontroller.go b/federation/pkg/federation-controller/service/servicecontroller.go
@@ -263,6 +263,19 @@ func (s *ServiceController) init() error {
 		return fmt.Errorf("the dns provider does not support zone enumeration, which is required for creating dns records.")
 	}
 	s.dnsZones = zones
+	if _, err := getDnsZone(s.zoneName, s.dnsZones); err != nil {
+		glog.Infof("DNS zone %q not found.  Creating DNS zone %q.", s.zoneName, s.zoneName)
+		managedZone, err := s.dnsZones.New(s.zoneName)
+		if err != nil {
+			return err
+		}
+		zone, err := s.dnsZones.Add(managedZone)
+		if err != nil {
+			return err
+		}
+		glog.Infof("DNS zone %q successfully created.  Note that DNS resolution will not work until you have registered this name with "+
+			"a DNS registrar and they have changed the authoritative name servers for your domain to point to your DNS provider.", zone.Name())
+	}
 	return nil
 }