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

e2e ingress don't set class if empty

Browse Source
This commit is contained in:
Antonio Ojea 2021-05-19 10:23:49 +02:00
parent 0839ed41ac
commit fa56d296e0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/framework/ingress/ingress_utils.go
View File

@ -420,9 +420,9 @@ type TestJig struct {
RootCAs map[string][]byte RootCAs map[string][]byte
Address string Address string
Ingress *networkingv1.Ingress Ingress *networkingv1.Ingress
// class is the value of the annotation keyed under // class was the value of the annotation keyed under `kubernetes.io/ingress.class`.
// `kubernetes.io/ingress.class`. It's added to all ingresses created by // A new ingressClassName field has been added that is used to reference the IngressClass.
// this jig. // It's added to all ingresses created by this jig.
Class string Class string
// The interval used to poll urls // The interval used to poll urls
@ -485,7 +485,9 @@ func (j *TestJig) CreateIngress(manifestPath, ns string, ingAnnotations map[stri
j.Ingress, err = ingressFromManifest(filepath.Join(manifestPath, "ing.yaml")) j.Ingress, err = ingressFromManifest(filepath.Join(manifestPath, "ing.yaml"))
framework.ExpectNoError(err) framework.ExpectNoError(err)
j.Ingress.Namespace = ns j.Ingress.Namespace = ns
j.Ingress.Spec.IngressClassName = &j.Class if j.Class != "" {
j.Ingress.Spec.IngressClassName = &j.Class
}
j.Logger.Infof("creating %v ingress", j.Ingress.Name) j.Logger.Infof("creating %v ingress", j.Ingress.Name)
j.Ingress, err = j.runCreate(j.Ingress) j.Ingress, err = j.runCreate(j.Ingress)
framework.ExpectNoError(err) framework.ExpectNoError(err)