Add resource events logs

Author: enxebre

cmd/machine-api-operator/start.go

@@ -125,7 +125,7 @@ func startControllers(ctx *ControllerContext) {
 		ctx.ClientBuilder.KubeClientOrDie(componentName),
 		ctx.ClientBuilder.OpenshiftClientOrDie(componentName),
 		recorder,
-	).Run(2, ctx.Stop)
+	).Run(1, ctx.Stop)
 }
 
 func startMetricsCollectionAndServer(ctx *ControllerContext) {

install/0000_30_machine-api-operator_11_deployment.yaml

@@ -83,9 +83,12 @@ spec:
       - name: config
         configMap:
           name: kube-rbac-proxy
+          defaultMode: 420
       - name: images
         configMap:
-                name: machine-api-operator-images
+          defaultMode: 420
+          name: machine-api-operator-images
       - name: machine-api-operator-tls
         secret:
+          defaultMode: 420
           secretName: machine-api-operator-tls

pkg/operator/operator.go

@@ -5,6 +5,10 @@ import (
 	"os"
 	"time"
 
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+
+	"k8s.io/apimachinery/pkg/runtime"
+
 	"github.com/golang/glog"
 	osconfigv1 "github.com/openshift/api/config/v1"
 	osclientset "github.com/openshift/client-go/config/clientset/versioned"
@@ -125,12 +129,42 @@ func (optr *Operator) Run(workers int, stopCh <-chan struct{}) {
 	<-stopCh
 }
 
+func logResource(obj interface{}) {
+	runtimeObj, OkRuntimeObj := obj.(runtime.Object)
+	metaObj, okObject := obj.(metav1.Object)
+	if !OkRuntimeObj || !okObject {
+		glog.Errorf("Error assigning type to interface when logging")
+	}
+	gvk, err := apiutil.GVKForObject(runtimeObj, runtime.NewScheme())
+	if err != nil {
+		glog.Errorf("Error getting GVKForObject: %v", err)
+	}
+	glog.V(3).Infof("Resource: %v %v/%v",
+		gvk,
+		metaObj.GetNamespace(),
+		metaObj.GetName(),
+	)
+	glog.V(3).Infof("Resource: %v \n", obj)
+}
+
 func (optr *Operator) eventHandler() cache.ResourceEventHandler {
 	workQueueKey := fmt.Sprintf("%s/%s", optr.namespace, optr.name)
 	return cache.ResourceEventHandlerFuncs{
-		AddFunc:    func(obj interface{}) { optr.queue.Add(workQueueKey) },
-		UpdateFunc: func(old, new interface{}) { optr.queue.Add(workQueueKey) },
-		DeleteFunc: func(obj interface{}) { optr.queue.Add(workQueueKey) },
+		AddFunc: func(obj interface{}) {
+			glog.Infof("Event: Add")
+			logResource(obj)
+			optr.queue.Add(workQueueKey)
+		},
+		UpdateFunc: func(old, new interface{}) {
+			glog.Infof("Event: Update")
+			logResource(old)
+			optr.queue.Add(workQueueKey)
+		},
+		DeleteFunc: func(obj interface{}) {
+			glog.Infof("Event: Delete")
+			logResource(obj)
+			optr.queue.Add(workQueueKey)
+		},
 	}
 }