Merge pull request #123 from rajansandeep/metricspanic

Fix metrics reconcilation

Author: k8s-ci-robot

pkg/patterns/declarative/options.go

@@ -191,20 +191,20 @@ func WithApplyValidation() reconcilerOption {
 // argument, largest metricsDuration is set against that ot.
 func WithReconcileMetrics(metricsDuration int, ot *ObjectTracker) reconcilerOption {
 	return func(p reconcilerParams) reconcilerParams {
-		var err *error
+		var err error
 
 		p.metrics = true
 		metricsRegisterOnce.Do(func() {
 			for _, m := range metricsList {
-				*err = metrics.Registry.Register(m)
-				if *err != nil {
+				err = metrics.Registry.Register(m)
+				if err != nil {
 					break
 				}
 			}
 		})
 
-		if *err != nil {
-			panic(*err)
+		if err != nil {
+			panic(err)
 		}
 
 		if ot == nil {

pkg/patterns/declarative/reconciler.go

@@ -53,8 +53,8 @@ type Reconciler struct {
 	config    *rest.Config
 	kubectl   kubectlClient
 
-	rm  reconcileMetrics
-	mgr manager.Manager
+	metrics reconcileMetrics
+	mgr     manager.Manager
 
 	// recorder is the EventRecorder for creating k8s events
 	recorder      recorder.EventRecorder
@@ -109,7 +109,7 @@ func (r *Reconciler) Init(mgr manager.Manager, prototype DeclarativeObject, opts
 		if gvk, err := apiutil.GVKForObject(prototype, r.mgr.GetScheme()); err != nil {
 			return err
 		} else {
-			reconcileMetricsFor(gvk)
+			r.metrics = reconcileMetricsFor(gvk)
 		}
 	}
 
@@ -489,8 +489,8 @@ func (r *Reconciler) injectOwnerRef(ctx context.Context, instance DeclarativeObj
 
 func (r *Reconciler) collectMetrics(request reconcile.Request, result reconcile.Result, err error) {
 	if r.options.metrics {
-		r.rm.reconcileWith(request)
-		r.rm.reconcileFailedWith(request, result, err)
+		r.metrics.reconcileWith(request)
+		r.metrics.reconcileFailedWith(request, result, err)
 	}
 }