github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

revise meaning of DaemonsSpecStatus.CurrentNumberScheduled

pull/6/head
Mike Danese 2015-10-07 09:49:28 -07:00
parent 1769c1c34b
commit e5fe0c0c6e
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/experimental/types.go
View File

@ -313,7 +313,7 @@ type DaemonSetSpec struct {
// DaemonSetStatus represents the current status of a daemon set.
type DaemonSetStatus struct {
// CurrentNumberScheduled is the number of nodes that are running exactly 1
// CurrentNumberScheduled is the number of nodes that are running at least 1
// daemon pod and are supposed to run the daemon pod.
CurrentNumberScheduled int `json:"currentNumberScheduled"`

2
pkg/apis/experimental/v1alpha1/types.go
View File

@ -312,7 +312,7 @@ type DaemonSetSpec struct {
// DaemonSetStatus represents the current status of a daemon set.
type DaemonSetStatus struct {
// CurrentNumberScheduled is the number of nodes that are running exactly 1
// CurrentNumberScheduled is the number of nodes that are running at least 1
// daemon pod and are supposed to run the daemon pod.
// More info: http://releases.k8s.io/HEAD/docs/admin/daemon.md
CurrentNumberScheduled int `json:"currentNumberScheduled"`

2
pkg/apis/experimental/v1alpha1/types_swagger_doc_generated.go
View File

@ -99,7 +99,7 @@ func (DaemonSetSpec) SwaggerDoc() map[string]string {
var map_DaemonSetStatus = map[string]string{
"": "DaemonSetStatus represents the current status of a daemon set.",
"currentNumberScheduled": "CurrentNumberScheduled is the number of nodes that are running exactly 1 daemon pod and are supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemon.md",
"currentNumberScheduled": "CurrentNumberScheduled is the number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemon.md",
"numberMisscheduled": "NumberMisscheduled is the number of nodes that are running the daemon pod, but are not supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemon.md",
"desiredNumberScheduled": "DesiredNumberScheduled is the total number of nodes that should be running the daemon pod (including nodes correctly running the daemon pod). More info: http://releases.k8s.io/HEAD/docs/admin/daemon.md",
}

5
pkg/controller/daemon/controller.go
View File

@ -452,10 +452,7 @@ func (dsc *DaemonSetsController) updateDaemonSetStatus(ds *experimental.DaemonSe
numDaemonPods := len(nodeToDaemonPods[node.Name])
// TODO(mikedanese): this does not count nodes that should be running
// exactly one daemon pod but are running more than one daemon pods.
if shouldRun && numDaemonPods == 1 {
if shouldRun && numDaemonPods > 0 {
currentNumberScheduled++
}