Merge pull request #32563 from ZTE-PaaS/zhangke-patch-045

Automatic merge from submit-queue Check kubeClient nil in Kubelet and bugfix 1. check kubeClient nil first before using as it maybe nil 2. configMaps and secrets map do not be used properly and should use it as cache

Merge pull request #32563 from ZTE-PaaS/zhangke-patch-045
2c6620b1 · Kubernetes Submit Queue · GitHub · 9a342982 · 423a51b6 · 2c6620b1
Commit 2c6620b1 authored Sep 15, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

kubelet.go pkg/kubelet/kubelet.go +8 -0

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -1534,10 +1534,14 @@ func (kl *Kubelet) makeEnvironmentVariables(pod *api.Pod, container *api.Contain
 				key := envVar.ValueFrom.ConfigMapKeyRef.Key
 				configMap, ok := configMaps[name]
 				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)
 					if err != nil {
 						return result, err
 					}
+					configMaps[name] = configMap
 				}
 				runtimeVal, ok = configMap.Data[key]
 				if !ok {
@@ -1548,10 +1552,14 @@ func (kl *Kubelet) makeEnvironmentVariables(pod *api.Pod, container *api.Contain
 				key := envVar.ValueFrom.SecretKeyRef.Key
 				secret, ok := secrets[name]
 				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)
 					if err != nil {
 						return result, err
 					}
+					secrets[name] = secret
 				}
 				runtimeValBytes, ok := secret.Data[key]
 				if !ok {