Fix the error/warn log usage (#1839)

* Fix the error/warn log usage

zap doesn't do this well, when errors are not presented without zap.Error

* nits
This commit is contained in:
Victor Agababov 2020-10-23 13:06:37 -07:00 committed by GitHub
parent 7a4b522241
commit 5807b6f9ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 10 deletions

View File

@ -22,6 +22,7 @@ import (
"crypto/x509"
"time"
"go.uber.org/zap"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
@ -83,11 +84,11 @@ func (r *reconciler) reconcileCertificate(ctx context.Context) error {
// Check the expiration date of the certificate to see if it needs to be updated
cert, err := tls.X509KeyPair(secret.Data[certresources.ServerCert], secret.Data[certresources.ServerKey])
if err != nil {
logger.Warn("Error creating pem from certificate and key: ", err)
logger.Warnw("Error creating pem from certificate and key", zap.Error(err))
} else {
certData, err := x509.ParseCertificate(cert.Certificate[0])
if err != nil {
logger.Error("Error parsing certificate: ", err)
logger.Errorw("Error parsing certificate", zap.Error(err))
} else if time.Now().Add(oneWeek).Before(certData.NotAfter) {
return nil
}

View File

@ -24,6 +24,7 @@ import (
"fmt"
"reflect"
"go.uber.org/zap"
admissionv1 "k8s.io/api/admission/v1"
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
corev1 "k8s.io/api/core/v1"
@ -77,7 +78,7 @@ func (ac *reconciler) Reconcile(ctx context.Context, key string) error {
secret, err := ac.secretlister.Secrets(system.Namespace()).Get(ac.secretName)
if err != nil {
logger.Error("Error fetching secret: ", err)
logger.Errorw("Error fetching secret ", zap.Error(err))
return err
}

View File

@ -26,6 +26,7 @@ import (
"sync"
"github.com/markbates/inflect"
"go.uber.org/zap"
admissionv1 "k8s.io/api/admission/v1"
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
"k8s.io/apimachinery/pkg/api/equality"
@ -164,7 +165,7 @@ func (ac *Reconciler) Reconcile(ctx context.Context, key string) error {
// Look up the webhook secret, and fetch the CA cert bundle.
secret, err := ac.SecretLister.Secrets(system.Namespace()).Get(ac.SecretName)
if err != nil {
logging.FromContext(ctx).Error("Error fetching secret: ", err)
logging.FromContext(ctx).Errorw("Error fetching secret", zap.Error(err))
return err
}
caCert, ok := secret.Data[certresources.CACert]

View File

@ -435,19 +435,19 @@ func (r *BaseReconciler) ReconcileSubject(ctx context.Context, fb Bindable, muta
func (r *BaseReconciler) UpdateStatus(ctx context.Context, desired Bindable) error {
actual, err := r.Get(desired.GetNamespace(), desired.GetName())
if err != nil {
logging.FromContext(ctx).Error("Error fetching actual: ", err)
logging.FromContext(ctx).Errorw("Error fetching actual", zap.Error(err))
return err
}
// Convert to unstructured for use with the dynamic client.
ua, err := duck.ToUnstructured(actual)
if err != nil {
logging.FromContext(ctx).Error("Error converting actual: ", err)
logging.FromContext(ctx).Errorw("Error converting actual", zap.Error(err))
return err
}
ud, err := duck.ToUnstructured(desired)
if err != nil {
logging.FromContext(ctx).Error("Error converting desired: ", err)
logging.FromContext(ctx).Errorw("Error converting desired", zap.Error(err))
return err
}

View File

@ -56,7 +56,7 @@ func (r *reconciler) Convert(
for _, obj := range req.Objects {
converted, err := r.convert(ctx, obj, req.DesiredAPIVersion)
if err != nil {
logging.FromContext(ctx).Error("Conversion failed: ", err)
logging.FromContext(ctx).Errorw("Conversion failed", zap.Error(err))
res.Result.Status = metav1.StatusFailure
res.Result.Message = err.Error()
break

View File

@ -20,6 +20,7 @@ import (
"context"
"fmt"
"go.uber.org/zap"
apixv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
apixclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
apixlisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
@ -71,7 +72,7 @@ func (r *reconciler) Reconcile(ctx context.Context, key string) error {
// Look up the webhook secret, and fetch the CA cert bundle.
secret, err := r.secretLister.Secrets(system.Namespace()).Get(r.secretName)
if err != nil {
logger.Error("Error fetching secret: ", err)
logger.Errorw("Error fetching secret", zap.Error(err))
return err
}

View File

@ -87,7 +87,7 @@ func (ac *reconciler) Reconcile(ctx context.Context, key string) error {
// Look up the webhook secret, and fetch the CA cert bundle.
secret, err := ac.secretlister.Secrets(system.Namespace()).Get(ac.secretName)
if err != nil {
logger.Error("Error fetching secret: ", err)
logger.Errorw("Error fetching secret", zap.Error(err))
return err
}
caCert, ok := secret.Data[certresources.CACert]