From 9c35184f0527d9a79a41f09475aa366a4d406b93 Mon Sep 17 00:00:00 2001 From: "Rostislav M. Georgiev" Date: Thu, 16 Aug 2018 16:03:35 +0300 Subject: [PATCH] kubeadm: Remove unused piece of code kubeletFailTempl no longer contains any images, thus we don't need to fill them in its context. Signed-off-by: Rostislav M. Georgiev --- cmd/kubeadm/app/cmd/init.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go index 895e200ed59..67b66e16297 100644 --- a/cmd/kubeadm/app/cmd/init.go +++ b/cmd/kubeadm/app/cmd/init.go @@ -41,7 +41,6 @@ import ( cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/features" - "k8s.io/kubernetes/cmd/kubeadm/app/images" dnsaddonphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/dns" proxyaddonphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/proxy" clusterinfophase "k8s.io/kubernetes/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo" @@ -384,16 +383,7 @@ func (i *Init) Run(out io.Writer) error { if err := waitForKubeletAndFunc(waiter, waiter.WaitForAPI); err != nil { ctx := map[string]string{ - "Error": fmt.Sprintf("%v", err), - "APIServerImage": images.GetKubeControlPlaneImage(kubeadmconstants.KubeAPIServer, i.cfg), - "ControllerManagerImage": images.GetKubeControlPlaneImage(kubeadmconstants.KubeControllerManager, i.cfg), - "SchedulerImage": images.GetKubeControlPlaneImage(kubeadmconstants.KubeScheduler, i.cfg), - } - // Set .EtcdImage conditionally - if i.cfg.Etcd.Local != nil { - ctx["EtcdImage"] = fmt.Sprintf(" - %s", images.GetEtcdImage(i.cfg)) - } else { - ctx["EtcdImage"] = "" + "Error": fmt.Sprintf("%v", err), } kubeletFailTempl.Execute(out, ctx)