From 6e6f465a3699ffc080628310694810ad04c7d498 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Fri, 9 Jan 2015 02:12:19 -0800 Subject: [PATCH] Fix a crash for kubelet when without EtcdClient. --- pkg/standalone/standalone.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/standalone/standalone.go b/pkg/standalone/standalone.go index c20bbe4b36d..1df2948316a 100644 --- a/pkg/standalone/standalone.go +++ b/pkg/standalone/standalone.go @@ -20,6 +20,7 @@ import ( "fmt" "net" "net/http" + "reflect" "time" "github.com/GoogleCloudPlatform/kubernetes/pkg/api" @@ -225,8 +226,7 @@ func makePodSourceConfig(kc *KubeletConfig) *config.PodConfig { glog.Infof("Adding manifest url: %v", kc.ManifestURL) config.NewSourceURL(kc.ManifestURL, kc.HttpCheckFrequency, cfg.Channel(kubelet.HTTPSource)) } - - if kc.EtcdClient != nil { + if !reflect.ValueOf(kc.EtcdClient).IsNil() { glog.Infof("Watching for etcd configs at %v", kc.EtcdClient.GetCluster()) config.NewSourceEtcd(config.EtcdKeyForHost(kc.Hostname), kc.EtcdClient, cfg.Channel(kubelet.EtcdSource)) }