Skip to content
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

Jump to bottom

Bug 1686133: Fix operator availability to include route availability check #169

Merged
merged 1 commit into from
Mar 8, 2019
Merged

Bug 1686133: Fix operator availability to include route availability check #169

merged 1 commit into from
Mar 8, 2019

Conversation

benjaminapetersen
Copy link
Contributor

Bug 1686133

The console should be available when one pod is available and the route has been accepted. For the console, this means that the route ingress that matches Route.Spec.Host should have an Admitted condition of true.

(link 1686133)

@spadgett
@deads2k

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 7, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 7, 2019
@benjaminapetersen
Copy link
Contributor Author

/retest

1 leaderelection.go:249] failed to renew lease kube-system/kube-scheduler: failed to tryAcquireOrRenew context deadline exceeded\nE0307 20:18:16.056866 1 server.go:207] lost master\nlost lease\n"

spadgett
spadgett reviewed Mar 8, 2019
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

Thanks @benjaminapetersen. The existing progressing logic looks a little off to me, too, but ok to fix in a follow on.

pkg/console/subresource/route/route.go Outdated Show resolved Hide resolved
@benjaminapetersen benjaminapetersen force-pushed the bug/1686133/available-condition-update branch from 252610f to 0a4aad1 Compare March 8, 2019 02:56
@benjaminapetersen
Copy link
Contributor Author

@spadgett I think progressing needs a touch as well, I'll follow with a couple more tweaks.

@spadgett spadgett changed the title Fix operator availability to include route availability check Bug 1686133: Fix operator availability to include route availability check Mar 8, 2019
spadgett
spadgett approved these changes Mar 8, 2019
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

thanks @benjaminapetersen, let's get this fix in and continue to improve this in follow up PRs

/lgtm

pkg/console/subresource/route/route.go

// for the purpose of availability, we simply need to know when the
// route has been admitted.
func IsAdmitted(route *routev1.Route) bool {
Copy link
Member

Choose a reason for hiding this comment

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

consider some unit tests for this func

Copy link
Contributor Author

@benjaminapetersen benjaminapetersen Mar 8, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Completely agree.

#170

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 8, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benjaminapetersen, spadgett

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [benjaminapetersen,spadgett]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 627d6c8 into openshift:master Mar 8, 2019
@benjaminapetersen benjaminapetersen deleted the bug/1686133/available-condition-update branch March 8, 2019 15:13
wking added a commit to wking/console-operator that referenced this pull request Apr 17, 2019
@wking
pkg/console/subresource/deployment: Fix "avalable" -> "available" typo
7d34491 
From 0a4aad1 (Fix operator availability to include route
availability check, 2019-03-07, openshift#169).
@wking wking mentioned this pull request Apr 17, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spadgett spadgett spadgett approved these changes

@enj enj Awaiting requested review from enj

Assignees

@spadgett spadgett

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@benjaminapetersen @openshift-ci-robot @spadgett @openshift-merge-robot