kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply gofmt to dns-controller

This commit is contained in:
Justin Santa Barbara 2016-07-27 11:04:57 -04:00
parent e3d6231fbe
commit 8df2a8c843
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dns-controller/pkg/dns/dnscontroller.go
View File

@ -21,18 +21,18 @@ type DNSController struct {
util.Stoppable util.Stoppable
// zones is the DNS provider // zones is the DNS provider
zones dnsprovider.Zones zones dnsprovider.Zones
// mutex protects the following mutable state // mutex protects the following mutable state
mutex sync.Mutex mutex sync.Mutex
// scopes is a map for each top-level grouping // scopes is a map for each top-level grouping
scopes map[string]*DNSControllerScope scopes map[string]*DNSControllerScope
// lastSuccessSnapshot is the last snapshot we were able to apply to DNS // lastSuccessSnapshot is the last snapshot we were able to apply to DNS
// This lets us perform incremental updates to DNS. // This lets us perform incremental updates to DNS.
lastSuccessfulSnapshot *snapshot lastSuccessfulSnapshot *snapshot
// changeCount is a change-counter, which helps us avoid computation when nothing has changed // changeCount is a change-counter, which helps us avoid computation when nothing has changed
changeCount uint64 changeCount uint64
} }
// DNSController is a Context // DNSController is a Context
@ -43,16 +43,16 @@ type DNSControllerScope struct {
// ScopeName is the string id for this scope // ScopeName is the string id for this scope
ScopeName string ScopeName string
parent *DNSController parent *DNSController
// mutex protected the following mutable state // mutex protected the following mutable state
mutex sync.Mutex mutex sync.Mutex
// Ready is set if the populating controller has performed an initial synchronization of records // Ready is set if the populating controller has performed an initial synchronization of records
Ready bool Ready bool
// Records is the map of actual records for this scope // Records is the map of actual records for this scope
Records map[string][]Record Records map[string][]Record
} }
// DNSControllerScope is a Scope // DNSControllerScope is a Scope
@ -312,7 +312,7 @@ func (o *dnsOp) findZone(fqdn string) dnsprovider.Zone {
if dot == -1 { if dot == -1 {
return nil return nil
} }
zoneName = zoneName[dot + 1:] zoneName = zoneName[dot+1:]
} }
} }

4
dns-controller/pkg/watchers/ingresscontroller.go
View File

@ -21,7 +21,7 @@ import (
type IngressController struct { type IngressController struct {
util.Stoppable util.Stoppable
kubeClient *client_extensions.ExtensionsClient kubeClient *client_extensions.ExtensionsClient
scope dns.Scope scope dns.Scope
} }
// newIngressController creates a ingressController // newIngressController creates a ingressController
@ -32,7 +32,7 @@ func NewIngressController(kubeClient *client_extensions.ExtensionsClient, dns dn
} }
c := &IngressController{ c := &IngressController{
kubeClient: kubeClient, kubeClient: kubeClient,
scope: scope, scope: scope,
} }
return c, nil return c, nil

4
dns-controller/pkg/watchers/nodecontroller.go
View File

@ -20,7 +20,7 @@ import (
type NodeController struct { type NodeController struct {
util.Stoppable util.Stoppable
kubeClient *client.CoreClient kubeClient *client.CoreClient
scope dns.Scope scope dns.Scope
} }
// newNodeController creates a nodeController // newNodeController creates a nodeController
@ -31,7 +31,7 @@ func NewNodeController(kubeClient *client.CoreClient, dns dns.Context) (*NodeCon
} }
c := &NodeController{ c := &NodeController{
kubeClient: kubeClient, kubeClient: kubeClient,
scope: scope, scope: scope,
} }
return c, nil return c, nil

4
dns-controller/pkg/watchers/podcontroller.go
View File

@ -32,7 +32,7 @@ func NewPodController(kubeClient *client.CoreClient, dns dns.Context) (*PodContr
} }
c := &PodController{ c := &PodController{
kubeClient: kubeClient, kubeClient: kubeClient,
scope: scope, scope: scope,
} }
return c, nil return c, nil
@ -127,7 +127,7 @@ func (c *PodController) updatePodRecords(pod *v1.Pod) {
var aliases []string var aliases []string
if pod.Spec.HostNetwork { if pod.Spec.HostNetwork {
if pod.Spec.NodeName != "" { if pod.Spec.NodeName != "" {
aliases = append(aliases, "node/" + pod.Spec.NodeName + "/external") aliases = append(aliases, "node/"+pod.Spec.NodeName+"/external")
} }
} else { } else {
glog.V(4).Infof("Pod %q had %s=%s, but was not HostNetwork", pod.Name, AnnotationNameDnsExternal, specExternal) glog.V(4).Infof("Pod %q had %s=%s, but was not HostNetwork", pod.Name, AnnotationNameDnsExternal, specExternal)

6
dns-controller/pkg/watchers/servicecontroller.go
View File

@ -21,7 +21,7 @@ import (
type ServiceController struct { type ServiceController struct {
util.Stoppable util.Stoppable
kubeClient *client.CoreClient kubeClient *client.CoreClient
scope dns.Scope scope dns.Scope
} }
// newServiceController creates a serviceController // newServiceController creates a serviceController
@ -32,7 +32,7 @@ func NewServiceController(kubeClient *client.CoreClient, dns dns.Context) (*Serv
} }
c := &ServiceController{ c := &ServiceController{
kubeClient: kubeClient, kubeClient: kubeClient,
scope: scope, scope: scope,
} }
return c, nil return c, nil
@ -158,5 +158,5 @@ func (c *ServiceController) updateServiceRecords(service *v1.Service) {
glog.V(4).Infof("Service %q did not have %s annotation", service.Name, AnnotationNameDnsInternal) glog.V(4).Infof("Service %q did not have %s annotation", service.Name, AnnotationNameDnsInternal)
} }
c.scope.Replace( service.Name, records) c.scope.Replace(service.Name, records)
} }