Merge pull request #67416 from hanxiaoshuai/fix08151

Automatic merge from submit-queue (batch tested with PRs 67461, 67464, 67416). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. use const v1.ProtocolTCP replace of string TCP in test/e2e/network/ **What this PR does / why we need it**: use const v1.ProtocolTCP replace of string TCP in test/e2e/network/ **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #67416 from hanxiaoshuai/fix08151
c825d66b · Kubernetes Submit Queue · GitHub · 825548df · 57b4c1e7 · c825d66b
Unverified Commit c825d66b authored Aug 15, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 15, 2018
Showing with 7 additions and 7 deletions

dns.go test/e2e/network/dns.go +1 -1

dns_common.go test/e2e/network/dns_common.go +2 -2

firewall.go test/e2e/network/firewall.go +1 -1

service.go test/e2e/network/service.go +3 -3

No files found.
--- a/test/e2e/network/dns.go
+++ b/test/e2e/network/dns.go
@@ -202,7 +202,7 @@ var _ = SIGDescribe("DNS", func() {
 		_, err = framework.UpdateService(f.ClientSet, f.Namespace.Name, serviceName, func(s *v1.Service) {
 			s.Spec.Type = v1.ServiceTypeClusterIP
 			s.Spec.Ports = []v1.ServicePort{
-				{Port: 80, Name: "http", Protocol: "TCP"},
+				{Port: 80, Name: "http", Protocol: v1.ProtocolTCP},
 			}
 		})
 		Expect(err).NotTo(HaveOccurred())

--- a/test/e2e/network/dns_common.go
+++ b/test/e2e/network/dns_common.go
@@ -213,7 +213,7 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) {
 					Image:   imageutils.GetE2EImage(imageutils.Dnsutils),
 					Command: []string{"sleep", "10000"},
 					Ports: []v1.ContainerPort{
-						{ContainerPort: servicePort, Protocol: "TCP"},
+						{ContainerPort: servicePort, Protocol: v1.ProtocolTCP},
 					},
 				},
 			},
@@ -238,7 +238,7 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) {
 			Selector: map[string]string{"app": baseName},
 			Ports: []v1.ServicePort{
 				{
-					Protocol:   "TCP",
+					Protocol:   v1.ProtocolTCP,
 					Port:       servicePort,
 					TargetPort: intstr.FromInt(servicePort),
 				},

--- a/test/e2e/network/firewall.go
+++ b/test/e2e/network/firewall.go
@@ -70,7 +70,7 @@ var _ = SIGDescribe("Firewall rule", func() {

 		By("Creating a LoadBalancer type service with ExternalTrafficPolicy=Global")
 		svc := jig.CreateLoadBalancerService(ns, serviceName, framework.LoadBalancerCreateTimeoutDefault, func(svc *v1.Service) {
-			svc.Spec.Ports = []v1.ServicePort{{Protocol: "TCP", Port: framework.FirewallTestHttpPort}}
+			svc.Spec.Ports = []v1.ServicePort{{Protocol: v1.ProtocolTCP, Port: framework.FirewallTestHttpPort}}
 			svc.Spec.LoadBalancerSourceRanges = firewallTestSourceRanges
 		})
 		defer func() {

--- a/test/e2e/network/service.go
+++ b/test/e2e/network/service.go
@@ -57,7 +57,7 @@ var (
 			Ports: []v1.ServicePort{{
 				Port:       int32(defaultServeHostnameServicePort),
 				TargetPort: intstr.FromInt(9376),
-				Protocol:   "TCP",
+				Protocol:   v1.ProtocolTCP,
 			}},
 			Selector: map[string]string{
 				"name": defaultServeHostnameServiceName,
@@ -897,7 +897,7 @@ var _ = SIGDescribe("Services", func() {
 			s.Spec.Type = v1.ServiceTypeClusterIP
 			s.Spec.ExternalName = ""
 			s.Spec.Ports = []v1.ServicePort{
-				{Port: 80, Name: "http", Protocol: "TCP"},
+				{Port: 80, Name: "http", Protocol: v1.ProtocolTCP},
 			}
 		})
 		jig.SanityCheckService(clusterIPService, v1.ServiceTypeClusterIP)
@@ -921,7 +921,7 @@ var _ = SIGDescribe("Services", func() {
 			s.Spec.Type = v1.ServiceTypeNodePort
 			s.Spec.ExternalName = ""
 			s.Spec.Ports = []v1.ServicePort{
-				{Port: 80, Name: "http", Protocol: "TCP"},
+				{Port: 80, Name: "http", Protocol: v1.ProtocolTCP},
 			}
 		})
 		jig.SanityCheckService(nodePortService, v1.ServiceTypeNodePort)