cleanup: some logging improvements

Signed-off-by: Christian Kotzbauer <[email protected]>
ckotzbauer · Dec 9, 2021 · baeaec3 · baeaec3
1 parent 76ea2ea
commit baeaec3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/controllers/access-manager.io/serviceaccount_controller.go b/controllers/access-manager.io/serviceaccount_controller.go
@@ -45,7 +45,6 @@ func (r *ServiceAccountReconciler) Reconcile(ctx context.Context, request reconc
  return reconcile.Result{}, err
  }
 
- r.Logger.Info("Reconciling ServiceAccount", "Name", request.NamespacedName)
  rec := reconciler.Reconciler{Client: *kubernetes.NewForConfigOrDie(r.Config), ControllerClient: r.Client, Logger: r.Logger, Scheme: r.Scheme}
  return rec.ReconcileServiceAccount(instance)
 }

diff --git a/pkg/reconciler/reconciler.go b/pkg/reconciler/reconciler.go
@@ -2,6 +2,7 @@ package reconciler
 
 import (
  "context"
+ "fmt"
 
  "k8s.io/apimachinery/pkg/api/errors"
  "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -91,11 +92,11 @@ func (r *Reconciler) RemoveAllDeletableRoleBindings(defName string, roleBindings
  }
 
  for _, rb := range roleBindingsToDelete {
- r.Logger.Info("Deleting RoleBinding", "RoleBinding.Namespace", rb.Namespace, "RoleBinding.Name", rb.Name)
+ r.Logger.Info("Deleting RoleBinding", "Name", fmt.Sprintf("%s/%s", rb.Namespace, rb.Name))
  err = r.Client.RbacV1().RoleBindings(rb.Namespace).Delete(context.TODO(), rb.Name, metav1.DeleteOptions{})
 
  if err != nil {
- r.Logger.WithValues("RoleBinding", rb.Name, "Namespace", rb.Namespace).Error(err, "Failed to delete RoleBinding.")
+ r.Logger.WithValues("Name", fmt.Sprintf("%s/%s", rb.Namespace, rb.Name)).Error(err, "Failed to delete RoleBinding.")
  }
  }
 }
@@ -109,7 +110,7 @@ func (r *Reconciler) RemoveAllDeletableClusterRoleBindings(defName string, clust
  }
 
  for _, crb := range clusterRoleBindingsToDelete {
- r.Logger.Info("Deleting ClusterRoleBinding", "ClusterRoleBinding.Name", crb.Name)
+ r.Logger.Info("Deleting ClusterRoleBinding", "Name", crb.Name)
  err = r.Client.RbacV1().ClusterRoleBindings().Delete(context.TODO(), crb.Name, metav1.DeleteOptions{})
 
  if err != nil {
@@ -123,15 +124,15 @@ func (r *Reconciler) CreateOrRecreateRoleBinding(rb rbacv1.RoleBinding) (*rbacv1
  existing, err := r.Client.RbacV1().RoleBindings(rb.Namespace).Get(context.TODO(), rb.Name, metav1.GetOptions{})
  if err == nil {
  if !HasNamedOwner(existing.OwnerReferences, rbacName, "") {
- r.Logger.Info("Existing RoleBinding is not owned by a RbacDefinition. Ignoring", "RoleBinding.Name", existing.Name)
+ r.Logger.Info("Existing RoleBinding is not owned by a RbacDefinition. Ignoring", "Name", fmt.Sprintf("%s/%s", existing.Namespace, existing.Name))
  return existing, nil
  }
 
  if util.IsRoleBindingEqual(*existing, rb) {
  return existing, nil
  }
 
- r.Logger.Info("Deleting RoleBinding", "RoleBinding.Namespace", rb.Namespace, "RoleBinding.Name", rb.Name)
+ r.Logger.Info("Deleting RoleBinding", "Name", fmt.Sprintf("%s/%s", rb.Namespace, rb.Name))
  err = r.Client.RbacV1().RoleBindings(rb.Namespace).Delete(context.TODO(), rb.Name, metav1.DeleteOptions{})
  if err != nil {
  return nil, err
@@ -140,7 +141,7 @@ func (r *Reconciler) CreateOrRecreateRoleBinding(rb rbacv1.RoleBinding) (*rbacv1
  return nil, err
  }
 
- r.Logger.Info("Creating new RoleBinding", "RoleBinding.Namespace", rb.Namespace, "RoleBinding.Name", rb.Name)
+ r.Logger.Info("Creating new RoleBinding", "Name", fmt.Sprintf("%s/%s", rb.Namespace, rb.Name))
  return r.Client.RbacV1().RoleBindings(rb.Namespace).Create(context.TODO(), &rb, metav1.CreateOptions{})
 }
 
@@ -149,15 +150,15 @@ func (r *Reconciler) CreateOrRecreateClusterRoleBinding(crb rbacv1.ClusterRoleBi
  existing, err := r.Client.RbacV1().ClusterRoleBindings().Get(context.TODO(), crb.Name, metav1.GetOptions{})
  if err == nil {
  if !HasNamedOwner(existing.OwnerReferences, rbacName, "") {
- r.Logger.Info("Existing ClusterRoleBinding is not owned by a RbacDefinition. Ignoring", "ClusterRoleBinding.Name", existing.Name)
+ r.Logger.Info("Existing ClusterRoleBinding is not owned by a RbacDefinition. Ignoring", "Name", existing.Name)
  return existing, nil
  }
 
  if util.IsClusterRoleBindingEqual(*existing, crb) {
  return existing, nil
  }
 
- r.Logger.Info("Deleting ClusterRoleBinding", "ClusterRoleBinding.Name", crb.Name)
+ r.Logger.Info("Deleting ClusterRoleBinding", "Name", crb.Name)
  err = r.Client.RbacV1().ClusterRoleBindings().Delete(context.TODO(), crb.Name, metav1.DeleteOptions{})
  if err != nil {
  return nil, err
@@ -166,7 +167,7 @@ func (r *Reconciler) CreateOrRecreateClusterRoleBinding(crb rbacv1.ClusterRoleBi
  return nil, err
  }
 
- r.Logger.Info("Creating new ClusterRoleBinding", "ClusterRoleBinding.Name", crb.Name)
+ r.Logger.Info("Creating new ClusterRoleBinding", "Name", crb.Name)
  return r.Client.RbacV1().ClusterRoleBindings().Create(context.TODO(), &crb, metav1.CreateOptions{})
 }
 
@@ -263,7 +264,7 @@ func (r *Reconciler) DeleteOwnedRoleBindings(namespace string, def accessmanager
  for _, rb := range list.Items {
  for _, ref := range rb.OwnerReferences {
  if HasNamedOwner([]metav1.OwnerReference{ref}, rbacName, def.Name) {
- r.Logger.Info("Deleting owned RoleBinding", "RoleBinding.Namespace", rb.Namespace, "RoleBinding.Name", rb.Name)
+ r.Logger.Info("Deleting owned RoleBinding", "Name", fmt.Sprintf("%s/%s", rb.Namespace, rb.Name))
  err = r.Client.RbacV1().RoleBindings(namespace).Delete(context.TODO(), rb.Name, metav1.DeleteOptions{})
 
  if err != nil {