From e5fe0c0c6eab2cf8efbbc4259e7254d74220d4fd Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Wed, 7 Oct 2015 09:49:28 -0700 Subject: [PATCH] revise meaning of DaemonsSpecStatus.CurrentNumberScheduled --- pkg/apis/experimental/types.go | 2 +- pkg/apis/experimental/v1alpha1/types.go | 2 +- .../experimental/v1alpha1/types_swagger_doc_generated.go | 2 +- pkg/controller/daemon/controller.go | 5 +---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkg/apis/experimental/types.go b/pkg/apis/experimental/types.go index 7db4d885dd..29578be03f 100644 --- a/pkg/apis/experimental/types.go +++ b/pkg/apis/experimental/types.go @@ -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"` diff --git a/pkg/apis/experimental/v1alpha1/types.go b/pkg/apis/experimental/v1alpha1/types.go index 9f702614af..aef00ad409 100644 --- a/pkg/apis/experimental/v1alpha1/types.go +++ b/pkg/apis/experimental/v1alpha1/types.go @@ -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"` diff --git a/pkg/apis/experimental/v1alpha1/types_swagger_doc_generated.go b/pkg/apis/experimental/v1alpha1/types_swagger_doc_generated.go index 775053d36a..f4b21eb904 100644 --- a/pkg/apis/experimental/v1alpha1/types_swagger_doc_generated.go +++ b/pkg/apis/experimental/v1alpha1/types_swagger_doc_generated.go @@ -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", } diff --git a/pkg/controller/daemon/controller.go b/pkg/controller/daemon/controller.go index 6bd8262f6a..de47033066 100644 --- a/pkg/controller/daemon/controller.go +++ b/pkg/controller/daemon/controller.go @@ -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++ }