Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor cleanup for etcd cleaning from kubelet #5367

Merged
merged 1 commit into from
Mar 12, 2015
Merged

Minor cleanup for etcd cleaning from kubelet #5367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/kubelet/kubelet.go
View file
Open in desktop
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
View file
Open in desktop
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