From cfc56a9d2c73cb196cd5710509d6943c253a6bbf Mon Sep 17 00:00:00 2001 From: Marcus Puckett Date: Wed, 2 Feb 2022 11:16:58 -0800 Subject: [PATCH] Update tests to account for new describe line for IngressClassName Kubernetes-commit: 8b541910c0565781992065df779815519cffb362 --- pkg/describe/describe_test.go | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkg/describe/describe_test.go b/pkg/describe/describe_test.go index 06b844fa..b8c1e547 100644 --- a/pkg/describe/describe_test.go +++ b/pkg/describe/describe_test.go @@ -2265,6 +2265,7 @@ func TestDescribeJob(t *testing.T) { } func TestDescribeIngress(t *testing.T) { + ingresClassName := "test" backendV1beta1 := networkingv1beta1.IngressBackend{ ServiceName: "default-backend", ServicePort: intstr.FromInt(80), @@ -2279,6 +2280,7 @@ func TestDescribeIngress(t *testing.T) { Namespace: "foo", }, Spec: networkingv1beta1.IngressSpec{ + IngressClassName: &ingresClassName, Rules: []networkingv1beta1.IngressRule{ { Host: "foo.bar.com", @@ -2311,6 +2313,7 @@ func TestDescribeIngress(t *testing.T) { Namespace: "foo", }, Spec: networkingv1.IngressSpec{ + IngressClassName: &ingresClassName, Rules: []networkingv1.IngressRule{ { Host: "foo.bar.com", @@ -2354,6 +2357,7 @@ Labels: id1=app1 id2=app2 Namespace: foo Address: +Ingress Class: test Default backend: default-http-backend:80 () Rules: Host Path Backends @@ -2369,6 +2373,7 @@ Events: ` + "\n", Labels: Namespace: foo Address: +Ingress Class: test Default backend: default-http-backend:80 () Rules: Host Path Backends @@ -2385,6 +2390,7 @@ Events: ` + "\n", Namespace: "foo", }, Spec: networkingv1.IngressSpec{ + IngressClassName: &ingresClassName, Rules: []networkingv1.IngressRule{ { Host: "foo.bar.com", @@ -2406,6 +2412,7 @@ Events: ` + "\n", Labels: Namespace: foo Address: +Ingress Class: test Default backend: default-http-backend:80 () Rules: Host Path Backends @@ -2422,6 +2429,7 @@ Events: ` + "\n", Namespace: "foo", }, Spec: networkingv1.IngressSpec{ + IngressClassName: &ingresClassName, Rules: []networkingv1.IngressRule{ { Host: "foo.bar.com", @@ -2443,6 +2451,7 @@ Events: ` + "\n", Labels: Namespace: foo Address: +Ingress Class: test Default backend: default-http-backend:80 () Rules: Host Path Backends @@ -2459,7 +2468,8 @@ Events: ` + "\n", Namespace: "foo", }, Spec: networkingv1.IngressSpec{ - DefaultBackend: &backendV1, + DefaultBackend: &backendV1, + IngressClassName: &ingresClassName, Rules: []networkingv1.IngressRule{ { Host: "foo.bar.com", @@ -2481,6 +2491,7 @@ Events: ` + "\n", Labels: Namespace: foo Address: +Ingress Class: test Default backend: default-backend:80 () Rules: Host Path Backends @@ -2497,7 +2508,8 @@ Events: ` + "\n", Namespace: "foo", }, Spec: networkingv1.IngressSpec{ - DefaultBackend: &backendResource, + DefaultBackend: &backendResource, + IngressClassName: &ingresClassName, Rules: []networkingv1.IngressRule{ { Host: "foo.bar.com", @@ -2519,6 +2531,7 @@ Events: ` + "\n", Labels: Namespace: foo Address: +Ingress Class: test Default backend: APIGroup: example.com, Kind: foo, Name: bar Rules: Host Path Backends @@ -2535,7 +2548,8 @@ Events: ` + "\n", Namespace: "foo", }, Spec: networkingv1.IngressSpec{ - DefaultBackend: &backendResource, + DefaultBackend: &backendResource, + IngressClassName: &ingresClassName, Rules: []networkingv1.IngressRule{ { Host: "foo.bar.com", @@ -2557,6 +2571,7 @@ Events: ` + "\n", Labels: Namespace: foo Address: +Ingress Class: test Default backend: APIGroup: example.com, Kind: foo, Name: bar Rules: Host Path Backends @@ -2573,13 +2588,15 @@ Events: ` + "\n", Namespace: "foo", }, Spec: networkingv1.IngressSpec{ - DefaultBackend: &backendV1, + DefaultBackend: &backendV1, + IngressClassName: &ingresClassName, }, }), output: `Name: bar Labels: Namespace: foo Address: +Ingress Class: test Default backend: default-backend:80 () Rules: Host Path Backends @@ -2609,6 +2626,7 @@ Events: } func TestDescribeIngressV1(t *testing.T) { + ingresClassName := "test" defaultBackend := networkingv1.IngressBackend{ Service: &networkingv1.IngressServiceBackend{ Name: "default-backend", @@ -2628,6 +2646,7 @@ func TestDescribeIngressV1(t *testing.T) { Namespace: "foo", }, Spec: networkingv1.IngressSpec{ + IngressClassName: &ingresClassName, Rules: []networkingv1.IngressRule{ { Host: "foo.bar.com",