diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index b97267a4983..9c3141806d2 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -680,10 +680,10 @@ func printPodBase(pod *api.Pod, w io.Writer, options PrintOptions) error { } } - if _, err := fmt.Fprint(w, appendLabels(pod.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(pod.Labels, options.ColumnLabels)); err != nil { return err } - if _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, pod.Labels)); err != nil { + if _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, pod.Labels)); err != nil { return err } @@ -719,10 +719,10 @@ func printPodTemplate(pod *api.PodTemplate, w io.Writer, options PrintOptions) e if _, err := fmt.Fprintf(w, "\t%s", labels.FormatLabels(pod.Template.Labels)); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(pod.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(pod.Labels, options.ColumnLabels)); err != nil { return err } - if _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, pod.Labels)); err != nil { + if _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, pod.Labels)); err != nil { return err } @@ -769,10 +769,10 @@ func printReplicationController(controller *api.ReplicationController, w io.Writ return err } } - if _, err := fmt.Fprint(w, appendLabels(controller.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(controller.Labels, options.ColumnLabels)); err != nil { return err } - if _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, controller.Labels)); err != nil { + if _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, controller.Labels)); err != nil { return err } @@ -817,10 +817,10 @@ func printReplicaSet(rs *extensions.ReplicaSet, w io.Writer, options PrintOption return err } } - if _, err := fmt.Fprint(w, appendLabels(rs.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(rs.Labels, options.ColumnLabels)); err != nil { return err } - if _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, rs.Labels)); err != nil { + if _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, rs.Labels)); err != nil { return err } @@ -911,10 +911,10 @@ func printJob(job *batch.Job, w io.Writer, options PrintOptions) error { return err } } - if _, err := fmt.Fprint(w, appendLabels(job.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(job.Labels, options.ColumnLabels)); err != nil { return err } - if _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, job.Labels)); err != nil { + if _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, job.Labels)); err != nil { return err } @@ -1003,10 +1003,10 @@ func printService(svc *api.Service, w io.Writer, options PrintOptions) error { return err } } - if _, err := fmt.Fprint(w, appendLabels(svc.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(svc.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, svc.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, svc.Labels)) return err } @@ -1047,11 +1047,11 @@ func printIngress(ingress *extensions.Ingress, w io.Writer, options PrintOptions ); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(ingress.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(ingress.Labels, options.ColumnLabels)); err != nil { return err } - if _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, ingress.Labels)); err != nil { + if _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, ingress.Labels)); err != nil { return err } @@ -1069,7 +1069,7 @@ func printIngress(ingress *extensions.Ingress, w io.Writer, options PrintOptions if err != nil { return err } - if _, err := fmt.Fprint(w, appendLabelTabs(options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabelTabs(options.ColumnLabels)); err != nil { return err } for _, rule := range rules.HTTP.Paths { @@ -1077,7 +1077,7 @@ func printIngress(ingress *extensions.Ingress, w io.Writer, options PrintOptions if err != nil { return err } - if _, err := fmt.Fprint(w, appendLabelTabs(options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabelTabs(options.ColumnLabels)); err != nil { return err } } @@ -1123,10 +1123,10 @@ func printPetSet(ps *apps.PetSet, w io.Writer, options PrintOptions) error { return err } } - if _, err := fmt.Fprint(w, appendLabels(ps.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(ps.Labels, options.ColumnLabels)); err != nil { return err } - if _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, ps.Labels)); err != nil { + if _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, ps.Labels)); err != nil { return err } @@ -1178,10 +1178,10 @@ func printDaemonSet(ds *extensions.DaemonSet, w io.Writer, options PrintOptions) return err } } - if _, err := fmt.Fprint(w, appendLabels(ds.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(ds.Labels, options.ColumnLabels)); err != nil { return err } - if _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, ds.Labels)); err != nil { + if _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, ds.Labels)); err != nil { return err } @@ -1209,10 +1209,10 @@ func printEndpoints(endpoints *api.Endpoints, w io.Writer, options PrintOptions) if _, err := fmt.Fprintf(w, "%s\t%s\t%s", name, formatEndpoints(endpoints, nil), translateTimestamp(endpoints.CreationTimestamp)); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(endpoints.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(endpoints.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, endpoints.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, endpoints.Labels)) return err } @@ -1233,10 +1233,10 @@ func printNamespace(item *api.Namespace, w io.Writer, options PrintOptions) erro if _, err := fmt.Fprintf(w, "%s\t%s\t%s", item.Name, item.Status.Phase, translateTimestamp(item.CreationTimestamp)); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(item.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(item.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, item.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, item.Labels)) return err } @@ -1261,10 +1261,10 @@ func printSecret(item *api.Secret, w io.Writer, options PrintOptions) error { if _, err := fmt.Fprintf(w, "%s\t%s\t%v\t%s", name, item.Type, len(item.Data), translateTimestamp(item.CreationTimestamp)); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(item.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(item.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, item.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, item.Labels)) return err } @@ -1290,10 +1290,10 @@ func printServiceAccount(item *api.ServiceAccount, w io.Writer, options PrintOpt if _, err := fmt.Fprintf(w, "%s\t%d\t%s", name, len(item.Secrets), translateTimestamp(item.CreationTimestamp)); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(item.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(item.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, item.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, item.Labels)) return err } @@ -1338,10 +1338,10 @@ func printNode(node *api.Node, w io.Writer, options PrintOptions) error { return err } // Display caller specify column labels first. - if _, err := fmt.Fprint(w, appendLabels(node.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(node.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, node.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, node.Labels)) return err } @@ -1382,10 +1382,10 @@ func printPersistentVolume(pv *api.PersistentVolume, w io.Writer, options PrintO ); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(pv.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(pv.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, pv.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, pv.Labels)) return err } @@ -1421,10 +1421,10 @@ func printPersistentVolumeClaim(pvc *api.PersistentVolumeClaim, w io.Writer, opt if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s", name, phase, pvc.Spec.VolumeName, capacity, accessModes, translateTimestamp(pvc.CreationTimestamp)); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(pvc.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(pvc.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, pvc.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, pvc.Labels)) return err } @@ -1470,10 +1470,10 @@ func printEvent(event *api.Event, w io.Writer, options PrintOptions) error { ); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(event.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(event.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, event.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, event.Labels)) return err } @@ -1505,10 +1505,10 @@ func printLimitRange(limitRange *api.LimitRange, w io.Writer, options PrintOptio ); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(limitRange.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(limitRange.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, limitRange.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, limitRange.Labels)) return err } @@ -1539,10 +1539,10 @@ func printResourceQuota(resourceQuota *api.ResourceQuota, w io.Writer, options P ); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(resourceQuota.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(resourceQuota.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, resourceQuota.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, resourceQuota.Labels)) return err } @@ -1579,10 +1579,10 @@ func printComponentStatus(item *api.ComponentStatus, w io.Writer, options PrintO if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s", item.Name, status, message, error); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(item.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(item.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, item.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, item.Labels)) return err } @@ -1663,10 +1663,10 @@ func printDeployment(deployment *extensions.Deployment, w io.Writer, options Pri if _, err := fmt.Fprintf(w, "%s\t%d\t%d\t%d\t%d\t%s", deployment.Name, desiredReplicas, currentReplicas, updatedReplicas, availableReplicas, age); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(deployment.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(deployment.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, deployment.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, deployment.Labels)) return err } @@ -1715,10 +1715,10 @@ func printHorizontalPodAutoscaler(hpa *autoscaling.HorizontalPodAutoscaler, w io ); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(hpa.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(hpa.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, hpa.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, hpa.Labels)) return err } @@ -1743,10 +1743,10 @@ func printConfigMap(configMap *api.ConfigMap, w io.Writer, options PrintOptions) if _, err := fmt.Fprintf(w, "%s\t%v\t%s", name, len(configMap.Data), translateTimestamp(configMap.CreationTimestamp)); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(configMap.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(configMap.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, configMap.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, configMap.Labels)) return err } @@ -1788,10 +1788,10 @@ func printNetworkPolicy(networkPolicy *extensions.NetworkPolicy, w io.Writer, op if _, err := fmt.Fprintf(w, "%s\t%v\t%s", name, unversioned.FormatLabelSelector(&networkPolicy.Spec.PodSelector), translateTimestamp(networkPolicy.CreationTimestamp)); err != nil { return err } - if _, err := fmt.Fprint(w, appendLabels(networkPolicy.Labels, options.ColumnLabels)); err != nil { + if _, err := fmt.Fprint(w, AppendLabels(networkPolicy.Labels, options.ColumnLabels)); err != nil { return err } - _, err := fmt.Fprint(w, appendAllLabels(options.ShowLabels, networkPolicy.Labels)) + _, err := fmt.Fprint(w, AppendAllLabels(options.ShowLabels, networkPolicy.Labels)) return err } @@ -1804,7 +1804,7 @@ func printNetworkPolicyList(list *extensions.NetworkPolicyList, w io.Writer, opt return nil } -func appendLabels(itemLabels map[string]string, columnLabels []string) string { +func AppendLabels(itemLabels map[string]string, columnLabels []string) string { var buffer bytes.Buffer for _, cl := range columnLabels { @@ -1821,7 +1821,7 @@ func appendLabels(itemLabels map[string]string, columnLabels []string) string { // Append all labels to a single column. We need this even when show-labels flag* is // false, since this adds newline delimiter to the end of each row. -func appendAllLabels(showLabels bool, itemLabels map[string]string) string { +func AppendAllLabels(showLabels bool, itemLabels map[string]string) string { var buffer bytes.Buffer if showLabels { @@ -1835,7 +1835,7 @@ func appendAllLabels(showLabels bool, itemLabels map[string]string) string { // Append a set of tabs for each label column. We need this in the case where // we have extra lines so that the tabwriter will still line things up. -func appendLabelTabs(columnLabels []string) string { +func AppendLabelTabs(columnLabels []string) string { var buffer bytes.Buffer for range columnLabels {