From c702a24182502ec9f14c1ecf76dadae6f132f022 Mon Sep 17 00:00:00 2001 From: Weibin Lin Date: Wed, 15 Aug 2018 11:47:59 +0800 Subject: [PATCH] use glog.V().Infof() for formatting output; return nil when err's nil --- pkg/controller/cloud/pvlcontroller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/cloud/pvlcontroller.go b/pkg/controller/cloud/pvlcontroller.go index 355e5d27de2..ed1a0d674fd 100644 --- a/pkg/controller/cloud/pvlcontroller.go +++ b/pkg/controller/cloud/pvlcontroller.go @@ -244,7 +244,7 @@ func (pvlc *PersistentVolumeLabelController) createPatch(vol *v1.PersistentVolum } // Populate NodeAffinity with requirements if there are no conflicting keys found if v1helper.NodeSelectorRequirementKeysExistInNodeSelectorTerms(requirements, newVolume.Spec.NodeAffinity.Required.NodeSelectorTerms) { - glog.V(4).Info("NodeSelectorRequirements for cloud labels %v conflict with existing NodeAffinity %v. Skipping addition of NodeSelectorRequirements for cloud labels.", + glog.V(4).Infof("NodeSelectorRequirements for cloud labels %v conflict with existing NodeAffinity %v. Skipping addition of NodeSelectorRequirements for cloud labels.", requirements, newVolume.Spec.NodeAffinity) } else { for _, req := range requirements { @@ -288,7 +288,7 @@ func (pvlc *PersistentVolumeLabelController) updateVolume(vol *v1.PersistentVolu } glog.V(4).Infof("updated PersistentVolume %s", volName) - return err + return nil } func removeInitializer(initializers *metav1.Initializers, name string) *metav1.Initializers {