From 867790faa3f98fe4de8707890428bf5baaca8121 Mon Sep 17 00:00:00 2001 From: yiqinguo <468894985@qq.com> Date: Wed, 21 Jun 2017 15:15:22 +0800 Subject: [PATCH] Remove repeat type conversions --- pkg/kubelet/config/common.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/config/common.go b/pkg/kubelet/config/common.go index cd4b62d98d6..7c31fabedad 100644 --- a/pkg/kubelet/config/common.go +++ b/pkg/kubelet/config/common.go @@ -109,12 +109,14 @@ func tryDecodeSinglePod(data []byte, defaultFn defaultFunc) (parsed bool, pod *v if err != nil { return false, pod, err } + + newPod, ok := obj.(*api.Pod) // Check whether the object could be converted to single pod. - if _, ok := obj.(*api.Pod); !ok { + if !ok { err = fmt.Errorf("invalid pod: %#v", obj) return false, pod, err } - newPod := obj.(*api.Pod) + // Apply default values and validate the pod. if err = defaultFn(newPod); err != nil { return true, pod, err @@ -135,12 +137,14 @@ func tryDecodePodList(data []byte, defaultFn defaultFunc) (parsed bool, pods v1. if err != nil { return false, pods, err } + + newPods, ok := obj.(*api.PodList) // Check whether the object could be converted to list of pods. - if _, ok := obj.(*api.PodList); !ok { + if !ok { err = fmt.Errorf("invalid pods list: %#v", obj) return false, pods, err } - newPods := obj.(*api.PodList) + // Apply default values and validate pods. for i := range newPods.Items { newPod := &newPods.Items[i]