Stop putting env vars into BoundPods.

They will still show up in etcd. They never were available through the API. A subsequent PR(s) will rip out all BoundPods code. Working in small increments. This PR will cause users on lagging cloud providers to not get env vars in their pods if they update to this code. They have already been warned via email. Removed unit tests of BasicBoundPodFactory. There is adequate coverage in pkg/kubelet/kubelet_test.go.
duda · Feb 12, 2015 · 5b45696 · 5b45696
1 parent 42f0458
commit 5b45696
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 461 deletions.
diff --git a/pkg/master/master.go b/pkg/master/master.go
@@ -253,12 +253,7 @@ func setDefaults(c *Config) {
 //   any unhandled paths to "Handler".
 func New(c *Config) *Master {
 	setDefaults(c)
-	minionRegistry := etcd.NewRegistry(c.EtcdHelper, nil)
-	serviceRegistry := etcd.NewRegistry(c.EtcdHelper, nil)
-	boundPodFactory := &pod.BasicBoundPodFactory{
-		ServiceRegistry:        serviceRegistry,
-		MasterServiceNamespace: c.MasterServiceNamespace,
-	}
+	boundPodFactory := &pod.BasicBoundPodFactory{}
 	if c.KubeletClient == nil {
 		glog.Fatalf("master.New() called with config.KubeletClient == nil")
 	}
@@ -277,12 +272,12 @@ func New(c *Config) *Master {
 	m := &Master{
 		podRegistry:           etcd.NewRegistry(c.EtcdHelper, boundPodFactory),
 		controllerRegistry:    etcd.NewRegistry(c.EtcdHelper, nil),
-		serviceRegistry:       serviceRegistry,
+		serviceRegistry:       etcd.NewRegistry(c.EtcdHelper, nil),
 		endpointRegistry:      etcd.NewRegistry(c.EtcdHelper, nil),
 		bindingRegistry:       etcd.NewRegistry(c.EtcdHelper, boundPodFactory),
 		eventRegistry:         event.NewEtcdRegistry(c.EtcdHelper, uint64(c.EventTTL.Seconds())),
 		namespaceRegistry:     namespace.NewEtcdRegistry(c.EtcdHelper),
-		minionRegistry:        minionRegistry,
+		minionRegistry:        etcd.NewRegistry(c.EtcdHelper, nil),
 		limitRangeRegistry:    limitrange.NewEtcdRegistry(c.EtcdHelper),
 		resourceQuotaRegistry: resourcequota.NewEtcdRegistry(c.EtcdHelper),
 		client:                c.Client,

diff --git a/pkg/registry/etcd/etcd_test.go b/pkg/registry/etcd/etcd_test.go
@@ -27,7 +27,6 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/pod"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/registrytest"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
 
@@ -36,9 +35,7 @@ import (
 
 func NewTestEtcdRegistry(client tools.EtcdClient) *Registry {
 	registry := NewRegistry(tools.EtcdHelper{client, latest.Codec, tools.RuntimeVersionAdapter{latest.ResourceVersioner}},
-		&pod.BasicBoundPodFactory{
-			ServiceRegistry: &registrytest.ServiceRegistry{},
-		})
+		&pod.BasicBoundPodFactory{})
 	return registry
 }
 

diff --git a/pkg/registry/pod/bound_pod_factory.go b/pkg/registry/pod/bound_pod_factory.go
@@ -18,68 +18,20 @@ package pod
 
 import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/envvars"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 )
 
 type BoundPodFactory interface {
 	// Make a container object for a given pod, given the machine that the pod is running on.
 	MakeBoundPod(machine string, pod *api.Pod) (*api.BoundPod, error)
 }
 
-type BasicBoundPodFactory struct {
-	// TODO: this should really point at the API rather than a registry
-	ServiceRegistry        service.Registry
-	MasterServiceNamespace string
-}
-
-var masterServiceNames = util.NewStringSet("kubernetes", "kubernetes-ro")
-
-// getServiceEnvironmentVariables populates a list of environment variables that are used
-// in the container environment to get access to services.
-func (b *BasicBoundPodFactory) getServiceEnvironmentVariables(ctx api.Context, registry service.Registry, machine string) ([]api.EnvVar, error) {
-	var result []api.EnvVar
-	servicesInNs, err := registry.ListServices(ctx)
-	if err != nil {
-		return result, err
-	}
-
-	masterServices, err := registry.ListServices(api.WithNamespace(api.NewContext(), b.MasterServiceNamespace))
-	if err != nil {
-		return result, err
-	}
-
-	projection := map[string]api.Service{}
-	services := []api.Service{}
-	for _, service := range masterServices.Items {
-		if masterServiceNames.Has(service.Name) {
-			projection[service.Name] = service
-		}
-	}
-	for _, service := range servicesInNs.Items {
-		projection[service.Name] = service
-	}
-	for _, service := range projection {
-		services = append(services, service)
-	}
-
-	return envvars.FromServices(&api.ServiceList{Items: services}), nil
-}
+type BasicBoundPodFactory struct{}
 
 func (b *BasicBoundPodFactory) MakeBoundPod(machine string, pod *api.Pod) (*api.BoundPod, error) {
-	envVars, err := b.getServiceEnvironmentVariables(api.WithNamespace(api.NewContext(), pod.Namespace), b.ServiceRegistry, machine)
-	if err != nil {
-		return nil, err
-	}
-
 	boundPod := &api.BoundPod{}
 	if err := api.Scheme.Convert(pod, boundPod); err != nil {
 		return nil, err
 	}
-	for ix, container := range boundPod.Spec.Containers {
-		boundPod.Spec.Containers[ix].Env = append(container.Env, envVars...)
-	}
 	// Make a dummy self link so that references to this bound pod will work.
 	boundPod.SelfLink = "/api/v1beta1/boundPods/" + boundPod.Name
 	return boundPod, nil