Skip to content

Commit b3f1869

Browse files
authored
Merge pull request #823 from ecordell/update-cvo-libs
chore(cvo): update openshift/api so that OperatorFailing is changed to OperatorDegraded
2 parents b8b77a1 + b955037 commit b3f1869

File tree

10 files changed

+59
-37
lines changed

10 files changed

+59
-37
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/json-iterator/go v1.1.6 // indirect
3131
github.com/maxbrunsfeld/counterfeiter/v6 v6.0.2
3232
github.com/onsi/ginkgo v1.8.0 // indirect
33-
github.com/openshift/api v3.9.1-0.20190401220125-3a6077f1f910+incompatible
33+
github.com/openshift/api v3.9.1-0.20190424152011-77b8897ec79a+incompatible
3434
github.com/openshift/client-go v0.0.0-20190401163519-84c2b942258a
3535
github.com/operator-framework/operator-registry v1.1.0
3636
github.com/pkg/errors v0.8.1
@@ -55,7 +55,7 @@ require (
5555
k8s.io/klog v0.2.0 // indirect
5656
k8s.io/kube-aggregator v0.0.0-20190221095344-e77f03c95d65
5757
k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c
58-
k8s.io/kubernetes v1.12.7
58+
k8s.io/kubernetes v1.12.8
5959
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
6060
)
6161

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
194194
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
195195
github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
196196
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
197-
github.com/openshift/api v3.9.1-0.20190401220125-3a6077f1f910+incompatible h1:+zV+RS3R2qcEQJ707Ala/t7dl8PjUIGCSTiUxLCBSEo=
198-
github.com/openshift/api v3.9.1-0.20190401220125-3a6077f1f910+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
197+
github.com/openshift/api v3.9.1-0.20190424152011-77b8897ec79a+incompatible h1:q2JBuObKafI7B4Eli6eLd+2T5JsU9ioWZ82zQwyjJPg=
198+
github.com/openshift/api v3.9.1-0.20190424152011-77b8897ec79a+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
199199
github.com/openshift/client-go v0.0.0-20190401163519-84c2b942258a h1:2t89qt9TR5koRb55cdTMM3NOMP238eHNeUnZ7uihHSA=
200200
github.com/openshift/client-go v0.0.0-20190401163519-84c2b942258a/go.mod h1:6rzn+JTr7+WYS2E1TExP4gByoABxMznR6y2SnUIkmxk=
201201
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
382382
k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
383383
k8s.io/kubernetes v1.11.7-beta.0.0.20181219023948-b875d52ea96d/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
384384
k8s.io/kubernetes v1.11.8-beta.0.0.20190124204751-3a10094374f2/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
385-
k8s.io/kubernetes v1.12.7 h1:gm45V16s8YbTBg7NApIdYMtFjY7Bib3eDUyoBtW/AqQ=
386-
k8s.io/kubernetes v1.12.7/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
385+
k8s.io/kubernetes v1.12.8 h1:HPJalm9oRobwrLC76RnZRT4zFBRA8Mgv7cgLZN0CG8U=
386+
k8s.io/kubernetes v1.12.8/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
387387
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 h1:8r+l4bNWjRlsFYlQJnKJ2p7s1YQPj4XyXiJVqDHRx7c=
388388
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
389389
sigs.k8s.io/controller-runtime v0.1.10/go.mod h1:HFAYoOh6XMV+jKF1UjFwrknPbowfyHEHHRdJMf2jMX8=

pkg/lib/operatorstatus/status.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func MonitorClusterStatus(name string, syncCh chan error, stopCh <-chan struct{}
8888
LastTransitionTime: metav1.Now(),
8989
},
9090
{
91-
Type: configv1.OperatorFailing,
91+
Type: configv1.OperatorDegraded,
9292
Status: configv1.ConditionFalse,
9393
LastTransitionTime: metav1.Now(),
9494
},
@@ -126,7 +126,7 @@ func MonitorClusterStatus(name string, syncCh chan error, stopCh <-chan struct{}
126126
switch {
127127
case successfulSyncs > 0:
128128
setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
129-
Type: configv1.OperatorFailing,
129+
Type: configv1.OperatorDegraded,
130130
Status: configv1.ConditionFalse,
131131
})
132132
setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
@@ -163,7 +163,7 @@ func MonitorClusterStatus(name string, syncCh chan error, stopCh <-chan struct{}
163163
}
164164
default:
165165
setOperatorStatusCondition(&existing.Status.Conditions, configv1.ClusterOperatorStatusCondition{
166-
Type: configv1.OperatorFailing,
166+
Type: configv1.OperatorDegraded,
167167
Status: configv1.ConditionTrue,
168168
Message: "Waiting for updates to take effect",
169169
})

vendor/github.com/openshift/api/config/v1/types_cluster_operator.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/config/v1/types_cluster_version.go

Lines changed: 17 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/config/v1/types_feature.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/config/v1/types_infrastructure.go

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/config/v1/types_scheduling.go

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go

Lines changed: 7 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)