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

Fix vSphere anti-affinity #1779

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Fix vSphere anti-affinity #1779

merged 1 commit into from
Apr 23, 2024

Conversation

ahmedwaleedmalik
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik commented Apr 22, 2024 •
edited
Loading

What this PR does / why we need it:
Fixes concurrency issues with the vSphere anti-affinity feature. I've also added an E2E test to properly test the feature.

Which issue(s) this PR fixes:

Fixes #1774

What type of PR is this?

/kind bug

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

vSphere: fix anti-affinity DRS configuration for VMs

Documentation:

NONE

@ahmedwaleedmalik ahmedwaleedmalik self-assigned this Apr 22, 2024
@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. do-not-merge/docs-needed Indicates that a PR should not merge because it's missing one of the documentation labels. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 22, 2024
@kubermatic-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubermatic-bot kubermatic-bot added sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 22, 2024
@ahmedwaleedmalik ahmedwaleedmalik marked this pull request as ready for review April 22, 2024 15:49
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 22, 2024
@ahmedwaleedmalik ahmedwaleedmalik changed the title Fix vSphere anti-affinity WIP: Fix vSphere anti-affinity Apr 22, 2024
@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. docs/none Denotes a PR that doesn't need documentation (changes). and removed do-not-merge/docs-needed Indicates that a PR should not merge because it's missing one of the documentation labels. labels Apr 22, 2024
@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 23, 2024
@kubermatic-bot kubermatic-bot 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 Apr 23, 2024
@ahmedwaleedmalik
Fix vSphere anti-affinity
c186e92 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik
Copy link
Member Author

/test pull-machine-controller-e2e-vsphere-anti-affinity

@ahmedwaleedmalik ahmedwaleedmalik changed the title WIP: Fix vSphere anti-affinity Fix vSphere anti-affinity Apr 23, 2024
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 23, 2024
@ahmedwaleedmalik
Copy link
Member Author

@xrstf pull-machine-controller-e2e-vsphere will fail because of the rocky linux issue #1777 (comment)

@ahmedwaleedmalik
Copy link
Member Author

/cherry-pick release/v1.59

@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: once the present PR merges, I will cherry-pick it on top of release/v1.59 in a new PR and assign it to you.

In response to this:

/cherry-pick release/v1.59

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.

@ahmedwaleedmalik
Copy link
Member Author

/cherry-pick release/v1.58

@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: once the present PR merges, I will cherry-pick it on top of release/v1.58 in a new PR and assign it to you.

In response to this:

/cherry-pick release/v1.58

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.

@ahmedwaleedmalik
Copy link
Member Author

/cherry-pick release/v1.57

@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: once the present PR merges, I will cherry-pick it on top of release/v1.57 in a new PR and assign it to you.

In response to this:

/cherry-pick release/v1.57

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.

@xrstf
Copy link
Contributor

xrstf commented Apr 23, 2024

/override pull-machine-controller-e2e-vsphere

@kubermatic-bot
Copy link
Contributor

@xrstf: Overrode contexts on behalf of xrstf: pull-machine-controller-e2e-vsphere

In response to this:

/override pull-machine-controller-e2e-vsphere

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.

@kron4eg
Copy link
Member

kron4eg commented Apr 23, 2024

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Apr 23, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: d1329ebf99b3625bc748c641fe72fee23244b1d3

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 23, 2024
@kubermatic-bot kubermatic-bot merged commit eaccda7 into kubermatic:main Apr 23, 2024
15 checks passed
@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: #1779 failed to apply on top of branch "release/v1.59":

Applying: Fix vSphere anti-affinity
Using index info to reconstruct a base tree...
M	.prow/provider-vsphere.yaml
M	pkg/cloudprovider/provider/vsphere/helper.go
M	pkg/cloudprovider/provider/vsphere/provider.go
M	pkg/cloudprovider/provider/vsphere/rule.go
M	test/e2e/provisioning/all_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/provisioning/all_e2e_test.go
Auto-merging pkg/cloudprovider/provider/vsphere/rule.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/provider/vsphere/rule.go
Auto-merging pkg/cloudprovider/provider/vsphere/provider.go
Auto-merging pkg/cloudprovider/provider/vsphere/helper.go
Auto-merging .prow/provider-vsphere.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix vSphere 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/v1.59

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.

@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: #1779 failed to apply on top of branch "release/v1.58":

Applying: Fix vSphere anti-affinity
Using index info to reconstruct a base tree...
M	.prow/provider-vsphere.yaml
M	pkg/cloudprovider/provider/vsphere/helper.go
M	pkg/cloudprovider/provider/vsphere/provider.go
M	pkg/cloudprovider/provider/vsphere/rule.go
M	test/e2e/provisioning/all_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/provisioning/all_e2e_test.go
Auto-merging pkg/cloudprovider/provider/vsphere/rule.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/provider/vsphere/rule.go
Auto-merging pkg/cloudprovider/provider/vsphere/provider.go
Auto-merging pkg/cloudprovider/provider/vsphere/helper.go
Auto-merging .prow/provider-vsphere.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix vSphere 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/v1.58

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.

@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: #1779 failed to apply on top of branch "release/v1.57":

Applying: Fix vSphere anti-affinity
Using index info to reconstruct a base tree...
M	.prow/provider-vsphere.yaml
M	pkg/cloudprovider/provider/vsphere/helper.go
M	pkg/cloudprovider/provider/vsphere/provider.go
M	pkg/cloudprovider/provider/vsphere/rule.go
M	test/e2e/provisioning/all_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/provisioning/all_e2e_test.go
Auto-merging pkg/cloudprovider/provider/vsphere/rule.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/provider/vsphere/rule.go
Auto-merging pkg/cloudprovider/provider/vsphere/provider.go
Auto-merging pkg/cloudprovider/provider/vsphere/helper.go
Auto-merging .prow/provider-vsphere.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix vSphere 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/v1.57

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.

@ahmedwaleedmalik ahmedwaleedmalik deleted the vsphere-anti-affinity branch April 23, 2024 16:47
ahmedwaleedmalik added a commit to ahmedwaleedmalik/machine-controller that referenced this pull request Apr 26, 2024
@ahmedwaleedmalik
Fix vSphere anti-affinity (kubermatic#1779)
9fae5fc 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik ahmedwaleedmalik mentioned this pull request Apr 26, 2024
Merged
ahmedwaleedmalik added a commit to ahmedwaleedmalik/machine-controller that referenced this pull request Apr 26, 2024
@ahmedwaleedmalik
Fix vSphere anti-affinity (kubermatic#1779)
e2769c8 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik ahmedwaleedmalik mentioned this pull request Apr 26, 2024
Merged
ahmedwaleedmalik added a commit to ahmedwaleedmalik/machine-controller that referenced this pull request Apr 26, 2024
@ahmedwaleedmalik
Fix vSphere anti-affinity (kubermatic#1779)
c0bca51 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik ahmedwaleedmalik mentioned this pull request Apr 26, 2024
Merged
kubermatic-bot pushed a commit that referenced this pull request Apr 26, 2024
@ahmedwaleedmalik
[release/v1.59] Fix vSphere anti-affinity (#1781)
a84f383 
* Fix vSphere anti-affinity (#1779)

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>

* Update image for vsphere anti-affinity prow job

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>

---------

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
kubermatic-bot pushed a commit that referenced this pull request Apr 26, 2024
@ahmedwaleedmalik
[release/v1.57] Fix vSphere anti-affinity (#1783)
7f39570 
* Fix vSphere anti-affinity (#1779)

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>

* Fixes

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>

---------

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
kubermatic-bot pushed a commit that referenced this pull request Apr 26, 2024
@ahmedwaleedmalik
[release/v1.58] Fix vSphere anti-affinity (#1782)
9901f63 
* Fix vSphere anti-affinity (#1779)

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>

* Fix tests

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>

---------

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kron4eg kron4eg Awaiting requested review from kron4eg

Assignees

@kron4eg kron4eg

@ahmedwaleedmalik ahmedwaleedmalik

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. 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.

vSphere machine deployment with anti-affinity keeps recreating nodes
4 participants
@ahmedwaleedmalik @kubermatic-bot @xrstf @kron4eg