github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix sanity-checking of LoadBalancer services in e2eservice.TestJig

Browse Source
This commit is contained in:
Dan Winship 2019-10-21 10:33:38 -04:00
parent 0f834b69a1
commit 0aae11db48
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/e2e/framework/service/jig.go
View File

@ -381,7 +381,8 @@ func (j *TestJig) WaitForAvailableEndpoint(timeout time.Duration) error {
} }
// sanityCheckService performs sanity checks on the given service; in particular, ensuring // sanityCheckService performs sanity checks on the given service; in particular, ensuring
// that creating/updating a service allocates IPs, ports, etc, as needed. // that creating/updating a service allocates IPs, ports, etc, as needed. It does not
// check for ingress assignment as that happens asynchronously after the Service is created.
func (j *TestJig) sanityCheckService(svc *v1.Service, svcType v1.ServiceType) (*v1.Service, error) { func (j *TestJig) sanityCheckService(svc *v1.Service, svcType v1.ServiceType) (*v1.Service, error) {
if svcType == "" { if svcType == "" {
svcType = v1.ServiceTypeClusterIP svcType = v1.ServiceTypeClusterIP
@ -418,19 +419,10 @@ func (j *TestJig) sanityCheckService(svc *v1.Service, svcType v1.ServiceType) (*
} }
} }
} }
expectIngress := false
if svcType == v1.ServiceTypeLoadBalancer { if svcType != v1.ServiceTypeLoadBalancer {
expectIngress = true if len(svc.Status.LoadBalancer.Ingress) != 0 {
} return nil, fmt.Errorf("unexpected Status.LoadBalancer.Ingress on non-LoadBalancer service")
hasIngress := len(svc.Status.LoadBalancer.Ingress) != 0
if hasIngress != expectIngress {
return nil, fmt.Errorf("unexpected number of Status.LoadBalancer.Ingress (%d) for service", len(svc.Status.LoadBalancer.Ingress))
}
if hasIngress {
for i, ing := range svc.Status.LoadBalancer.Ingress {
if ing.IP == "" && ing.Hostname == "" {
return nil, fmt.Errorf("unexpected Status.LoadBalancer.Ingress[%d] for service: %#v", i, ing)
}
} }
} }
@ -507,6 +499,13 @@ func (j *TestJig) WaitForLoadBalancer(timeout time.Duration) (*v1.Service, error
if err != nil { if err != nil {
return nil, err return nil, err
} }
for i, ing := range service.Status.LoadBalancer.Ingress {
if ing.IP == "" && ing.Hostname == "" {
return nil, fmt.Errorf("unexpected Status.LoadBalancer.Ingress[%d] for service: %#v", i, ing)
}
}
return j.sanityCheckService(service, v1.ServiceTypeLoadBalancer) return j.sanityCheckService(service, v1.ServiceTypeLoadBalancer)
} }