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

Merge pull request #90254 from smarterclayton/flaky_test

Browse Source 
test: IngressClass exclusion test races with admission cache
This commit is contained in:
Kubernetes Prow Robot 2020-04-19 21:11:40 -07:00 committed by GitHub
commit 1aa2c99a27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/e2e/network/ingressclass.go
View File

@ -19,10 +19,12 @@ package network
import (
"context"
"strings"
"time"
networkingv1beta1 "k8s.io/api/networking/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework"
@ -73,14 +75,19 @@ var _ = SIGDescribe("IngressClass [Feature:Ingress]", func() {
framework.ExpectNoError(err)
defer deleteIngressClass(cs, ingressClass2.Name)
_, err = createBasicIngress(cs, f.Namespace.Name)
if err == nil {
framework.Failf("Expected error creating Ingress")
}
// the admission controller may take a few seconds to observe both ingress classes
expectedErr := "2 default IngressClasses were found, only 1 allowed"
if !strings.Contains(err.Error(), expectedErr) {
framework.Failf("Expected error to contain %s, got %s", expectedErr, err.Error())
var lastErr error
if err := wait.Poll(time.Second, time.Minute, func() (bool, error) {
defer cs.NetworkingV1beta1().Ingresses(f.Namespace.Name).Delete(context.TODO(), "ingress1", metav1.DeleteOptions{})
_, err := createBasicIngress(cs, f.Namespace.Name)
if err == nil {
return false, nil
}
lastErr = err
return strings.Contains(err.Error(), expectedErr), nil
}); err != nil {
framework.Failf("Expected error to contain %s, got %s", expectedErr, lastErr.Error())
}
})