Skip to content

Commit 2df07df

Browse files
committed
example/.../memcached_controller.go.tmpl: update to use sdk/log package
1 parent 4757f10 commit 2df07df

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

example/memcached-operator/memcached_controller.go.tmpl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package memcached
22

33
import (
44
"context"
5-
"log"
65
"reflect"
76

87
cachev1alpha1 "github.com/example-inc/memcached-operator/pkg/apis/cache/v1alpha1"
98

9+
"github.com/operator-framework/operator-sdk/pkg/sdk/log"
1010
appsv1 "k8s.io/api/apps/v1"
1111
corev1 "k8s.io/api/core/v1"
1212
"k8s.io/apimachinery/pkg/api/errors"
@@ -85,7 +85,7 @@ type ReconcileMemcached struct {
8585
// The Controller will requeue the Request to be processed again if the returned error is non-nil or
8686
// Result.Requeue is true, otherwise upon completion it will remove the work from the queue.
8787
func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Result, error) {
88-
log.Printf("Reconciling Memcached %s/%s\n", request.Namespace, request.Name)
88+
log.Info("Reconciling Memcached", "Request.Namespace", request.Namespace, "Requst.Name", request.Name)
8989

9090
// Fetch the Memcached instance
9191
memcached := &cachev1alpha1.Memcached{}
@@ -95,11 +95,11 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
9595
// Request object not found, could have been deleted after reconcile request.
9696
// Owned objects are automatically garbage collected. For additional cleanup logic use finalizers.
9797
// Return and don't requeue
98-
log.Printf("Memcached %s/%s not found. Ignoring since object must be deleted\n", request.Namespace, request.Name)
98+
log.Error(err, "Memcached resource not found. Ignoring since object must be deleted", "Request.Namespace", request.Namespace, "Requst.Name", request.Name)
9999
return reconcile.Result{}, nil
100100
}
101101
// Error reading the object - requeue the request.
102-
log.Printf("Failed to get Memcached: %v", err)
102+
log.Error(err, "failed to get Memcached", "Request.Namespace", request.Namespace, "Requst.Name", request.Name)
103103
return reconcile.Result{}, err
104104
}
105105

@@ -109,16 +109,16 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
109109
if err != nil && errors.IsNotFound(err) {
110110
// Define a new deployment
111111
dep := r.deploymentForMemcached(memcached)
112-
log.Printf("Creating a new Deployment %s/%s\n", dep.Namespace, dep.Name)
112+
log.Info("Creating a new Deployment", "Deployment.Namespace", dep.Namespace, "Deployment.Name", dep.Name)
113113
err = r.client.Create(context.TODO(), dep)
114114
if err != nil {
115-
log.Printf("Failed to create new Deployment: %v\n", err)
115+
log.Error(err, "failed to create new Deployment", "Deployment.Namespace", dep.Namespace, "Deployment.Name", dep.Name)
116116
return reconcile.Result{}, err
117117
}
118118
// Deployment created successfully - return and requeue
119119
return reconcile.Result{Requeue: true}, nil
120120
} else if err != nil {
121-
log.Printf("Failed to get Deployment: %v\n", err)
121+
log.Error(err, "failed to get Deployment")
122122
return reconcile.Result{}, err
123123
}
124124

@@ -128,7 +128,7 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
128128
found.Spec.Replicas = &size
129129
err = r.client.Update(context.TODO(), found)
130130
if err != nil {
131-
log.Printf("Failed to update Deployment: %v\n", err)
131+
log.Error(err, "failed to update Deployment", "Deployment.Namespace", found.Namespace, "Deployment.Name", found.Name)
132132
return reconcile.Result{}, err
133133
}
134134
// Spec updated - return and requeue
@@ -142,7 +142,7 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
142142
listOps := &client.ListOptions{Namespace: memcached.Namespace, LabelSelector: labelSelector}
143143
err = r.client.List(context.TODO(), listOps, podList)
144144
if err != nil {
145-
log.Printf("Failed to list pods: %v", err)
145+
log.Error(err, "failed to list pods", "Memcached.Namespace", memcached.Namespace, "Memcached.Name", memcached.Name)
146146
return reconcile.Result{}, err
147147
}
148148
podNames := getPodNames(podList.Items)
@@ -152,7 +152,7 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
152152
memcached.Status.Nodes = podNames
153153
err := r.client.Update(context.TODO(), memcached)
154154
if err != nil {
155-
log.Printf("failed to update memcached status: %v", err)
155+
log.Error(err, "failed to update Memcached status")
156156
return reconcile.Result{}, err
157157
}
158158
}

0 commit comments

Comments
 (0)