From cacd672f15874baadf81d2b899f99a3f4aad6a5e Mon Sep 17 00:00:00 2001
From: okozachenko <okozachenko@vexxhost.com>
Date: Tue, 14 Apr 2020 14:20:11 -0700
Subject: [PATCH] make ReconcileConfigMap

Change-Id: Ieebbb9291c9843cd2e904e29244539990b9877ba
---
 controllers/mcrouter_controller.go | 46 +++++++++++++++++-------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/controllers/mcrouter_controller.go b/controllers/mcrouter_controller.go
index 4534cbe5..be7e58a5 100755
--- a/controllers/mcrouter_controller.go
+++ b/controllers/mcrouter_controller.go
@@ -57,27 +57,9 @@ func (r *McrouterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 	}
 
 	// ConfigMap
-	configMap := &corev1.ConfigMap{
-		ObjectMeta: metav1.ObjectMeta{
-			Namespace: req.Namespace,
-			Name:      fmt.Sprintf("mcrouter-%s", req.Name),
-		},
+	if res, err := r.ReconcileConfigMap(ctx, req, &mcrouter, log); err != nil || res != (ctrl.Result{}) {
+		return res, err
 	}
-	op, err := k8sutils.CreateOrUpdate(ctx, r, configMap, func() error {
-		b, err := json.Marshal(mcrouter.Spec)
-
-		if err != nil {
-			return err
-		}
-
-		return builders.ConfigMap(configMap, &mcrouter, r.Scheme).
-			Data("config.json", string(b)).
-			Build()
-	})
-	if err != nil {
-		return ctrl.Result{}, err
-	}
-	log.WithValues("resource", "ConfigMap").WithValues("op", op).Info("Reconciled")
 
 	// Deployment
 	if res, err := r.ReconcileDeployment(ctx, req, &mcrouter, log, labels); err != nil || res != (ctrl.Result{}) {
@@ -254,3 +236,27 @@ func (r *McrouterReconciler) ReconcileDeployment(ctx context.Context, req ctrl.R
 	log.WithValues("resource", "Deployment").WithValues("op", op).Info("Reconciled")
 	return ctrl.Result{}, nil
 }
+
+// ReconcileConfigMap reconciles the configMap
+func (r *McrouterReconciler) ReconcileConfigMap(ctx context.Context, req ctrl.Request, mcrouter *infrastructurev1alpha1.Mcrouter, log logr.Logger) (ctrl.Result, error) {
+	configMap := &corev1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: req.Namespace,
+			Name:      fmt.Sprintf("mcrouter-%s", req.Name),
+		},
+	}
+	op, err := k8sutils.CreateOrUpdate(ctx, r, configMap, func() error {
+		b, err := json.Marshal(mcrouter.Spec)
+		if err != nil {
+			return err
+		}
+		return builders.ConfigMap(configMap, mcrouter, r.Scheme).
+			Data("config.json", string(b)).
+			Build()
+	})
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+	log.WithValues("resource", "ConfigMap").WithValues("op", op).Info("Reconciled")
+	return ctrl.Result{}, nil
+}