pkg: Replace OperatorFailing with OperatorDegraded

Catching up with openshift/api@8e476cb732 (Create a new ClusterStatusCondition Degraded, 2019-04-16, openshift/api#287) and openshift/api@a9fb3b1629 (Remove ClusterStatusConditionType Failing, 2019-04-16, openshift/api#287).
openshift · Apr 23, 2019 · 1cbcb4d · 1cbcb4d
1 parent 843c843
commit 1cbcb4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/pkg/clusteroperator/clusteroperator.go b/pkg/clusteroperator/clusteroperator.go
@@ -84,7 +84,7 @@ func (s *StatusHandler) Update(condtype configapiv1.ClusterStatusConditionType,
  LastTransitionTime: metaapi.Now(),
  },
  {
- Type: configapiv1.OperatorFailing,
+ Type: configapiv1.OperatorDegraded,
  Status: configapiv1.ConditionUnknown,
  LastTransitionTime: metaapi.Now(),
  },

diff --git a/pkg/operator/status.go b/pkg/operator/status.go
@@ -92,18 +92,18 @@ func (c *Controller) setStatusRemoving(cr *imageregistryv1.Config) {
 }
 
 func (c *Controller) setStatusRemoveFailed(cr *imageregistryv1.Config, removeErr error) {
- operatorFailing := clusteroperator.ConditionState{
+ operatorDegraded := clusteroperator.ConditionState{
  Status: configapiv1.ConditionTrue,
  Message: fmt.Sprintf("Unable to remove registry: %s", removeErr),
  Reason: "RemoveFailed",
  }
 
- err := c.clusterStatus.Update(configapiv1.OperatorFailing, operatorFailing, "")
+ err := c.clusterStatus.Update(configapiv1.OperatorDegraded, operatorDegraded, "")
  if err != nil {
- glog.Errorf("unable to update cluster status to %s=%s: %s", configapiv1.OperatorFailing, configapiv1.ConditionTrue, err)
+ glog.Errorf("unable to update cluster status to %s=%s: %s", configapiv1.OperatorDegraded, configapiv1.ConditionTrue, err)
  }
 
- updateCondition(cr, operatorapiv1.OperatorStatusTypeFailing, operatorFailing)
+ updateCondition(cr, operatorapiv1.OperatorStatusTypeDegraded, operatorDegraded)
 }
 
 func (c *Controller) syncStatus(cr *imageregistryv1.Config, deploy *appsapi.Deployment, applyError error, removed bool) {
@@ -190,23 +190,23 @@ func (c *Controller) syncStatus(cr *imageregistryv1.Config, deploy *appsapi.Depl
 
  updateCondition(cr, operatorapiv1.OperatorStatusTypeProgressing, operatorProgressing)
 
- operatorFailing := clusteroperator.ConditionState{
+ operatorDegraded := clusteroperator.ConditionState{
  Status: configapiv1.ConditionFalse,
  Message: "",
  Reason: "",
  }
  if e, ok := applyError.(permanentError); ok {
- operatorFailing.Status = configapiv1.ConditionTrue
- operatorFailing.Message = applyError.Error()
- operatorFailing.Reason = e.Reason
+ operatorDegraded.Status = configapiv1.ConditionTrue
+ operatorDegraded.Message = applyError.Error()
+ operatorDegraded.Reason = e.Reason
  }
 
- err = c.clusterStatus.Update(configapiv1.OperatorFailing, operatorFailing, "")
+ err = c.clusterStatus.Update(configapiv1.OperatorDegraded, operatorDegraded, "")
  if err != nil {
- glog.Errorf("unable to update cluster status to %s=%s (%s): %s", configapiv1.OperatorFailing, operatorFailing.Status, operatorFailing.Message, err)
+ glog.Errorf("unable to update cluster status to %s=%s (%s): %s", configapiv1.OperatorDegraded, operatorDegraded.Status, operatorDegraded.Message, err)
  }
 
- updateCondition(cr, operatorapiv1.OperatorStatusTypeFailing, operatorFailing)
+ updateCondition(cr, operatorapiv1.OperatorStatusTypeDegraded, operatorDegraded)
 
  operatorRemoved := clusteroperator.ConditionState{
  Status: configapiv1.ConditionFalse,