kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update tests to account for new describe line for IngressClassName 

Kubernetes-commit: 8b541910c0565781992065df779815519cffb362
This commit is contained in:
Marcus Puckett 2022-02-02 11:16:58 -08:00 committed by Kubernetes Publisher
parent 97f6de2e3a
commit cfc56a9d2c
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/describe/describe_test.go
View File

@ -2265,6 +2265,7 @@ func TestDescribeJob(t *testing.T) {
} }
func TestDescribeIngress(t *testing.T) { func TestDescribeIngress(t *testing.T) {
ingresClassName := "test"
backendV1beta1 := networkingv1beta1.IngressBackend{ backendV1beta1 := networkingv1beta1.IngressBackend{
ServiceName: "default-backend", ServiceName: "default-backend",
ServicePort: intstr.FromInt(80), ServicePort: intstr.FromInt(80),
@ -2279,6 +2280,7 @@ func TestDescribeIngress(t *testing.T) {
Namespace: "foo", Namespace: "foo",
}, },
Spec: networkingv1beta1.IngressSpec{ Spec: networkingv1beta1.IngressSpec{
IngressClassName: &ingresClassName,
Rules: []networkingv1beta1.IngressRule{ Rules: []networkingv1beta1.IngressRule{
{ {
Host: "foo.bar.com", Host: "foo.bar.com",
@ -2311,6 +2313,7 @@ func TestDescribeIngress(t *testing.T) {
Namespace: "foo", Namespace: "foo",
}, },
Spec: networkingv1.IngressSpec{ Spec: networkingv1.IngressSpec{
IngressClassName: &ingresClassName,
Rules: []networkingv1.IngressRule{ Rules: []networkingv1.IngressRule{
{ {
Host: "foo.bar.com", Host: "foo.bar.com",
@ -2354,6 +2357,7 @@ Labels: id1=app1
id2=app2 id2=app2
Namespace: foo Namespace: foo
Address: Address:
Ingress Class: test
Default backend: default-http-backend:80 (<error: endpoints "default-http-backend" not found>) Default backend: default-http-backend:80 (<error: endpoints "default-http-backend" not found>)
Rules: Rules:
Host Path Backends Host Path Backends
@ -2369,6 +2373,7 @@ Events: <none>` + "\n",
Labels: <none> Labels: <none>
Namespace: foo Namespace: foo
Address: Address:
Ingress Class: test
Default backend: default-http-backend:80 (<error: endpoints "default-http-backend" not found>) Default backend: default-http-backend:80 (<error: endpoints "default-http-backend" not found>)
Rules: Rules:
Host Path Backends Host Path Backends
@ -2385,6 +2390,7 @@ Events: <none>` + "\n",
Namespace: "foo", Namespace: "foo",
}, },
Spec: networkingv1.IngressSpec{ Spec: networkingv1.IngressSpec{
IngressClassName: &ingresClassName,
Rules: []networkingv1.IngressRule{ Rules: []networkingv1.IngressRule{
{ {
Host: "foo.bar.com", Host: "foo.bar.com",
@ -2406,6 +2412,7 @@ Events: <none>` + "\n",
Labels: <none> Labels: <none>
Namespace: foo Namespace: foo
Address: Address:
Ingress Class: test
Default backend: default-http-backend:80 (<error: endpoints "default-http-backend" not found>) Default backend: default-http-backend:80 (<error: endpoints "default-http-backend" not found>)
Rules: Rules:
Host Path Backends Host Path Backends
@ -2422,6 +2429,7 @@ Events: <none>` + "\n",
Namespace: "foo", Namespace: "foo",
}, },
Spec: networkingv1.IngressSpec{ Spec: networkingv1.IngressSpec{
IngressClassName: &ingresClassName,
Rules: []networkingv1.IngressRule{ Rules: []networkingv1.IngressRule{
{ {
Host: "foo.bar.com", Host: "foo.bar.com",
@ -2443,6 +2451,7 @@ Events: <none>` + "\n",
Labels: <none> Labels: <none>
Namespace: foo Namespace: foo
Address: Address:
Ingress Class: test
Default backend: default-http-backend:80 (<error: endpoints "default-http-backend" not found>) Default backend: default-http-backend:80 (<error: endpoints "default-http-backend" not found>)
Rules: Rules:
Host Path Backends Host Path Backends
@ -2460,6 +2469,7 @@ Events: <none>` + "\n",
}, },
Spec: networkingv1.IngressSpec{ Spec: networkingv1.IngressSpec{
DefaultBackend: &backendV1, DefaultBackend: &backendV1,
IngressClassName: &ingresClassName,
Rules: []networkingv1.IngressRule{ Rules: []networkingv1.IngressRule{
{ {
Host: "foo.bar.com", Host: "foo.bar.com",
@ -2481,6 +2491,7 @@ Events: <none>` + "\n",
Labels: <none> Labels: <none>
Namespace: foo Namespace: foo
Address: Address:
Ingress Class: test
Default backend: default-backend:80 (<error: endpoints "default-backend" not found>) Default backend: default-backend:80 (<error: endpoints "default-backend" not found>)
Rules: Rules:
Host Path Backends Host Path Backends
@ -2498,6 +2509,7 @@ Events: <none>` + "\n",
}, },
Spec: networkingv1.IngressSpec{ Spec: networkingv1.IngressSpec{
DefaultBackend: &backendResource, DefaultBackend: &backendResource,
IngressClassName: &ingresClassName,
Rules: []networkingv1.IngressRule{ Rules: []networkingv1.IngressRule{
{ {
Host: "foo.bar.com", Host: "foo.bar.com",
@ -2519,6 +2531,7 @@ Events: <none>` + "\n",
Labels: <none> Labels: <none>
Namespace: foo Namespace: foo
Address: Address:
Ingress Class: test
Default backend: APIGroup: example.com, Kind: foo, Name: bar Default backend: APIGroup: example.com, Kind: foo, Name: bar
Rules: Rules:
Host Path Backends Host Path Backends
@ -2536,6 +2549,7 @@ Events: <none>` + "\n",
}, },
Spec: networkingv1.IngressSpec{ Spec: networkingv1.IngressSpec{
DefaultBackend: &backendResource, DefaultBackend: &backendResource,
IngressClassName: &ingresClassName,
Rules: []networkingv1.IngressRule{ Rules: []networkingv1.IngressRule{
{ {
Host: "foo.bar.com", Host: "foo.bar.com",
@ -2557,6 +2571,7 @@ Events: <none>` + "\n",
Labels: <none> Labels: <none>
Namespace: foo Namespace: foo
Address: Address:
Ingress Class: test
Default backend: APIGroup: example.com, Kind: foo, Name: bar Default backend: APIGroup: example.com, Kind: foo, Name: bar
Rules: Rules:
Host Path Backends Host Path Backends
@ -2574,12 +2589,14 @@ Events: <none>` + "\n",
}, },
Spec: networkingv1.IngressSpec{ Spec: networkingv1.IngressSpec{
DefaultBackend: &backendV1, DefaultBackend: &backendV1,
IngressClassName: &ingresClassName,
}, },
}), }),
output: `Name: bar output: `Name: bar
Labels: <none> Labels: <none>
Namespace: foo Namespace: foo
Address: Address:
Ingress Class: test
Default backend: default-backend:80 (<error: endpoints "default-backend" not found>) Default backend: default-backend:80 (<error: endpoints "default-backend" not found>)
Rules: Rules:
Host Path Backends Host Path Backends
@ -2609,6 +2626,7 @@ Events: <none>
} }
func TestDescribeIngressV1(t *testing.T) { func TestDescribeIngressV1(t *testing.T) {
ingresClassName := "test"
defaultBackend := networkingv1.IngressBackend{ defaultBackend := networkingv1.IngressBackend{
Service: &networkingv1.IngressServiceBackend{ Service: &networkingv1.IngressServiceBackend{
Name: "default-backend", Name: "default-backend",
@ -2628,6 +2646,7 @@ func TestDescribeIngressV1(t *testing.T) {
Namespace: "foo", Namespace: "foo",
}, },
Spec: networkingv1.IngressSpec{ Spec: networkingv1.IngressSpec{
IngressClassName: &ingresClassName,
Rules: []networkingv1.IngressRule{ Rules: []networkingv1.IngressRule{
{ {
Host: "foo.bar.com", Host: "foo.bar.com",