diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index e30e527a16c..a3822572191 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -872,7 +872,7 @@ func (kl *Kubelet) GenerateRunContainerOptions(pod *api.Pod, container *api.Cont return opts, nil } -var masterServices = util.NewStringSet("kubernetes", "kubernetes-ro") +var masterServices = util.NewStringSet("kubernetes") // getServiceEnvVarMap makes a map[string]string of env vars for services a pod in namespace ns should see func (kl *Kubelet) getServiceEnvVarMap(ns string) (map[string]string, error) { @@ -909,8 +909,7 @@ func (kl *Kubelet) getServiceEnvVarMap(ns string) (map[string]string, error) { serviceMap[serviceName] = service case kl.masterServiceNamespace: if masterServices.Has(serviceName) { - _, exists := serviceMap[serviceName] - if !exists { + if _, exists := serviceMap[serviceName]; !exists { serviceMap[serviceName] = service } } diff --git a/pkg/master/controller.go b/pkg/master/controller.go index 96099057a2d..c32845d502f 100644 --- a/pkg/master/controller.go +++ b/pkg/master/controller.go @@ -35,7 +35,7 @@ import ( ) // Controller is the controller manager for the core bootstrap Kubernetes controller -// loops, which manage creating the "kubernetes" and "kubernetes-ro" services, the "default" +// loops, which manage creating the "kubernetes" service, the "default" // namespace, and provide the IP repair check on service IPs type Controller struct { NamespaceRegistry namespace.Registry