[rocketmq-operator] branch master updated: fix empty nameservice address in broker (#76)

[duhengforever]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ecdecf8  fix empty nameservice address in broker (#76)
     new db47e19  Merge pull request #94 from gobbq/master
ecdecf8 is described below

commit ecdecf837a6510261270550d1e7214be77104c68
Author: 文泊 <xll333...@alibaba-inc.com>
AuthorDate: Tue Mar 22 15:07:51 2022 +0800

    fix empty nameservice address in broker (#76)
---
 pkg/controller/nameservice/nameservice_controller.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/controller/nameservice/nameservice_controller.go 
b/pkg/controller/nameservice/nameservice_controller.go
index 410515f..2547c45 100644
--- a/pkg/controller/nameservice/nameservice_controller.go
+++ b/pkg/controller/nameservice/nameservice_controller.go
@@ -23,6 +23,7 @@ import (
        "os/exec"
        "reflect"
        "strconv"
+       "strings"
        "time"
 
        rocketmqv1alpha1 
"github.com/apache/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
@@ -282,7 +283,10 @@ func getVolumes(nameService *rocketmqv1alpha1.NameService) 
[]corev1.Volume {
 func getNameServers(pods []corev1.Pod) []string {
        var nameServers []string
        for _, pod := range pods {
-               nameServers = append(nameServers, pod.Status.PodIP)
+               if pod.Status.Phase == corev1.PodRunning &&
+                       !strings.EqualFold(pod.Status.PodIP, "") {
+                       nameServers = append(nameServers, pod.Status.PodIP)
+               }
        }
        return nameServers
 }
@@ -319,10 +323,10 @@ func (r *ReconcileNameService) 
statefulSetForNameService(nameService *rocketmqv1
                                },
                                Spec: corev1.PodSpec{
                                        HostNetwork: 
nameService.Spec.HostNetwork,
-                                       DNSPolicy: nameService.Spec.DNSPolicy,
+                                       DNSPolicy:   nameService.Spec.DNSPolicy,
                                        Containers: []corev1.Container{{
                                                Resources: 
nameService.Spec.Resources,
-                                               Image: 
nameService.Spec.NameServiceImage,
+                                               Image:     
nameService.Spec.NameServiceImage,
                                                // Name must be lower case !
                                                Name:            "name-service",
                                                ImagePullPolicy: 
nameService.Spec.ImagePullPolicy,