From e9d8d0f5a563d0f23a46a4b86b0d2e2ebc60f9a9 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Mon, 1 Apr 2019 19:20:12 +0530 Subject: [PATCH] Remove some unwanted code blocks in controller_utils.go Signed-off-by: Humble Chirammal --- pkg/controller/controller_utils.go | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index e813bc26466..4586aa09186 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -160,11 +160,11 @@ type ControllerExpectations struct { // GetExpectations returns the ControlleeExpectations of the given controller. func (r *ControllerExpectations) GetExpectations(controllerKey string) (*ControlleeExpectations, bool, error) { - if exp, exists, err := r.GetByKey(controllerKey); err == nil && exists { + exp, exists, err := r.GetByKey(controllerKey) + if err == nil && exists { return exp.(*ControlleeExpectations), true, nil - } else { - return nil, false, err } + return nil, false, err } // DeleteExpectations deletes the expectations of the given controller from the TTLStore. @@ -576,18 +576,19 @@ func (r RealPodControl) createPods(nodeName, namespace string, template *v1.PodT if labels.Set(pod.Labels).AsSelectorPreValidated().Empty() { return fmt.Errorf("unable to create pods, no labels") } - if newPod, err := r.KubeClient.CoreV1().Pods(namespace).Create(pod); err != nil { + newPod, err := r.KubeClient.CoreV1().Pods(namespace).Create(pod) + if err != nil { r.Recorder.Eventf(object, v1.EventTypeWarning, FailedCreatePodReason, "Error creating: %v", err) return err - } else { - accessor, err := meta.Accessor(object) - if err != nil { - klog.Errorf("parentObject does not have ObjectMeta, %v", err) - return nil - } - klog.V(4).Infof("Controller %v created pod %v", accessor.GetName(), newPod.Name) - r.Recorder.Eventf(object, v1.EventTypeNormal, SuccessfulCreatePodReason, "Created pod: %v", newPod.Name) } + accessor, err := meta.Accessor(object) + if err != nil { + klog.Errorf("parentObject does not have ObjectMeta, %v", err) + return nil + } + klog.V(4).Infof("Controller %v created pod %v", accessor.GetName(), newPod.Name) + r.Recorder.Eventf(object, v1.EventTypeNormal, SuccessfulCreatePodReason, "Created pod: %v", newPod.Name) + return nil }