mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #42843 from janetkuo/ds-status-kubectl
Automatic merge from submit-queue Add new DaemonSetStatus to kubectl printer and describer @kargakis @lukaszo @kubernetes/sig-apps-pr-reviews @kubernetes/sig-cli-pr-reviews ```release-note Add new DaemonSet status fields to kubectl printer and describer. ```
This commit is contained in:
commit
c38717b73a
@ -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)
|
||||
|
@ -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 {
|
||||
|
@ -1596,9 +1596,11 @@ func TestPrintDaemonSet(t *testing.T) {
|
||||
CurrentNumberScheduled: 2,
|
||||
DesiredNumberScheduled: 3,
|
||||
NumberReady: 1,
|
||||
UpdatedNumberScheduled: 2,
|
||||
NumberAvailable: 0,
|
||||
},
|
||||
},
|
||||
"test1\t3\t2\t1\t<none>\t0s\n",
|
||||
"test1\t3\t2\t1\t2\t0\t<none>\t0s\n",
|
||||
},
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user