Skip to content

React to degraded condition change and bump API so upgrade can handle Force #22644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smarterclayton merged 3 commits into from
Apr 24, 2019
Merged

React to degraded condition change and bump API so upgrade can handle Force #22644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2170503
bump(*): Pick up latest openshift/api
smarterclayton Apr 24, 2019
d86f37b
React to degraded condition change
smarterclayton Apr 24, 2019
63130eb
Add route.spec.subdomain to internal and regenerate
smarterclayton Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 44 additions & 35 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ import:
- package: k8s.io/kube-openapi
repo: https://github.com/openshift/kube-openapi.git
version: origin-4.0-kubernetes-master-d7c86cd # bumped to match k8s version we've had and then additionally with changes for openapi CRD (we should pick that back around k8s 1.14)
- package: k8s.io/klog
Copy link
Copy Markdown
Contributor

@soltysh soltysh Apr 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

version: 8139d8cb77af419532b33dfa7dd09fbc5f1d344f # recent klog bump broke glog flags test in k8s.io/apiserver, pin
- package: github.com/coreos/etcd
version: v3.3.10
- package: google.golang.org/grpc
Expand Down
10 changes: 8 additions & 2 deletions pkg/monitor/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ func startClusterOperatorMonitoring(ctx context.Context, m Recorder, client conf
msg = fmt.Sprintf("changed %s to %s", s.Type, s.Status)
}
level := Warning
if s.Type == configv1.OperatorFailing && s.Status == configv1.ConditionTrue {
if s.Type == configv1.OperatorDegraded && s.Status == configv1.ConditionTrue {
level = Error
}
if s.Type == configv1.ClusterStatusConditionType("Failing") && s.Status == configv1.ConditionTrue {
level = Error
}
conditions = append(conditions, Condition{
Expand Down Expand Up @@ -188,7 +191,10 @@ func startClusterOperatorMonitoring(ctx context.Context, m Recorder, client conf
msg = fmt.Sprintf("changed %s to %s", s.Type, s.Status)
}
level := Warning
if s.Type == configv1.OperatorFailing && s.Status == configv1.ConditionTrue {
if s.Type == configv1.OperatorDegraded && s.Status == configv1.ConditionTrue {
level = Error
}
if s.Type == configv1.ClusterStatusConditionType("Failing") && s.Status == configv1.ConditionTrue {
level = Error
}
conditions = append(conditions, Condition{
Expand Down
4 changes: 2 additions & 2 deletions pkg/oc/cli/admin/upgrade/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func (o *Options) Run() error {
return nil

default:
if c := findCondition(cv.Status.Conditions, configv1.OperatorFailing); c != nil && c.Status == configv1.ConditionTrue {
if c := findCondition(cv.Status.Conditions, configv1.OperatorDegraded); c != nil && c.Status == configv1.ConditionTrue {
prefix := "No upgrade is possible due to an error"
if c := findCondition(cv.Status.Conditions, configv1.OperatorProgressing); c != nil && c.Status == configv1.ConditionTrue && len(c.Message) > 0 {
prefix = c.Message
Expand Down Expand Up @@ -380,7 +380,7 @@ func checkForUpgrade(cv *configv1.ClusterVersion) error {
if c := findCondition(cv.Status.Conditions, "Invalid"); c != nil && c.Status == configv1.ConditionTrue {
return fmt.Errorf("The cluster version object is invalid, you must correct the invalid state first.\n\n Reason: %s\n Message: %s\n\n", c.Reason, c.Message)
}
if c := findCondition(cv.Status.Conditions, configv1.OperatorFailing); c != nil && c.Status == configv1.ConditionTrue {
if c := findCondition(cv.Status.Conditions, configv1.OperatorDegraded); c != nil && c.Status == configv1.ConditionTrue {
return fmt.Errorf("The cluster is experiencing an upgrade-blocking error, use --force to upgrade anyway.\n\n Reason: %s\n Message: %s\n\n", c.Reason, c.Message)
}
if c := findCondition(cv.Status.Conditions, configv1.OperatorProgressing); c != nil && c.Status == configv1.ConditionTrue {
Expand Down
Loading