From c2e21fe5d7995cd7f7dad6d20b9178c29bb62e4b Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 3 Jun 2015 21:33:41 -0700 Subject: [PATCH] use c.EtcdHelper in master.go --- pkg/master/master.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/master/master.go b/pkg/master/master.go index 9cc85ac15a..5d54a0d9c7 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -389,17 +389,10 @@ func logStackOnRecover(panicReason interface{}, httpWriter http.ResponseWriter) // init initializes master. func (m *Master) init(c *Config) { - // TODO: make initialization of the helper part of the Master, and allow some storage - // objects to have a newer storage version than the user's default. - newerHelper, err := NewEtcdHelper(c.EtcdHelper.Client, "v1beta3", DefaultEtcdPathPrefix) - if err != nil { - glog.Fatalf("Unable to setup storage for v1beta3: %v", err) - } - podStorage := podetcd.NewStorage(c.EtcdHelper, c.KubeletClient) podRegistry := pod.NewRegistry(podStorage.Pod) - podTemplateStorage := podtemplateetcd.NewREST(newerHelper) + podTemplateStorage := podtemplateetcd.NewREST(c.EtcdHelper) eventRegistry := event.NewEtcdRegistry(c.EtcdHelper, uint64(c.EventTTL.Seconds())) limitRangeRegistry := limitrange.NewEtcdRegistry(c.EtcdHelper)