Skip to content

Commit 2318a13

Browse files
authored
Merge pull request kubernetes#94985 from howardjohn/describe-ingress
Fix `kubectl describe ingress` format
2 parents 7ff41c1 + 9a0b913 commit 2318a13

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

staging/src/k8s.io/kubectl/pkg/describe/describe.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2465,7 +2465,7 @@ func (i *IngressDescriber) describeBackendV1(ns string, backend *networkingv1.In
24652465
}
24662466
}
24672467
ep := formatEndpoints(endpoints, sets.NewString(spName))
2468-
return fmt.Sprintf("%s\t %s)", sb, ep)
2468+
return fmt.Sprintf("%s (%s)", sb, ep)
24692469
}
24702470
if backend.Resource != nil {
24712471
ic := backend.Resource
@@ -2518,7 +2518,7 @@ func (i *IngressDescriber) describeIngressV1(ing *networkingv1.Ingress, events *
25182518
}
25192519
}
25202520
if count == 0 {
2521-
w.Write(LEVEL_1, "\t%s %s\n", "*", "*", i.describeBackendV1(ns, def))
2521+
w.Write(LEVEL_1, "%s\t%s\t%s\n", "*", "*", i.describeBackendV1(ns, def))
25222522
}
25232523
printAnnotationsMultiline(w, "Annotations", ing.Annotations)
25242524

staging/src/k8s.io/kubectl/pkg/describe/describe_test.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,6 +1924,28 @@ Rules:
19241924
Annotations: <none>
19251925
Events: <none>` + "\n",
19261926
},
1927+
"DefaultBackend": {
1928+
input: fake.NewSimpleClientset(&networkingv1.Ingress{
1929+
ObjectMeta: metav1.ObjectMeta{
1930+
Name: "bar",
1931+
Namespace: "foo",
1932+
},
1933+
Spec: networkingv1.IngressSpec{
1934+
DefaultBackend: &backendV1,
1935+
},
1936+
}),
1937+
output: `Name: bar
1938+
Namespace: foo
1939+
Address:
1940+
Default backend: default-backend:80 (<error: endpoints "default-backend" not found>)
1941+
Rules:
1942+
Host Path Backends
1943+
---- ---- --------
1944+
* * default-backend:80 (<error: endpoints "default-backend" not found>)
1945+
Annotations: <none>
1946+
Events: <none>
1947+
`,
1948+
},
19271949
}
19281950

19291951
for name, test := range tests {

0 commit comments

Comments
 (0)