From 8e476cb7322e59919cbb6482fd076ec5a214df25 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Tue, 16 Apr 2019 19:40:32 -0400 Subject: [PATCH 1/2] Create a new ClusterStatusCondition Degraded This is used to indicate what we used to call 'Failing'. It was very odd to see that your service was available, but also failing. But it would be normal for your service to be available and degraded. --- config/v1/types_cluster_operator.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/v1/types_cluster_operator.go b/config/v1/types_cluster_operator.go index b5cbd222ef2..6adb4fc1516 100644 --- a/config/v1/types_cluster_operator.go +++ b/config/v1/types_cluster_operator.go @@ -127,11 +127,14 @@ const ( // operator (eg: openshift-apiserver for the openshift-apiserver-operator). OperatorProgressing ClusterStatusConditionType = "Progressing" - // Failing indicates that the operator has encountered an error that is preventing it from working properly. - // The binary maintained by the operator (eg: openshift-apiserver for the openshift-apiserver-operator) may still be - // available, but the user intent cannot be fulfilled. + // OperatorFailing is DEPRECATED OperatorFailing ClusterStatusConditionType = "Failing" + // Degraded indicates that the operand is not functioning completely. An example of a degraded state + // would be if there should be 5 copies of the operand running but only 4 are running. It may still be available, + // but it is degraded + OperatorDegraded ClusterStatusConditionType = "Degraded" + // Upgradeable indicates whether the operator is in a state that is safe to upgrade. When status is `False` // administrators should not upgrade their cluster and the message field should contain a human readable description // of what the administrator should do to allow the operator to successfully update. A missing condition, True, From a9fb3b1629b23b3198c3d94017fc63430afcf6cc Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Tue, 16 Apr 2019 19:53:38 -0400 Subject: [PATCH 2/2] Remove ClusterStatusConditionType Failing --- config/v1/types_cluster_operator.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/v1/types_cluster_operator.go b/config/v1/types_cluster_operator.go index 6adb4fc1516..8508b5cd07b 100644 --- a/config/v1/types_cluster_operator.go +++ b/config/v1/types_cluster_operator.go @@ -127,9 +127,6 @@ const ( // operator (eg: openshift-apiserver for the openshift-apiserver-operator). OperatorProgressing ClusterStatusConditionType = "Progressing" - // OperatorFailing is DEPRECATED - OperatorFailing ClusterStatusConditionType = "Failing" - // Degraded indicates that the operand is not functioning completely. An example of a degraded state // would be if there should be 5 copies of the operand running but only 4 are running. It may still be available, // but it is degraded