@@ -2,11 +2,11 @@ package memcached
2
2
3
3
import (
4
4
"context"
5
- "log"
6
5
"reflect"
7
6
8
7
cachev1alpha1 "github.com/example-inc/memcached-operator/pkg/apis/cache/v1alpha1"
9
8
9
+ "github.com/operator-framework/operator-sdk/pkg/sdk/log"
10
10
appsv1 "k8s.io/api/apps/v1"
11
11
corev1 "k8s.io/api/core/v1"
12
12
"k8s.io/apimachinery/pkg/api/errors"
@@ -85,7 +85,7 @@ type ReconcileMemcached struct {
85
85
// The Controller will requeue the Request to be processed again if the returned error is non-nil or
86
86
// Result.Requeue is true, otherwise upon completion it will remove the work from the queue.
87
87
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)
89
89
90
90
// Fetch the Memcached instance
91
91
memcached := &cachev1alpha1.Memcached{}
@@ -95,11 +95,11 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
95
95
// Request object not found, could have been deleted after reconcile request.
96
96
// Owned objects are automatically garbage collected. For additional cleanup logic use finalizers.
97
97
// 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)
99
99
return reconcile.Result{}, nil
100
100
}
101
101
// 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 )
103
103
return reconcile.Result{}, err
104
104
}
105
105
@@ -109,16 +109,16 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
109
109
if err != nil && errors.IsNotFound(err) {
110
110
// Define a new deployment
111
111
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)
113
113
err = r.client.Create(context.TODO(), dep)
114
114
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 )
116
116
return reconcile.Result{}, err
117
117
}
118
118
// Deployment created successfully - return and requeue
119
119
return reconcile.Result{Requeue: true}, nil
120
120
} else if err != nil {
121
- log.Printf("Failed to get Deployment: %v\n", err )
121
+ log.Error(err, "failed to get Deployment" )
122
122
return reconcile.Result{}, err
123
123
}
124
124
@@ -128,7 +128,7 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
128
128
found.Spec.Replicas = &size
129
129
err = r.client.Update(context.TODO(), found)
130
130
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 )
132
132
return reconcile.Result{}, err
133
133
}
134
134
// Spec updated - return and requeue
@@ -142,7 +142,7 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
142
142
listOps := &client.ListOptions{Namespace: memcached.Namespace, LabelSelector: labelSelector}
143
143
err = r.client.List(context.TODO(), listOps, podList)
144
144
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 )
146
146
return reconcile.Result{}, err
147
147
}
148
148
podNames := getPodNames(podList.Items)
@@ -152,7 +152,7 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
152
152
memcached.Status.Nodes = podNames
153
153
err := r.client.Update(context.TODO(), memcached)
154
154
if err != nil {
155
- log.Printf( "failed to update memcached status: %v", err )
155
+ log.Error(err, "failed to update Memcached status" )
156
156
return reconcile.Result{}, err
157
157
}
158
158
}
0 commit comments