Merge pull request #114 from wking/condition-reason

openshift-merge-robot · web-flow · commit adbcca38d8a7 · 2020-06-03T04:56:28.000+02:00
pkg/controller/status/status: Set reasons for conditions
diff --git a/docs/insights-archive-sample/config/clusteroperator/insights b/docs/insights-archive-sample/config/clusteroperator/insights
@@ -15,22 +15,26 @@
       {
         "type": "Degraded",
         "status": "False",
+        "reason": "AsExpected",
         "lastTransitionTime": "2020-03-18T12:14:52Z"
       },
       {
         "type": "Available",
         "status": "True",
+        "reason": "AsExpected",
         "lastTransitionTime": "2020-03-18T12:14:52Z"
       },
       {
         "type": "Progressing",
         "status": "False",
         "lastTransitionTime": "2020-03-18T12:16:52Z",
+        "reason": "AsExpected",
         "message": "Monitoring the cluster"
       },
       {
         "type": "Disabled",
         "status": "False",
+        "reason": "AsExpected",
         "lastTransitionTime": "2020-03-18T12:16:52Z"
       }
     ],
diff --git a/pkg/controller/status/status.go b/pkg/controller/status/status.go
@@ -221,6 +221,7 @@ func (c *Controller) merge(existing *configv1.ClusterOperator) *configv1.Cluster
 			setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
 				Type:   configv1.OperatorDegraded,
 				Status: configv1.ConditionFalse,
+				Reason: "AsExpected",
 			})
 		}
 
@@ -237,6 +238,7 @@ func (c *Controller) merge(existing *configv1.ClusterOperator) *configv1.Cluster
 			setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
 				Type:   OperatorDisabled,
 				Status: configv1.ConditionFalse,
+				Reason: "AsExpected",
 			})
 		}
 
@@ -253,6 +255,7 @@ func (c *Controller) merge(existing *configv1.ClusterOperator) *configv1.Cluster
 			setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
 				Type:   configv1.OperatorDegraded,
 				Status: configv1.ConditionFalse,
+				Reason: "AsExpected",
 			})
 		}
 
@@ -273,6 +276,7 @@ func (c *Controller) merge(existing *configv1.ClusterOperator) *configv1.Cluster
 	setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
 		Type:   configv1.OperatorAvailable,
 		Status: configv1.ConditionTrue,
+		Reason: "AsExpected",
 	})
 
 	// update the Progressing condition with a summary of the current state
@@ -285,6 +289,7 @@ func (c *Controller) merge(existing *configv1.ClusterOperator) *configv1.Cluster
 			setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
 				Type:    configv1.OperatorProgressing,
 				Status:  configv1.ConditionTrue,
+				Reason:  "Initializing",
 				Message: "Initializing the operator",
 			})
 		}
@@ -294,6 +299,7 @@ func (c *Controller) merge(existing *configv1.ClusterOperator) *configv1.Cluster
 		setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
 			Type:    configv1.OperatorProgressing,
 			Status:  configv1.ConditionFalse,
+			Reason:  "Degraded",
 			Message: "An error has occurred",
 		})
 
@@ -312,6 +318,7 @@ func (c *Controller) merge(existing *configv1.ClusterOperator) *configv1.Cluster
 		setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
 			Type:    configv1.OperatorProgressing,
 			Status:  configv1.ConditionFalse,
+			Reason:  "AsExpected",
 			Message: "Monitoring the cluster",
 		})
 	}
diff --git a/pkg/gather/clusterconfig/testdata/clusteroperators.json b/pkg/gather/clusterconfig/testdata/clusteroperators.json
@@ -837,22 +837,26 @@
                     {
                         "type": "Degraded",
                         "status": "False",
+                        "reason": "AsExpected",
                         "lastTransitionTime": "2020-04-17T12:12:48Z"
                     },
                     {
                         "type": "Available",
                         "status": "True",
+                        "reason": "AsExpected",
                         "lastTransitionTime": "2020-04-17T12:12:48Z"
                     },
                     {
                         "type": "Progressing",
                         "status": "False",
+                        "reason": "AsExpected",
                         "lastTransitionTime": "2020-04-17T12:14:48Z",
                         "message": "Monitoring the cluster"
                     },
                     {
                         "type": "Disabled",
                         "status": "False",
+                        "reason": "AsExpected",
                         "lastTransitionTime": "2020-04-17T12:14:48Z"
                     }
                 ],

Original file line number	Diff line number	Diff line change
`@@ -15,22 +15,26 @@`
`15`	`15`	`{`
`16`	`16`	`"type": "Degraded",`
`17`	`17`	`"status": "False",`
	`18`	`+ "reason": "AsExpected",`
`18`	`19`	`"lastTransitionTime": "2020-03-18T12:14:52Z"`
`19`	`20`	`},`
`20`	`21`	`{`
`21`	`22`	`"type": "Available",`
`22`	`23`	`"status": "True",`
	`24`	`+ "reason": "AsExpected",`
`23`	`25`	`"lastTransitionTime": "2020-03-18T12:14:52Z"`
`24`	`26`	`},`
`25`	`27`	`{`
`26`	`28`	`"type": "Progressing",`
`27`	`29`	`"status": "False",`
`28`	`30`	`"lastTransitionTime": "2020-03-18T12:16:52Z",`
	`31`	`+ "reason": "AsExpected",`
`29`	`32`	`"message": "Monitoring the cluster"`
`30`	`33`	`},`
`31`	`34`	`{`
`32`	`35`	`"type": "Disabled",`
`33`	`36`	`"status": "False",`
	`37`	`+ "reason": "AsExpected",`
`34`	`38`	`"lastTransitionTime": "2020-03-18T12:16:52Z"`
`35`	`39`	`}`
`36`	`40`	`],`
Original file line number	Diff line number	Diff line change
`@@ -837,22 +837,26 @@`
`837`	`837`	`{`
`838`	`838`	`"type": "Degraded",`
`839`	`839`	`"status": "False",`
	`840`	`+ "reason": "AsExpected",`
`840`	`841`	`"lastTransitionTime": "2020-04-17T12:12:48Z"`
`841`	`842`	`},`
`842`	`843`	`{`
`843`	`844`	`"type": "Available",`
`844`	`845`	`"status": "True",`
	`846`	`+ "reason": "AsExpected",`
`845`	`847`	`"lastTransitionTime": "2020-04-17T12:12:48Z"`
`846`	`848`	`},`
`847`	`849`	`{`
`848`	`850`	`"type": "Progressing",`
`849`	`851`	`"status": "False",`
	`852`	`+ "reason": "AsExpected",`
`850`	`853`	`"lastTransitionTime": "2020-04-17T12:14:48Z",`
`851`	`854`	`"message": "Monitoring the cluster"`
`852`	`855`	`},`
`853`	`856`	`{`
`854`	`857`	`"type": "Disabled",`
`855`	`858`	`"status": "False",`
	`859`	`+ "reason": "AsExpected",`
`856`	`860`	`"lastTransitionTime": "2020-04-17T12:14:48Z"`
`857`	`861`	`}`
`858`	`862`	`],`