From 08360a89fb6d90faeeec598a01d3e57588d68ba1 Mon Sep 17 00:00:00 2001 From: Karthik Ramasubramanian Date: Thu, 8 Nov 2018 16:08:39 -0800 Subject: [PATCH] Don't log object contents --- pkg/controllers/pod/pod_controller.go | 8 +++----- pkg/converter/pod_converter.go | 5 +++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkg/controllers/pod/pod_controller.go b/pkg/controllers/pod/pod_controller.go index 465cf9f7..7bbeba4d 100644 --- a/pkg/controllers/pod/pod_controller.go +++ b/pkg/controllers/pod/pod_controller.go @@ -117,7 +117,7 @@ func NewPodController(ctx context.Context, k8sClientset *kubernetes.Clientset, c wepInterface, err := podConverter.Convert(obj) if err != nil { - log.WithError(err).Errorf("Error while converting %#v to wep.", obj) + log.WithError(err).Errorf("Error while converting %v to wep.", key) return } @@ -134,8 +134,6 @@ func NewPodController(ctx context.Context, k8sClientset *kubernetes.Clientset, c return } log.Debugf("Got UPDATE event for pod: %s", key) - log.Debugf("Old object: \n%#v\n", oldObj) - log.Debugf("New object: \n%#v\n", newObj) // Ignore updates for not ready / irrelevant pods. if !isReadyCalicoPod(newObj.(*v1.Pod)) { @@ -145,7 +143,7 @@ func NewPodController(ctx context.Context, k8sClientset *kubernetes.Clientset, c wepInterface, err := podConverter.Convert(newObj) if err != nil { - log.WithError(err).Errorf("Error while converting %#v to wep.", newObj) + log.WithError(err).Errorf("Error while converting %v to wep.", key) return } @@ -170,7 +168,7 @@ func NewPodController(ctx context.Context, k8sClientset *kubernetes.Clientset, c wepInterface, err := podConverter.Convert(obj) if err != nil { - log.WithError(err).Errorf("Error while converting %#v to wep.", obj) + log.WithError(err).Errorf("Error while converting %v to wep.", key) return } diff --git a/pkg/converter/pod_converter.go b/pkg/converter/pod_converter.go index db9111da..9b892ab0 100644 --- a/pkg/converter/pod_converter.go +++ b/pkg/converter/pod_converter.go @@ -15,6 +15,7 @@ package converter import ( + "errors" "fmt" log "github.com/sirupsen/logrus" @@ -68,11 +69,11 @@ func (p *podConverter) Convert(k8sObj interface{}) (interface{}, error) { if !ok { tombstone, ok := k8sObj.(cache.DeletedFinalStateUnknown) if !ok { - return nil, fmt.Errorf("couldn't get object from tombstone %+v", k8sObj) + return nil, errors.New("couldn't get object from tombstone") } pod, ok = tombstone.Obj.(*v1.Pod) if !ok { - return nil, fmt.Errorf("tombstone contained object that is not a Pod %+v", k8sObj) + return nil, errors.New("tombstone contained object that is not a Pod") } }