github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check kubeClient nil in Kubelet and bugfix

Browse Source
This commit is contained in:
Ke Zhang
2016-09-13 18:00:46 +08:00
parent 622c2bbd5e
commit 423a51b632
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/kubelet.go
View File

@@ -1533,10 +1533,14 @@ func (kl *Kubelet) makeEnvironmentVariables(pod *api.Pod, container *api.Contain
key := envVar.ValueFrom.ConfigMapKeyRef.Key key := envVar.ValueFrom.ConfigMapKeyRef.Key
configMap, ok := configMaps[name] configMap, ok := configMaps[name]
if !ok { if !ok {
if kl.kubeClient == nil {
return result, fmt.Errorf("Couldn't get configMap %v/%v, no kubeClient defined", pod.Namespace, name)
}
configMap, err = kl.kubeClient.Core().ConfigMaps(pod.Namespace).Get(name) configMap, err = kl.kubeClient.Core().ConfigMaps(pod.Namespace).Get(name)
if err != nil { if err != nil {
return result, err return result, err
} }
configMaps[name] = configMap
} }
runtimeVal, ok = configMap.Data[key] runtimeVal, ok = configMap.Data[key]
if !ok { if !ok {
@@ -1547,10 +1551,14 @@ func (kl *Kubelet) makeEnvironmentVariables(pod *api.Pod, container *api.Contain
key := envVar.ValueFrom.SecretKeyRef.Key key := envVar.ValueFrom.SecretKeyRef.Key
secret, ok := secrets[name] secret, ok := secrets[name]
if !ok { if !ok {
if kl.kubeClient == nil {
return result, fmt.Errorf("Couldn't get secret %v/%v, no kubeClient defined", pod.Namespace, name)
}
secret, err = kl.kubeClient.Core().Secrets(pod.Namespace).Get(name) secret, err = kl.kubeClient.Core().Secrets(pod.Namespace).Get(name)
if err != nil { if err != nil {
return result, err return result, err
} }
secrets[name] = secret
} }
runtimeValBytes, ok := secret.Data[key] runtimeValBytes, ok := secret.Data[key]
if !ok { if !ok {