Merge pull request #413 from resouer/rand-service

Randomize service container name

Author: feiskyer

daemon/list.go

@@ -2,6 +2,7 @@ package daemon
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/hyperhq/runv/hypervisor"
 	"github.com/hyperhq/runv/hypervisor/types"
@@ -104,10 +105,10 @@ func filterPodContainers(pod *hypervisor.PodStatus, aux bool) []*hypervisor.Cont
 	results := make([]*hypervisor.ContainerStatus, 0)
 
 	filterServiceDiscovery := !aux && (pod.Type == "service-discovery")
-	proxyName := "/" + ServiceDiscoveryContainerName(pod.Name)
 
 	for _, c := range pod.Containers {
-		if filterServiceDiscovery && c.Name == proxyName {
+		// NOTE(harry) filter out containers ended with "service-discovery" which is for internal usage
+		if filterServiceDiscovery && strings.HasSuffix(c.Name, "service-discovery") {
 			continue
 		}
 		results = append(results, c)

daemon/servicediscovery.go

@@ -166,5 +166,5 @@ func ParseServiceDiscovery(id string, spec *pod.UserPod) error {
 }
 
 func ServiceDiscoveryContainerName(podName string) string {
-	return podName + "-service-discovery"
+	return podName + "-" + utils.RandStr(10, "alpha") + "-service-discovery"
 }