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

Correctly sync deployment image #123

Merged
merged 1 commit into from
Feb 6, 2019
Merged

Correctly sync deployment image #123

merged 1 commit into from
Feb 6, 2019

Conversation

spadgett
Copy link
Member

@spadgett spadgett commented Feb 4, 2019 •
edited

Simplify SyncDeployment and use deployment annotations to force a rollout when the console image changes.

@benjaminapetersen @enj

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 4, 2019
@spadgett spadgett force-pushed the deploy-sync branch 2 times, most recently from ed78f9e to 8a5128b Compare February 4, 2019 21:51
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 4, 2019
@spadgett spadgett force-pushed the deploy-sync branch 3 times, most recently from bab163d to 8148985 Compare February 4, 2019 22:28
@spadgett
Copy link
Member Author

spadgett commented Feb 5, 2019

/retest

jhadvig
jhadvig reviewed Feb 5, 2019
View reviewed changes
Copy link
Member

@jhadvig jhadvig left a comment

Choose a reason for hiding this comment

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

PR looks good 👍 just some nits & a question :)
Also I really like how the deployment sync got simplified.

pkg/console/subresource/deployment/deployment_test.go Show resolved Hide resolved
pkg/console/subresource/route/route_test.go Show resolved Hide resolved
pkg/console/subresource/secret/secret_test.go Show resolved Hide resolved
pkg/console/subresource/secret/secret_test.go Show resolved Hide resolved
pkg/console/subresource/util/util_test.go Show resolved Hide resolved
@spadgett
Copy link
Member Author

spadgett commented Feb 5, 2019

@jhadvig I think for the unit tests we specifically don't want to use SharedLabels(). This way we test that SharedLabels() is generating expected values.

@jhadvig
Copy link
Member

jhadvig commented Feb 5, 2019

ohh.. if the SharedLabels() are just for assertion then scratch my comments.

@benjaminapetersen
Copy link
Contributor

Still WIP? Tests pass, def simpler.
We dont have test coverage to ensure a new deployment on changes. I should add that to the todo list.

@spadgett
Correctly sync deployment image
2a822c2 
Simplify `SyncDeployment` and use deployment annotations to force a
rollout when the console image changes.
@spadgett spadgett changed the title [WIP] Correctly sync deployment pod template Correctly sync deployment image Feb 5, 2019
@spadgett
Copy link
Member Author

spadgett commented Feb 5, 2019

@jhadvig @benjaminapetersen thanks, this is ready now

jhadvig
jhadvig approved these changes Feb 5, 2019
View reviewed changes
Copy link
Member

@jhadvig jhadvig left a comment

Choose a reason for hiding this comment

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

Changes look good. Let's wait for prow to for the status so we can merge.

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, 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:

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

@benjaminapetersen
Copy link
Contributor

/retest

not much happening with statuses.

@benjaminapetersen
Copy link
Contributor

lgtm if ci gets happy...

@openshift-bot
Copy link
Contributor

/retest

2 similar comments
@spadgett
Copy link
Member Author

spadgett commented Feb 6, 2019

/retest

@spadgett
Copy link
Member Author

spadgett commented Feb 6, 2019

/retest

@spadgett spadgett added the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2019
@spadgett
Copy link
Member Author

spadgett commented Feb 6, 2019

/retest

@spadgett spadgett mentioned this pull request Feb 6, 2019
Closed
@spadgett
Copy link
Member Author

spadgett commented Feb 6, 2019

/retest

1 similar comment
@spadgett
Copy link
Member Author

spadgett commented Feb 6, 2019

/retest

benjaminapetersen
benjaminapetersen reviewed Feb 6, 2019
View reviewed changes
pkg/console/operator/sync_v400.go
return nil, false, updateErr
}
return updatedDeployment, depChanged, nil
expectedGeneration := getDeploymentGeneration(co)
Copy link
Contributor

Choose a reason for hiding this comment

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

So we still have work to do here, with generation, per our conversation. Should we comment to track, or assume a fast follow?

Copy link
Member Author

Choose a reason for hiding this comment

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

Let's open a JIRA issue

@benjaminapetersen
Copy link
Contributor

/retest

3 similar comments
@benjaminapetersen
Copy link
Contributor

/retest

@spadgett
Copy link
Member Author

spadgett commented Feb 6, 2019

/retest

@spadgett
Copy link
Member Author

spadgett commented Feb 6, 2019

/retest

@openshift-merge-robot openshift-merge-robot merged commit c179141 into openshift:master Feb 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benjaminapetersen benjaminapetersen benjaminapetersen left review comments

@jhadvig jhadvig jhadvig approved these changes

Assignees
No one assigned
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@spadgett @jhadvig @benjaminapetersen @openshift-ci-robot @openshift-bot @openshift-merge-robot