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.

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

Bug 1975379: Only use kubernetes.io/hostname for workload anti-affinity #566

Merged
merged 1 commit into from Jul 16, 2021

Conversation

jhadvig
Copy link
Member

@jhadvig jhadvig commented Jul 15, 2021

No description provided.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 15, 2021
@openshift-ci openshift-ci bot requested review from bparees and spadgett July 15, 2021 14:48
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 15, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 15, 2021

@jhadvig: This pull request references Bugzilla bug 1975379, 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.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @yanpzhan

In response to this:

[WIP] Bug 1975379: Have timezone as soft requirement for pod antiaffinity

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 openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jul 15, 2021
@openshift-ci openshift-ci bot requested a review from yanpzhan July 15, 2021 14:48
Copy link
Member

@mandre mandre left a comment

Choose a reason for hiding this comment

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

This fixes deployment on OpenStack. Please fix the unit tests and let's merge ASAP.

@jhadvig jhadvig changed the title [WIP] Bug 1975379: Have timezone as soft requirement for pod antiaffinity Bug 1975379: Have timezone as soft requirement for pod antiaffinity Jul 15, 2021
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 15, 2021
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.

Code LGTM, but we need to fix the unit tests

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.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2021
Copy link

@mdbooth mdbooth left a comment

Choose a reason for hiding this comment

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

I don't want it to hold up this patch, but the use of timezone in the subject confused me! It's an availability zone/failure domain.

@spadgett
Copy link
Member

spadgett commented Jul 15, 2021

Yeah I noticed that too. It really should be availability zone not timezone.

@mdbooth
Copy link

mdbooth commented Jul 15, 2021

I would suggest that we should actually entirely remove topology from the scheduling requirements here. From the original bug report:

It seems like console pods sometimes are scheduled to run on the same master node.
This cause issues for our customers by not be able to reach console during certain times while we patch our cluster.
How can we force console pods to not run on same master nodes?

The only requirement here is that the console is not impacted during cluster upgrades, which is covered by kubernetes.io/hostname. The topology.kubernetes.io labels are intended for user workloads where you want to, e.g. spread critical workloads across your cloud provider's failure domain (physical host/rack/dc; it's actually not well defined what they mean). For the OpenShift control plane we do this by scheduling the control plane VMs appropriately, so individual control plane services shouldn't be second guessing that.

My immediate priority, though, is to un-break the OpenStack jobs, so if that's landing this patch then land away! However, I recommend you remove this entirely. We also need to get our CI voting here!

@spadgett
Copy link
Member

/hold

It's late for @jhadvig, but I can push an update to change the commit message and remove the topology.kubernetes.io labels if you are able to review @mdbooth @mandre

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 15, 2021
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2021
@spadgett spadgett changed the title Bug 1975379: Have timezone as soft requirement for pod antiaffinity Bug 1975379: Only use kubernetes.io/hostname for workload anti-affinity Jul 15, 2021
@spadgett
Copy link
Member

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 15, 2021
@spadgett
Copy link
Member

Updated, @mdbooth PTAL

@spadgett
Copy link
Member

/retest

@mandre
Copy link
Member

mandre commented Jul 15, 2021

Thanks for updating the patch. I personally didn't have major concerns for the soft anti-affinity for availability zones, however the commit message bothered me a bit. Glad it's now fixed. Let's unblock openstack CI.
/lgtm
/retest

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2021
@jhadvig
Copy link
Member Author

jhadvig commented Jul 16, 2021

/test e2e-agnostic-upgrade

Copy link
Member Author

@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.

@spadgett thanks for updating the PR 👍

Copy link

@mdbooth mdbooth left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 16, 2021

[APPROVALNOTIFIER] This PR is APPROVED

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

@mandre
Copy link
Member

mandre commented Jul 16, 2021

/retest

@mdbooth
Copy link

mdbooth commented Jul 16, 2021

/retest-required

@openshift-merge-robot openshift-merge-robot merged commit a7aa71d into openshift:master Jul 16, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 16, 2021

@jhadvig: All pull requests linked via external trackers have merged:

Bugzilla bug 1975379 has been moved to the MODIFIED state.

In response to this:

Bug 1975379: Only use kubernetes.io/hostname for workload anti-affinity

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.

@jhadvig
Copy link
Member Author

jhadvig commented Sep 13, 2021

/cherry-pick release-4.8

@openshift-cherrypick-robot

@jhadvig: #566 failed to apply on top of branch "release-4.8":

Applying: Bug 1975379: Only use `kubernetes.io/hostname` for workload anti-affinity
Using index info to reconstruct a base tree...
M	pkg/console/subresource/deployment/deployment.go
M	pkg/console/subresource/deployment/deployment_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/console/subresource/deployment/deployment_test.go
CONFLICT (content): Merge conflict in pkg/console/subresource/deployment/deployment_test.go
Auto-merging pkg/console/subresource/deployment/deployment.go
CONFLICT (content): Merge conflict in pkg/console/subresource/deployment/deployment.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1975379: Only use `kubernetes.io/hostname` for workload anti-affinity
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.8

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/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants