Skip to content

Commit

Permalink
Add log statements in result error handler
Browse files Browse the repository at this point in the history
This handles IsNotFound, IsGone and IsForbidden API server error
responses.
  • Loading branch information
annismckenzie committed Jan 8, 2021
1 parent 07fce46 commit 204541c
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions controllers/config/k3osconfig_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/annismckenzie/k3os-config-operator/pkg/consts"
"github.com/annismckenzie/k3os-config-operator/pkg/errors"
"github.com/annismckenzie/k3os-config-operator/pkg/nodes"
"github.com/go-logr/logr"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -78,17 +79,17 @@ func (r *K3OSConfigReconciler) handleK3OSConfigAsLeader(ctx context.Context, con
return ctrl.Result{}, nil
}

func resultError(err error) error {
func resultError(err error, logger logr.Logger) error {
switch {
case err == nil:
return nil
case errors.Is(err, errors.ErrSkipUpdate):
return nil
case apierrors.IsNotFound(err), apierrors.IsGone(err):
// log error
logger.Info("object is gone, not requeuing")
return nil
case apierrors.IsForbidden(err):
// log error
logger.Error(err, "failed to execute operation, did you forget to apply some RBAC rules?")
return nil
default:
return err
Expand All @@ -102,14 +103,14 @@ func (r *K3OSConfigReconciler) handleK3OSConfig(ctx context.Context, config *con
// 2. get node config
nodeConfig, err := r.getNodeConfig(ctx, nodeName)
if err != nil {
return ctrl.Result{}, resultError(err)
return ctrl.Result{}, resultError(err, r.logger)
}
r.logger.Info("successfully fetched node config", "config", nodeConfig)

// 3. get node
node, err := r.getNode(ctx, nodeName)
if err != nil {
return ctrl.Result{}, resultError(err)
return ctrl.Result{}, resultError(err, r.logger)
}

var updateNode bool
Expand All @@ -119,7 +120,7 @@ func (r *K3OSConfigReconciler) handleK3OSConfig(ctx context.Context, config *con
if config.Spec.SyncNodeLabels {
if err = labeler.Reconcile(node, nodeConfig.K3OS.Labels); err == nil {
updateNode = true
} else if err = resultError(err); err != nil {
} else if err = resultError(err, r.logger); err != nil {
return ctrl.Result{}, err
}
}
Expand All @@ -129,7 +130,7 @@ func (r *K3OSConfigReconciler) handleK3OSConfig(ctx context.Context, config *con
if config.Spec.SyncNodeTaints {
if err = tainter.Reconcile(node, nodeConfig.K3OS.Taints); err == nil {
updateNode = true
} else if err = resultError(err); err != nil {
} else if err = resultError(err, r.logger); err != nil {
return ctrl.Result{}, err
}
}
Expand Down

0 comments on commit 204541c

Please sign in to comment.