Merge pull request #5367 from timothysc/kublet-etcd-cleanup

pkg/kubelet/kubelet.go

@@ -850,7 +850,7 @@ func (kl *Kubelet) makeEnvironmentVariables(ns string, container *api.Container)
 	}
 
 	for _, value := range container.Env {
-		// The code is in transition from using etcd+BoundPods to apiserver+Pods.
+		// Accesses apiserver+Pods.
 		// So, the master may set service env vars, or kubelet may.  In case both are doing
 		// it, we delete the key from the kubelet-generated ones so we don't have duplicate
 		// env vars.

pkg/kubelet/types.go

@@ -40,8 +40,6 @@ const (
 	// These constants identify the sources of pods
 	// Updates from a file
 	FileSource = "file"
-	// Updates from etcd
-	EtcdSource = "etcd" // Not supported by current kubelets.
 	// Updates from querying a web page
 	HTTPSource = "http"
 	// Updates received to the kubelet server