github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Minor cleanup for etcd cleaning from kubelet
This commit is contained in:
Satnam Singh 2015-03-12 08:25:24 -07:00
commit 1c0be2d6fb
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet.go
View File

@ -850,7 +850,7 @@ func (kl *Kubelet) makeEnvironmentVariables(ns string, container *api.Container)
} }
for _, value := range container.Env { 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 // 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 // it, we delete the key from the kubelet-generated ones so we don't have duplicate
// env vars. // env vars.

2
pkg/kubelet/types.go
View File

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