[rocketmq-operator] 16/28: fix metaService Name using

[vo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vongosling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-operator.git

commit 4ffb131467bf5931f394a3693b1393d05eafea53
Author: liuruiyiyang <24...@qq.com>
AuthorDate: Mon Sep 2 22:26:00 2019 +0800

    fix metaService Name using
---
 deploy/crds/rocketmq_v1alpha1_metaservice_cr.yaml  |  2 +-
 pkg/controller/broker/broker_controller.go         | 47 +++++++++++-----------
 .../metaservice/metaservice_controller.go          |  2 +-
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/deploy/crds/rocketmq_v1alpha1_metaservice_cr.yaml b/deploy/crds/rocketmq_v1alpha1_metaservice_cr.yaml
index c3ce2d1..5784862 100644
--- a/deploy/crds/rocketmq_v1alpha1_metaservice_cr.yaml
+++ b/deploy/crds/rocketmq_v1alpha1_metaservice_cr.yaml
@@ -1,7 +1,7 @@
 apiVersion: rocketmq.operator.com/v1alpha1
 kind: MetaService
 metadata:
-  name: metaservice
+  name: meta-service
 spec:
   # Add fields here
   size: 2
diff --git a/pkg/controller/broker/broker_controller.go b/pkg/controller/broker/broker_controller.go
index 867be54..75360be 100644
--- a/pkg/controller/broker/broker_controller.go
+++ b/pkg/controller/broker/broker_controller.go
@@ -2,8 +2,6 @@ package broker
 
 import (
 	"context"
-	"k8s.io/apimachinery/pkg/labels"
-	"reflect"
 	"strconv"
 
 	cachev1alpha1 "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis/cache/v1alpha1"
@@ -159,28 +157,29 @@ func (r *ReconcileBroker) Reconcile(request reconcile.Request) (reconcile.Result
 
 	// Update the Broker status with the pod names
 	// List the pods for this broker's deployment
-	podList := &corev1.PodList{}
-	labelSelector := labels.SelectorFromSet(labelsForBroker(broker.Name))
-	listOps := &client.ListOptions{
-		Namespace:     broker.Namespace,
-		LabelSelector: labelSelector,
-	}
-	err = r.client.List(context.TODO(), listOps, podList)
-	if err != nil {
-		reqLogger.Error(err, "Failed to list pods.", "Broker.Namespace", broker.Namespace, "Broker.Name", broker.Name)
-		return reconcile.Result{}, err
-	}
-	podNames := getPodNames(podList.Items)
-
-	// Update status.Nodes if needed
-	if !reflect.DeepEqual(podNames, broker.Status.Nodes) {
-		broker.Status.Nodes = podNames
-		err := r.client.Status().Update(context.TODO(), broker)
-		if err != nil {
-			reqLogger.Error(err, "Failed to update Broker status.")
-			return reconcile.Result{}, err
-		}
-	}
+
+	//podList := &corev1.PodList{}
+	//labelSelector := labels.SelectorFromSet(labelsForBroker(broker.Name))
+	//listOps := &client.ListOptions{
+	//	Namespace:     broker.Namespace,
+	//	LabelSelector: labelSelector,
+	//}
+	//err = r.client.List(context.TODO(), listOps, podList)
+	//if err != nil {
+	//	reqLogger.Error(err, "Failed to list pods.", "Broker.Namespace", broker.Namespace, "Broker.Name", broker.Name)
+	//	return reconcile.Result{}, err
+	//}
+	//podNames := getPodNames(podList.Items)
+	//
+	//// Update status.Nodes if needed
+	//if !reflect.DeepEqual(podNames, broker.Status.Nodes) {
+	//	broker.Status.Nodes = podNames
+	//	err := r.client.Status().Update(context.TODO(), broker)
+	//	if err != nil {
+	//		reqLogger.Error(err, "Failed to update Broker status.")
+	//		return reconcile.Result{}, err
+	//	}
+	//}
 
 	return reconcile.Result{}, nil
 }
diff --git a/pkg/controller/metaservice/metaservice_controller.go b/pkg/controller/metaservice/metaservice_controller.go
index 0b8694f..c76b964 100644
--- a/pkg/controller/metaservice/metaservice_controller.go
+++ b/pkg/controller/metaservice/metaservice_controller.go
@@ -158,7 +158,7 @@ func getMetaServers(pods []corev1.Pod) []string {
 }
 
 func labelsForMetaService(name string) map[string]string {
-	return map[string]string{"app": "metaService", "metaService_cr": name}
+	return map[string]string{"app": "meta_service", "meta_service_cr": name}
 }
 
 func (r *ReconcileMetaService) deploymentForMetaService(m *rocketmqv1alpha1.MetaService) *appsv1.Deployment {