github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22279 from soltysh/describer_none

Browse Source 
Unifying empty/none/not set values in describer
This commit is contained in:
Jeff Lowdermilk 2016-03-03 11:40:54 -08:00
commit 8c500a9c31
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubectl/describe.go
View File

@ -577,7 +577,7 @@ func describeVolumes(volumes []api.Volume, out io.Writer) {
case volume.VolumeSource.DownwardAPI != nil: case volume.VolumeSource.DownwardAPI != nil:
printDownwardAPIVolumeSource(volume.VolumeSource.DownwardAPI, out) printDownwardAPIVolumeSource(volume.VolumeSource.DownwardAPI, out)
default: default:
fmt.Fprintf(out, " <Volume Type Not Found>\n") fmt.Fprintf(out, " <unknown>\n")
} }
} }
} }
@ -975,7 +975,7 @@ func describeReplicationController(controller *api.ReplicationController, events
if controller.Spec.Template != nil { if controller.Spec.Template != nil {
fmt.Fprintf(out, "Image(s):\t%s\n", makeImageList(&controller.Spec.Template.Spec)) fmt.Fprintf(out, "Image(s):\t%s\n", makeImageList(&controller.Spec.Template.Spec))
} else { } else {
fmt.Fprintf(out, "Image(s):\t%s\n", "<no template>") fmt.Fprintf(out, "Image(s):\t%s\n", "<unset>")
} }
fmt.Fprintf(out, "Selector:\t%s\n", labels.FormatLabels(controller.Spec.Selector)) fmt.Fprintf(out, "Selector:\t%s\n", labels.FormatLabels(controller.Spec.Selector))
fmt.Fprintf(out, "Labels:\t%s\n", labels.FormatLabels(controller.Labels)) fmt.Fprintf(out, "Labels:\t%s\n", labels.FormatLabels(controller.Labels))
@ -994,7 +994,7 @@ func describeReplicationController(controller *api.ReplicationController, events
func DescribePodTemplate(template *api.PodTemplateSpec) (string, error) { func DescribePodTemplate(template *api.PodTemplateSpec) (string, error) {
return tabbedString(func(out io.Writer) error { return tabbedString(func(out io.Writer) error {
if template == nil { if template == nil {
fmt.Fprintf(out, "<no template>") fmt.Fprintf(out, "<unset>")
return nil return nil
} }
fmt.Fprintf(out, "Labels:\t%s\n", labels.FormatLabels(template.Labels)) fmt.Fprintf(out, "Labels:\t%s\n", labels.FormatLabels(template.Labels))
@ -1041,7 +1041,7 @@ func describeReplicaSet(rs *extensions.ReplicaSet, events *api.EventList, runnin
if rs.Spec.Template != nil { if rs.Spec.Template != nil {
fmt.Fprintf(out, "Image(s):\t%s\n", makeImageList(&rs.Spec.Template.Spec)) fmt.Fprintf(out, "Image(s):\t%s\n", makeImageList(&rs.Spec.Template.Spec))
} else { } else {
fmt.Fprintf(out, "Image(s):\t%s\n", "<no template>") fmt.Fprintf(out, "Image(s):\t%s\n", "<unset>")
} }
fmt.Fprintf(out, "Selector:\t%s\n", unversioned.FormatLabelSelector(rs.Spec.Selector)) fmt.Fprintf(out, "Selector:\t%s\n", unversioned.FormatLabelSelector(rs.Spec.Selector))
fmt.Fprintf(out, "Labels:\t%s\n", labels.FormatLabels(rs.Labels)) fmt.Fprintf(out, "Labels:\t%s\n", labels.FormatLabels(rs.Labels))
@ -1084,7 +1084,7 @@ func describeJob(job *extensions.Job, events *api.EventList) (string, error) {
if job.Spec.Completions != nil { if job.Spec.Completions != nil {
fmt.Fprintf(out, "Completions:\t%d\n", *job.Spec.Completions) fmt.Fprintf(out, "Completions:\t%d\n", *job.Spec.Completions)
} else { } else {
fmt.Fprintf(out, "Completions:\tNot Set\n") fmt.Fprintf(out, "Completions:\t<unset>\n")
} }
if job.Status.StartTime != nil { if job.Status.StartTime != nil {
fmt.Fprintf(out, "Start Time:\t%s\n", job.Status.StartTime.Time.Format(time.RFC1123Z)) fmt.Fprintf(out, "Start Time:\t%s\n", job.Status.StartTime.Time.Format(time.RFC1123Z))
@ -1343,7 +1343,7 @@ func describeService(service *api.Service, endpoints *api.Endpoints, events *api
name := sp.Name name := sp.Name
if name == "" { if name == "" {
name = "<unnamed>" name = "<unset>"
} }
fmt.Fprintf(out, "Port:\t%s\t%d/%s\n", name, sp.Port, sp.Protocol) fmt.Fprintf(out, "Port:\t%s\t%d/%s\n", name, sp.Port, sp.Protocol)
if sp.NodePort != 0 { if sp.NodePort != 0 {
@ -1414,7 +1414,7 @@ func describeEndpoints(ep *api.Endpoints, events *api.EventList) (string, error)
for _, port := range subset.Ports { for _, port := range subset.Ports {
name := port.Name name := port.Name
if len(name) == 0 { if len(name) == 0 {
name = "<unnamed>" name = "<unset>"
} }
fmt.Fprintf(out, " %s\t%d\t%s\n", name, port.Port, port.Protocol) fmt.Fprintf(out, " %s\t%d\t%s\n", name, port.Port, port.Protocol)
} }
@ -1636,7 +1636,7 @@ func (d *HorizontalPodAutoscalerDescriber) Describe(namespace, name string) (str
if hpa.Status.CurrentCPUUtilizationPercentage != nil { if hpa.Status.CurrentCPUUtilizationPercentage != nil {
fmt.Fprintf(out, "%d%%\n", *hpa.Status.CurrentCPUUtilizationPercentage) fmt.Fprintf(out, "%d%%\n", *hpa.Status.CurrentCPUUtilizationPercentage)
} else { } else {
fmt.Fprintf(out, "<not available>\n") fmt.Fprintf(out, "<unset>\n")
} }
} }
minReplicas := "<unset>" minReplicas := "<unset>"

2
test/e2e/kubectl.go
View File

@ -613,7 +613,7 @@ var _ = Describe("Kubectl client", func() {
{"Selector:", "app=redis", "role=master"}, {"Selector:", "app=redis", "role=master"},
{"Type:", "ClusterIP"}, {"Type:", "ClusterIP"},
{"IP:"}, {"IP:"},
{"Port:", "<unnamed>", "6379/TCP"}, {"Port:", "<unset>", "6379/TCP"},
{"Endpoints:"}, {"Endpoints:"},
{"Session Affinity:", "None"}} {"Session Affinity:", "None"}}
checkOutput(output, requiredStrings) checkOutput(output, requiredStrings)