github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix to inject KUBERNETES_ env vars when enableServiceLinks is

Browse Source 
false and the pod is in the master namespace.
This commit is contained in:
Brad Hoekstra 2018-08-30 14:42:11 -04:00
parent ac8799a80d
commit e8366c8e99
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubelet/kubelet_pods.go
View File

@ -514,24 +514,14 @@ func (kl *Kubelet) getServiceEnvVarMap(ns string, enableServiceLinks *bool) (map
} }
serviceName := service.Name serviceName := service.Name
switch service.Namespace {
// for the case whether the master service namespace is the namespace the pod // for the case whether the master service namespace is the namespace the pod
// is in, the pod should receive all the services in the namespace. // is in, the pod should receive all the services in the namespace.
// if service.Namespace == kl.masterServiceNamespace && masterServices.Has(serviceName) {
// ordering of the case clauses below enforces this if _, exists := serviceMap[serviceName]; !exists {
case ns: serviceMap[serviceName] = service
// If service links are not enabled, we shouldn't add services from
// the same namespace.
if !*enableServiceLinks {
continue
} }
} else if service.Namespace == ns && *enableServiceLinks {
serviceMap[serviceName] = service serviceMap[serviceName] = service
case kl.masterServiceNamespace:
if masterServices.Has(serviceName) {
if _, exists := serviceMap[serviceName]; !exists {
serviceMap[serviceName] = service
}
}
} }
} }

11
pkg/kubelet/kubelet_pods_test.go
View File

@ -36,6 +36,7 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
// TODO: remove this import if // TODO: remove this import if
// api.Registry.GroupOrDie(v1.GroupName).GroupVersions[0].String() is changed // api.Registry.GroupOrDie(v1.GroupName).GroupVersions[0].String() is changed
// to "v1"? // to "v1"?
@ -625,7 +626,15 @@ func TestMakeEnvironmentVariables(t *testing.T) {
container: &v1.Container{}, container: &v1.Container{},
masterServiceNs: "kubernetes", masterServiceNs: "kubernetes",
nilLister: false, nilLister: false,
expectedEnvs: nil, expectedEnvs: []kubecontainer.EnvVar{
{Name: "KUBERNETES_SERVICE_HOST", Value: "1.2.3.6"},
{Name: "KUBERNETES_SERVICE_PORT", Value: "8086"},
{Name: "KUBERNETES_PORT", Value: "tcp://1.2.3.6:8086"},
{Name: "KUBERNETES_PORT_8086_TCP", Value: "tcp://1.2.3.6:8086"},
{Name: "KUBERNETES_PORT_8086_TCP_PROTO", Value: "tcp"},
{Name: "KUBERNETES_PORT_8086_TCP_PORT", Value: "8086"},
{Name: "KUBERNETES_PORT_8086_TCP_ADDR", Value: "1.2.3.6"},
},
}, },
{ {
name: "pod in master service ns, service env vars", name: "pod in master service ns, service env vars",