Issue 183: Prefixing service ports with tcp to comply with istio stan…

…dards (#184)

* prefixing service ports with tcp to comply with istio standards

* Revert "Issue 91: PrestopHook configured for zookeeper cluster always fails (#186)"

This reverts commit d502a60.

* Revert "Revert "Issue 91: PrestopHook configured for zookeeper cluster always fails (#186)""

This reverts commit 0fd66ea.

pkg/zk/generators.go

@@ -163,7 +163,7 @@ func makeZkPodSpec(z *v1beta1.ZookeeperCluster) v1.PodSpec {
 func MakeClientService(z *v1beta1.ZookeeperCluster) *v1.Service {
 	ports := z.ZookeeperPorts()
 	svcPorts := []v1.ServicePort{
-		{Name: "client", Port: ports.Client},
+		{Name: "tcp-client", Port: ports.Client},
 	}
 	return makeService(z.GetClientServiceName(), svcPorts, true, z)
 }
@@ -193,9 +193,9 @@ func MakeConfigMap(z *v1beta1.ZookeeperCluster) *v1.ConfigMap {
 func MakeHeadlessService(z *v1beta1.ZookeeperCluster) *v1.Service {
 	ports := z.ZookeeperPorts()
 	svcPorts := []v1.ServicePort{
-		{Name: "quorum", Port: ports.Quorum},
-		{Name: "leader-election", Port: ports.Leader},
-		{Name: "metrics", Port: ports.Metrics},
+		{Name: "tcp-client", Port: ports.Client},
+		{Name: "tcp-quorum", Port: ports.Quorum},
+		{Name: "tcp-leader-election", Port: ports.Leader},
 	}
 	return makeService(headlessSvcName(z), svcPorts, false, z)
 }

pkg/zk/generators_test.go

@@ -138,7 +138,7 @@ var _ = Describe("Generators Spec", func() {
 		})
 
 		It("should have a client port", func() {
-			p, err := utils.ServicePortByName(s.Spec.Ports, "client")
+			p, err := utils.ServicePortByName(s.Spec.Ports, "tcp-client")
 			Ω(err).To(BeNil())
 			Ω(p.Port).To(BeEquivalentTo(2181))
 		})
@@ -177,13 +177,13 @@ var _ = Describe("Generators Spec", func() {
 		})
 
 		It("should have a quorum port", func() {
-			p, err := utils.ServicePortByName(s.Spec.Ports, "quorum")
+			p, err := utils.ServicePortByName(s.Spec.Ports, "tcp-quorum")
 			Ω(err).To(BeNil())
 			Ω(p.Port).To(BeEquivalentTo(2888))
 		})
 
 		It("should have a leader port", func() {
-			p, err := utils.ServicePortByName(s.Spec.Ports, "leader-election")
+			p, err := utils.ServicePortByName(s.Spec.Ports, "tcp-leader-election")
 			Ω(err).To(BeNil())
 			Ω(p.Port).To(BeEquivalentTo(3888))
 		})