Skip to content

Conversation

@Miciah
Copy link
Contributor

@Miciah Miciah commented Nov 4, 2019

When updating a router deployment, check whether the deployment strategy is changing; if it is, update the affinity policy first, and only update the deployment strategy once all pods have the new affinity policy.

This two-step migration is necessary because an old affinity policy may have an anti-affinity rule that prohibits colocation of pods belonging to the same ingresscontroller, the new deployment strategy may require surge, and the presence of pods with the old affinity policy would block a rolling update using the new deployment strategy.

Follow-up to #280.

  • pkg/operator/controller/ingress/deployment.go (updateRouterDeployment): If the deployment strategy is changing, make sure to update the affinity policy first.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Nov 4, 2019
@openshift-ci-robot
Copy link
Contributor

@Miciah: This pull request references Bugzilla bug 1766851, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Bug 1766851: Add migration for affinity and deployment strategy

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 4, 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 Nov 4, 2019
@Miciah
Copy link
Contributor Author

Miciah commented Nov 4, 2019

Provisioning errors.
/test e2e-aws
/test e2e-aws-upgrade

@Miciah
Copy link
Contributor Author

Miciah commented Nov 4, 2019

Works in manual testing.

@ironcladlou
Copy link
Contributor

Tricky one, thanks!

/lgtm

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

danehans commented Nov 5, 2019

openshift/origin#24085 should have fixed the test flake.

/test e2e-aws

When updating a router deployment, check whether the deployment strategy is
changing; if it is, update the affinity policy first, and only update the
deployment strategy once all pods have the new affinity policy.

This two-step migration is necessary because an old affinity policy may
have an anti-affinity rule that prohibits colocation of pods belonging to
the same ingresscontroller, the new deployment strategy may require surge,
and the presence of pods with the old affinity policy would block a rolling
update using the new deployment strategy.

Follow-up to commit 0f6fd1c.

This commit fixes bug 1766851.

https://bugzilla.redhat.com/show_bug.cgi?id=1766851

* pkg/operator/controller/ingress/deployment.go (updateRouterDeployment):
If the deployment strategy is changing, make sure to update the affinity
policy first.
@Miciah Miciah force-pushed the BZ1766851-add-migration-for-affinity-and-deployment-strategy branch from 50fcaf9 to c31f498 Compare November 5, 2019 19:07
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 5, 2019
@ironcladlou
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ironcladlou, Miciah

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

The pull request process is described here

Details 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

@openshift-merge-robot openshift-merge-robot merged commit df6c45e into openshift:master Nov 5, 2019
@openshift-ci-robot
Copy link
Contributor

@Miciah: All pull requests linked via external trackers have merged. Bugzilla bug 1766851 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1766851: Add migration for affinity and deployment strategy

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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

Development

Successfully merging this pull request may close these issues.

5 participants