Skip to content

Commit

Permalink
Minor cleanup for etcd cleaning from kubelet
Browse files Browse the repository at this point in the history
  • Loading branch information
Timothy St. Clair committed Mar 12, 2015
1 parent a8f0139 commit 308bb84
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion pkg/kubelet/kubelet.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions pkg/kubelet/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 308bb84

Please sign in to comment.