github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

remove ro refs from more places

Browse Source
This commit is contained in:
Daniel Smith 2015-06-02 11:46:57 -07:00
parent 6e95388672
commit 3f454b7599
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/kubelet.go
View File

@ -872,7 +872,7 @@ func (kl *Kubelet) GenerateRunContainerOptions(pod *api.Pod, container *api.Cont
return opts, nil 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 // 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) { 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 serviceMap[serviceName] = service
case kl.masterServiceNamespace: case kl.masterServiceNamespace:
if masterServices.Has(serviceName) { if masterServices.Has(serviceName) {
_, exists := serviceMap[serviceName] if _, exists := serviceMap[serviceName]; !exists {
if !exists {
serviceMap[serviceName] = service serviceMap[serviceName] = service
} }
} }

2
pkg/master/controller.go
View File

@ -35,7 +35,7 @@ import (
) )
// Controller is the controller manager for the core bootstrap Kubernetes controller // 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 // namespace, and provide the IP repair check on service IPs
type Controller struct { type Controller struct {
NamespaceRegistry namespace.Registry NamespaceRegistry namespace.Registry