-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Conversation
96ecc38
to
921ab32
Compare
2361e24
to
de6ff3a
Compare
It is better to squash 3534's commits. |
@@ -19,6 +19,7 @@ package volumebinding | |||
import ( | |||
"context" | |||
"testing" | |||
"volcano.sh/volcano/cmd/scheduler/app/options" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please sort imports.
There was a problem hiding this comment.
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) { |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
Signed-off-by: wangyysde <net_use@bzhy.com>
Signed-off-by: guoqinwill <guoqinwill@163.com>
Signed-off-by: guoqinwill <guoqinwill@163.com>
done |
/lgtm |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/approve
[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 |
Fix #3523
cherry pick and update:https://github.com/volcano-sh/volcano/pull/3534/commits