Merge pull request #823 from ecordell/update-cvo-libs

chore(cvo): update openshift/api so that OperatorFailing is changed to OperatorDegraded

Author: ecordell

go.mod

@@ -30,7 +30,7 @@ require (
 	github.com/json-iterator/go v1.1.6 // indirect
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.0.2
 	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/openshift/api v3.9.1-0.20190401220125-3a6077f1f910+incompatible
+	github.com/openshift/api v3.9.1-0.20190424152011-77b8897ec79a+incompatible
 	github.com/openshift/client-go v0.0.0-20190401163519-84c2b942258a
 	github.com/operator-framework/operator-registry v1.1.0
 	github.com/pkg/errors v0.8.1
@@ -55,7 +55,7 @@ require (
 	k8s.io/klog v0.2.0 // indirect
 	k8s.io/kube-aggregator v0.0.0-20190221095344-e77f03c95d65
 	k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c
-	k8s.io/kubernetes v1.12.7
+	k8s.io/kubernetes v1.12.8
 	k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
 )
 

go.sum

@@ -194,8 +194,8 @@ github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
-github.com/openshift/api v3.9.1-0.20190401220125-3a6077f1f910+incompatible h1:+zV+RS3R2qcEQJ707Ala/t7dl8PjUIGCSTiUxLCBSEo=
-github.com/openshift/api v3.9.1-0.20190401220125-3a6077f1f910+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
+github.com/openshift/api v3.9.1-0.20190424152011-77b8897ec79a+incompatible h1:q2JBuObKafI7B4Eli6eLd+2T5JsU9ioWZ82zQwyjJPg=
+github.com/openshift/api v3.9.1-0.20190424152011-77b8897ec79a+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
 github.com/openshift/client-go v0.0.0-20190401163519-84c2b942258a h1:2t89qt9TR5koRb55cdTMM3NOMP238eHNeUnZ7uihHSA=
 github.com/openshift/client-go v0.0.0-20190401163519-84c2b942258a/go.mod h1:6rzn+JTr7+WYS2E1TExP4gByoABxMznR6y2SnUIkmxk=
 github.com/operator-framework/go-appr v0.0.0-20180917210448-f2aef88446f2/go.mod h1:YNzwUx1i6C4dXWcffyq3yaIb0rh/K8/OvQ4vG0SNlSw=
@@ -382,8 +382,8 @@ k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d h1:mn2F9UzCk6KGa7M/d2ibLy
 k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
 k8s.io/kubernetes v1.11.7-beta.0.0.20181219023948-b875d52ea96d/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 k8s.io/kubernetes v1.11.8-beta.0.0.20190124204751-3a10094374f2/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
-k8s.io/kubernetes v1.12.7 h1:gm45V16s8YbTBg7NApIdYMtFjY7Bib3eDUyoBtW/AqQ=
-k8s.io/kubernetes v1.12.7/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
+k8s.io/kubernetes v1.12.8 h1:HPJalm9oRobwrLC76RnZRT4zFBRA8Mgv7cgLZN0CG8U=
+k8s.io/kubernetes v1.12.8/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 h1:8r+l4bNWjRlsFYlQJnKJ2p7s1YQPj4XyXiJVqDHRx7c=
 k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
 sigs.k8s.io/controller-runtime v0.1.10/go.mod h1:HFAYoOh6XMV+jKF1UjFwrknPbowfyHEHHRdJMf2jMX8=

pkg/lib/operatorstatus/status.go

@@ -88,7 +88,7 @@ func MonitorClusterStatus(name string, syncCh chan error, stopCh <-chan struct{}
 							LastTransitionTime: metav1.Now(),
 						},
 						{
-							Type:               configv1.OperatorFailing,
+							Type:               configv1.OperatorDegraded,
 							Status:             configv1.ConditionFalse,
 							LastTransitionTime: metav1.Now(),
 						},
@@ -126,7 +126,7 @@ func MonitorClusterStatus(name string, syncCh chan error, stopCh <-chan struct{}
 		switch {
 		case successfulSyncs > 0:
 			setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
-				Type:   configv1.OperatorFailing,
+				Type:   configv1.OperatorDegraded,
 				Status: configv1.ConditionFalse,
 			})
 			setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
@@ -163,7 +163,7 @@ func MonitorClusterStatus(name string, syncCh chan error, stopCh <-chan struct{}
 			}
 		default:
 			setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
-				Type:    configv1.OperatorFailing,
+				Type:    configv1.OperatorDegraded,
 				Status:  configv1.ConditionTrue,
 				Message: "Waiting for updates to take effect",
 			})