Merge pull request #789 from dmage/nodeca-progressing

Bug 2093440: Add progressing condition for node-ca daemon set

Author: openshift-merge-robot

pkg/operator/nodecadaemon.go

@@ -100,14 +100,26 @@ func (c *NodeCADaemonController) sync() error {
 		Status: operatorv1.ConditionUnknown,
 	}
 
+	progressingCondition := operatorv1.OperatorCondition{
+		Type:   "NodeCADaemonProgressing",
+		Status: operatorv1.ConditionUnknown,
+	}
+
 	dsObj, err := gen.Get()
 	if errors.IsNotFound(err) {
 		availableCondition.Status = operatorv1.ConditionFalse
 		availableCondition.Reason = "NotFound"
 		availableCondition.Message = "The daemon set node-ca does not exist"
+
+		progressingCondition.Status = operatorv1.ConditionTrue
+		progressingCondition.Reason = "NotFound"
+		progressingCondition.Message = "The daemon set node-ca does not exist"
 	} else if err != nil {
 		availableCondition.Reason = "Unknown"
 		availableCondition.Message = fmt.Sprintf("Unable to check daemon set availability: %s", err)
+
+		progressingCondition.Reason = "Unknown"
+		progressingCondition.Message = fmt.Sprintf("Unable to check daemon set progress: %s", err)
 	} else {
 		ds := dsObj.(*appsv1.DaemonSet)
 		if ds.Status.NumberAvailable > 0 {
@@ -119,6 +131,20 @@ func (c *NodeCADaemonController) sync() error {
 			availableCondition.Reason = "NoAvailableReplicas"
 			availableCondition.Message = "The daemon set node-ca does not have available replicas"
 		}
+
+		if ds.Generation != ds.Status.ObservedGeneration {
+			progressingCondition.Status = operatorv1.ConditionTrue
+			progressingCondition.Reason = "Progressing"
+			progressingCondition.Message = "The daemon set node-ca is updating node pods"
+		} else if ds.Status.NumberUnavailable > 0 {
+			progressingCondition.Status = operatorv1.ConditionTrue
+			progressingCondition.Reason = "Unavailable"
+			progressingCondition.Message = "The daemon set node-ca is deploying node pods"
+		} else {
+			progressingCondition.Status = operatorv1.ConditionFalse
+			progressingCondition.Reason = "AsExpected"
+			progressingCondition.Message = "The daemon set node-ca is deployed"
+		}
 	}
 
 	err = resource.ApplyMutator(gen)
@@ -127,6 +153,7 @@ func (c *NodeCADaemonController) sync() error {
 			ctx,
 			c.operatorClient,
 			v1helpers.UpdateConditionFn(availableCondition),
+			v1helpers.UpdateConditionFn(progressingCondition),
 			v1helpers.UpdateConditionFn(operatorv1.OperatorCondition{
 				Type:    "NodeCADaemonControllerDegraded",
 				Status:  operatorv1.ConditionTrue,
@@ -141,6 +168,7 @@ func (c *NodeCADaemonController) sync() error {
 		ctx,
 		c.operatorClient,
 		v1helpers.UpdateConditionFn(availableCondition),
+		v1helpers.UpdateConditionFn(progressingCondition),
 		v1helpers.UpdateConditionFn(operatorv1.OperatorCondition{
 			Type:   "NodeCADaemonControllerDegraded",
 			Status: operatorv1.ConditionFalse,