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

Volcano adapts to the k8s v1.30 #3556

Merged
merged 3 commits into from
Jul 8, 2024

Conversation

guoqinwill
Copy link
Contributor

@guoqinwill guoqinwill commented Jul 2, 2024

@volcano-sh-bot volcano-sh-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jul 2, 2024
@guoqinwill guoqinwill force-pushed the adapt-k8s1.30 branch 2 times, most recently from 96ecc38 to 921ab32 Compare July 2, 2024 13:23
@volcano-sh-bot volcano-sh-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 2, 2024
@guoqinwill guoqinwill force-pushed the adapt-k8s1.30 branch 7 times, most recently from 2361e24 to de6ff3a Compare July 5, 2024 10:42
@lowang-bh
Copy link
Member

It is better to squash 3534's commits.

@@ -19,6 +19,7 @@ package volumebinding
import (
"context"
"testing"
"volcano.sh/volcano/cmd/scheduler/app/options"
Copy link
Member

Choose a reason for hiding this comment

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

please sort imports.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@@ -2457,12 +2457,12 @@ func TestGetEligibleNodes(t *testing.T) {
eligibleNodes := testEnv.binder.GetEligibleNodes(logger, scenario.pvcs)

// Validate
if equality.Semantic.DeepEqual(scenario.eligibleNodes, eligibleNodes) {
if reflect.DeepEqual(scenario.eligibleNodes, eligibleNodes) {
Copy link
Member

Choose a reason for hiding this comment

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

Is this changed back to reflect.DeepEqual?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There was a deviation in conflict resolution and it has been fixed.

wangyysde and others added 2 commits July 8, 2024 14:53
Signed-off-by: wangyysde <net_use@bzhy.com>
Signed-off-by: guoqinwill <guoqinwill@163.com>
Signed-off-by: guoqinwill <guoqinwill@163.com>
@guoqinwill
Copy link
Contributor Author

It is better to squash 3534's commits.

done

@wangyang0616
Copy link
Member

/lgtm

@volcano-sh-bot volcano-sh-bot added the lgtm Indicates that a PR is ready to be merged. label Jul 8, 2024
Copy link
Member

@william-wang william-wang left a comment

Choose a reason for hiding this comment

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

/approve

@volcano-sh-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: william-wang

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

@volcano-sh-bot volcano-sh-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 8, 2024
@volcano-sh-bot volcano-sh-bot merged commit df27590 into volcano-sh:master Jul 8, 2024
14 checks passed
@wangyang0616 wangyang0616 mentioned this pull request Jul 26, 2024
@Monokaix Monokaix mentioned this pull request Oct 16, 2024
2 tasks
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. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Volcano support Kubernetes v1.30
6 participants