Skip to content

K
k3s
Unverified Commit c825d66b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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 ```
parents 825548df 57b4c1e7
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
test/e2e/network/dns.go
View file @ c825d66b
...@@ -202,7 +202,7 @@ var _ = SIGDescribe("DNS", func() { ...@@ -202,7 +202,7 @@ var _ = SIGDescribe("DNS", func() {
_, err = framework.UpdateService(f.ClientSet, f.Namespace.Name, serviceName, func(s *v1.Service) { _, err = framework.UpdateService(f.ClientSet, f.Namespace.Name, serviceName, func(s *v1.Service) {
s.Spec.Type = v1.ServiceTypeClusterIP s.Spec.Type = v1.ServiceTypeClusterIP
s.Spec.Ports = []v1.ServicePort{ s.Spec.Ports = []v1.ServicePort{
{Port: 80, Name: "http", Protocol: "TCP"}, {Port: 80, Name: "http", Protocol: v1.ProtocolTCP},
} }
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
......
test/e2e/network/dns_common.go
View file @ c825d66b
...@@ -213,7 +213,7 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) { ...@@ -213,7 +213,7 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) {
Image: imageutils.GetE2EImage(imageutils.Dnsutils), Image: imageutils.GetE2EImage(imageutils.Dnsutils),
Command: []string{"sleep", "10000"}, Command: []string{"sleep", "10000"},
Ports: []v1.ContainerPort{ Ports: []v1.ContainerPort{
{ContainerPort: servicePort, Protocol: "TCP"}, {ContainerPort: servicePort, Protocol: v1.ProtocolTCP},
}, },
}, },
}, },
...@@ -238,7 +238,7 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) { ...@@ -238,7 +238,7 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) {
Selector: map[string]string{"app": baseName}, Selector: map[string]string{"app": baseName},
Ports: []v1.ServicePort{ Ports: []v1.ServicePort{
{ {
Protocol: "TCP", Protocol: v1.ProtocolTCP,
Port: servicePort, Port: servicePort,
TargetPort: intstr.FromInt(servicePort), TargetPort: intstr.FromInt(servicePort),
}, },
......
test/e2e/network/firewall.go
View file @ c825d66b
...@@ -70,7 +70,7 @@ var _ = SIGDescribe("Firewall rule", func() { ...@@ -70,7 +70,7 @@ var _ = SIGDescribe("Firewall rule", func() {
By("Creating a LoadBalancer type service with ExternalTrafficPolicy=Global") By("Creating a LoadBalancer type service with ExternalTrafficPolicy=Global")
svc := jig.CreateLoadBalancerService(ns, serviceName, framework.LoadBalancerCreateTimeoutDefault, func(svc *v1.Service) { 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 svc.Spec.LoadBalancerSourceRanges = firewallTestSourceRanges
}) })
defer func() { defer func() {
......
test/e2e/network/service.go
View file @ c825d66b
...@@ -57,7 +57,7 @@ var ( ...@@ -57,7 +57,7 @@ var (
Ports: []v1.ServicePort{{ Ports: []v1.ServicePort{{
Port: int32(defaultServeHostnameServicePort), Port: int32(defaultServeHostnameServicePort),
TargetPort: intstr.FromInt(9376), TargetPort: intstr.FromInt(9376),
Protocol: "TCP", Protocol: v1.ProtocolTCP,
}}, }},
Selector: map[string]string{ Selector: map[string]string{
"name": defaultServeHostnameServiceName, "name": defaultServeHostnameServiceName,
...@@ -897,7 +897,7 @@ var _ = SIGDescribe("Services", func() { ...@@ -897,7 +897,7 @@ var _ = SIGDescribe("Services", func() {
s.Spec.Type = v1.ServiceTypeClusterIP s.Spec.Type = v1.ServiceTypeClusterIP
s.Spec.ExternalName = "" s.Spec.ExternalName = ""
s.Spec.Ports = []v1.ServicePort{ s.Spec.Ports = []v1.ServicePort{
{Port: 80, Name: "http", Protocol: "TCP"}, {Port: 80, Name: "http", Protocol: v1.ProtocolTCP},
} }
}) })
jig.SanityCheckService(clusterIPService, v1.ServiceTypeClusterIP) jig.SanityCheckService(clusterIPService, v1.ServiceTypeClusterIP)
...@@ -921,7 +921,7 @@ var _ = SIGDescribe("Services", func() { ...@@ -921,7 +921,7 @@ var _ = SIGDescribe("Services", func() {
s.Spec.Type = v1.ServiceTypeNodePort s.Spec.Type = v1.ServiceTypeNodePort
s.Spec.ExternalName = "" s.Spec.ExternalName = ""
s.Spec.Ports = []v1.ServicePort{ s.Spec.Ports = []v1.ServicePort{
{Port: 80, Name: "http", Protocol: "TCP"}, {Port: 80, Name: "http", Protocol: v1.ProtocolTCP},
} }
}) })
jig.SanityCheckService(nodePortService, v1.ServiceTypeNodePort) jig.SanityCheckService(nodePortService, v1.ServiceTypeNodePort)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment