Merge pull request kubernetes#84289 from danwinship/service-sanitycheck-fix-3

k8s-ci-robot · web-flow · commit 05fa6f9e88a2 · 2019-10-24T11:56:56.000-07:00
Fix service sanity check after jig.ChangeServiceType
diff --git a/test/e2e/framework/service/jig.go b/test/e2e/framework/service/jig.go
@@ -526,7 +526,7 @@ func (j *TestJig) WaitForLoadBalancerDestroy(ip string, port int, timeout time.D
 	if err != nil {
 		return nil, err
 	}
-	return j.sanityCheckService(service, v1.ServiceTypeLoadBalancer)
+	return j.sanityCheckService(service, service.Spec.Type)
 }
 
 func (j *TestJig) waitForCondition(timeout time.Duration, message string, conditionFn func(*v1.Service) bool) (*v1.Service, error) {

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ func (j *TestJig) WaitForLoadBalancerDestroy(ip string, port int, timeout time.D`
`526`	`526`	`if err != nil {`
`527`	`527`	`return nil, err`
`528`	`528`	`}`
`529`		`- return j.sanityCheckService(service, v1.ServiceTypeLoadBalancer)`
	`529`	`+ return j.sanityCheckService(service, service.Spec.Type)`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`func (j TestJig) waitForCondition(timeout time.Duration, message string, conditionFn func(v1.Service) bool) (*v1.Service, error) {`