diff --git a/pkg/printers/internalversion/describe.go b/pkg/printers/internalversion/describe.go index 0a6d6606c3f..19f50a65c3d 100644 --- a/pkg/printers/internalversion/describe.go +++ b/pkg/printers/internalversion/describe.go @@ -1535,6 +1535,8 @@ func describeDaemonSet(daemon *extensions.DaemonSet, events *api.EventList, runn printAnnotationsMultiline(w, "Annotations", daemon.Annotations) w.Write(LEVEL_0, "Desired Number of Nodes Scheduled: %d\n", daemon.Status.DesiredNumberScheduled) w.Write(LEVEL_0, "Current Number of Nodes Scheduled: %d\n", daemon.Status.CurrentNumberScheduled) + w.Write(LEVEL_0, "Number of Nodes Scheduled with Up-to-date Pods: %d\n", daemon.Status.UpdatedNumberScheduled) + w.Write(LEVEL_0, "Number of Nodes Scheduled with Available Pods: %d\n", daemon.Status.NumberAvailable) w.Write(LEVEL_0, "Number of Nodes Misscheduled: %d\n", daemon.Status.NumberMisscheduled) w.Write(LEVEL_0, "Pods Status:\t%d Running / %d Waiting / %d Succeeded / %d Failed\n", running, waiting, succeeded, failed) DescribePodTemplate(&daemon.Spec.Template, out) diff --git a/pkg/printers/internalversion/printers.go b/pkg/printers/internalversion/printers.go index 5b013c97a34..ea468d66651 100644 --- a/pkg/printers/internalversion/printers.go +++ b/pkg/printers/internalversion/printers.go @@ -66,7 +66,7 @@ var ( endpointColumns = []string{"NAME", "ENDPOINTS", "AGE"} nodeColumns = []string{"NAME", "STATUS", "AGE", "VERSION"} nodeWideColumns = []string{"EXTERNAL-IP", "OS-IMAGE", "KERNEL-VERSION"} - daemonSetColumns = []string{"NAME", "DESIRED", "CURRENT", "READY", "NODE-SELECTOR", "AGE"} + daemonSetColumns = []string{"NAME", "DESIRED", "CURRENT", "READY", "UP-TO-DATE", "AVAILABLE", "NODE-SELECTOR", "AGE"} daemonSetWideColumns = []string{"CONTAINER(S)", "IMAGE(S)", "SELECTOR"} eventColumns = []string{"LASTSEEN", "FIRSTSEEN", "COUNT", "NAME", "KIND", "SUBOBJECT", "TYPE", "REASON", "SOURCE", "MESSAGE"} limitRangeColumns = []string{"NAME", "AGE"} @@ -904,16 +904,20 @@ func printDaemonSet(ds *extensions.DaemonSet, w io.Writer, options printers.Prin desiredScheduled := ds.Status.DesiredNumberScheduled currentScheduled := ds.Status.CurrentNumberScheduled numberReady := ds.Status.NumberReady + numberUpdated := ds.Status.UpdatedNumberScheduled + numberAvailable := ds.Status.NumberAvailable selector, err := metav1.LabelSelectorAsSelector(ds.Spec.Selector) if err != nil { // this shouldn't happen if LabelSelector passed validation return err } - if _, err := fmt.Fprintf(w, "%s\t%d\t%d\t%d\t%s\t%s", + if _, err := fmt.Fprintf(w, "%s\t%d\t%d\t%d\t%d\t%d\t%s\t%s", name, desiredScheduled, currentScheduled, numberReady, + numberUpdated, + numberAvailable, labels.FormatLabels(ds.Spec.Template.Spec.NodeSelector), translateTimestamp(ds.CreationTimestamp), ); err != nil { diff --git a/pkg/printers/internalversion/printers_test.go b/pkg/printers/internalversion/printers_test.go index 28a3ca2678d..172bb81714a 100644 --- a/pkg/printers/internalversion/printers_test.go +++ b/pkg/printers/internalversion/printers_test.go @@ -1596,9 +1596,11 @@ func TestPrintDaemonSet(t *testing.T) { CurrentNumberScheduled: 2, DesiredNumberScheduled: 3, NumberReady: 1, + UpdatedNumberScheduled: 2, + NumberAvailable: 0, }, }, - "test1\t3\t2\t1\t\t0s\n", + "test1\t3\t2\t1\t2\t0\t\t0s\n", }, }