From da6d1da12db98ed174ec92297a25ff3ba4d98126 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 16 Feb 2015 08:38:10 -0800 Subject: [PATCH 1/5] pkg/kubelet: remove unused var in handlers.go --- pkg/kubelet/handlers.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/kubelet/handlers.go b/pkg/kubelet/handlers.go index c4cb0d70433..70a521a99fb 100644 --- a/pkg/kubelet/handlers.go +++ b/pkg/kubelet/handlers.go @@ -72,7 +72,6 @@ func ResolvePort(portReference util.IntOrString, container *api.Container) (int, func (h *httpActionHandler) Run(podFullName string, uid types.UID, container *api.Container, handler *api.Handler) error { host := handler.HTTPGet.Host if len(host) == 0 { - var status api.PodStatus status, err := h.kubelet.GetPodStatus(podFullName, uid) if err != nil { glog.Errorf("unable to get pod info, event handlers may be invalid.") From edc926ffcb98d034a4ec13b7b2a41bb0bbbc66f5 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 16 Feb 2015 08:40:07 -0800 Subject: [PATCH 2/5] pkg/kubelet: capitalize message in print --- pkg/kubelet/handlers.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/handlers.go b/pkg/kubelet/handlers.go index 70a521a99fb..ef9df19077c 100644 --- a/pkg/kubelet/handlers.go +++ b/pkg/kubelet/handlers.go @@ -74,7 +74,7 @@ func (h *httpActionHandler) Run(podFullName string, uid types.UID, container *ap if len(host) == 0 { status, err := h.kubelet.GetPodStatus(podFullName, uid) if err != nil { - glog.Errorf("unable to get pod info, event handlers may be invalid.") + glog.Errorf("Unable to get pod info, event handlers may be invalid.") return err } netInfo, found := status.Info[dockertools.PodInfraContainerName] From 13bb378d1ce3c0cd9faa05415a4addfde105b061 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 16 Feb 2015 08:46:41 -0800 Subject: [PATCH 3/5] pkg/kubelet: reduce indentation --- pkg/kubelet/handlers.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/handlers.go b/pkg/kubelet/handlers.go index ef9df19077c..2aaa9042a9a 100644 --- a/pkg/kubelet/handlers.go +++ b/pkg/kubelet/handlers.go @@ -78,11 +78,10 @@ func (h *httpActionHandler) Run(podFullName string, uid types.UID, container *ap return err } netInfo, found := status.Info[dockertools.PodInfraContainerName] - if found { - host = netInfo.PodIP - } else { + if !found { return fmt.Errorf("failed to find networking container: %v", status) } + host = netInfo.PodIP } var port int if handler.HTTPGet.Port.Kind == util.IntstrString && len(handler.HTTPGet.Port.StrVal) == 0 { From 2437e942489c00facb077859d41336ba8ef6db5e Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 16 Feb 2015 09:32:37 -0800 Subject: [PATCH 4/5] pkg/kubelet: fix wrong code path in runContainer --- pkg/kubelet/kubelet.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 83ffe288246..58321475ae4 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -683,11 +683,13 @@ func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, pod containerLogPath := path.Join(p, dockerContainer.ID) fs, err := os.Create(containerLogPath) if err != nil { + // TODO: Clean up the previouly created dir? return the error? glog.Errorf("Error on creating termination-log file %q: %v", containerLogPath, err) + } else { + defer fs.Close() + b := fmt.Sprintf("%s:%s", containerLogPath, container.TerminationMessagePath) + binds = append(binds, b) } - defer fs.Close() - b := fmt.Sprintf("%s:%s", containerLogPath, container.TerminationMessagePath) - binds = append(binds, b) } } privileged := false From 042dc1faa3fc88a4a4e26e7137eb22a7a4b7f419 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 16 Feb 2015 09:33:20 -0800 Subject: [PATCH 5/5] pkg/kubelet: uncaptialize error message --- pkg/kubelet/kubelet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 58321475ae4..b490fd1f241 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -753,7 +753,7 @@ func (kl *Kubelet) getServiceEnvVarMap(ns string) (map[string]string, error) { } services, err := kl.serviceLister.List() if err != nil { - return m, fmt.Errorf("Failed to list services when setting up env vars.") + return m, fmt.Errorf("failed to list services when setting up env vars.") } // project the services in namespace ns onto the master services