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

Clean up top level labels in describer

Browse Source
This commit is contained in:
Clayton Coleman 2017-02-28 18:36:41 -05:00
parent a5bf3d5424
commit 39a32a627f
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/printers/internalversion/describe.go
View File

@ -577,7 +577,7 @@ func printControllers(annotation map[string]string) string {
func describeVolumes(volumes []api.Volume, w *PrefixWriter, space string) { func describeVolumes(volumes []api.Volume, w *PrefixWriter, space string) {
if volumes == nil || len(volumes) == 0 { if volumes == nil || len(volumes) == 0 {
w.Write(LEVEL_0, "%sNo volumes.\n", space) w.Write(LEVEL_0, "%sVolumes:\t<none>\n", space)
return return
} }
w.Write(LEVEL_0, "%sVolumes:\n", space) w.Write(LEVEL_0, "%sVolumes:\n", space)
@ -1026,7 +1026,7 @@ func describeContainerVolumes(container api.Container, w *PrefixWriter) {
if len(container.VolumeMounts) == 0 { if len(container.VolumeMounts) == 0 {
none = "\t<none>" none = "\t<none>"
} }
w.Write(LEVEL_2, "Volume Mounts:%s\n", none) w.Write(LEVEL_2, "Mounts:%s\n", none)
sort.Sort(SortableVolumeMounts(container.VolumeMounts)) sort.Sort(SortableVolumeMounts(container.VolumeMounts))
for _, mount := range container.VolumeMounts { for _, mount := range container.VolumeMounts {
flags := []string{} flags := []string{}
@ -1047,7 +1047,7 @@ func describeContainerEnvVars(container api.Container, resolverFn EnvVarResolver
if len(container.Env) == 0 { if len(container.Env) == 0 {
none = "\t<none>" none = "\t<none>"
} }
w.Write(LEVEL_2, "Environment Variables:%s\n", none) w.Write(LEVEL_2, "Environment:%s\n", none)
for _, e := range container.Env { for _, e := range container.Env {
if e.ValueFrom == nil { if e.ValueFrom == nil {
@ -2341,7 +2341,7 @@ func getPodsTotalRequestsAndLimits(podList *api.PodList) (reqs map[api.ResourceN
func DescribeEvents(el *api.EventList, w *PrefixWriter) { func DescribeEvents(el *api.EventList, w *PrefixWriter) {
if len(el.Items) == 0 { if len(el.Items) == 0 {
w.Write(LEVEL_0, "No events.\n") w.Write(LEVEL_0, "Events:\t<none>\n")
return return
} }
sort.Sort(events.SortableEvents(el.Items)) sort.Sort(events.SortableEvents(el.Items))