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

[release-0.10] Fix: TAS assignment error #3970

Conversation

k8s-infra-cherrypick-robot
Copy link
Contributor

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot commented Jan 14, 2025

This is an automated cherry-pick of #3937

/assign mimowo

Fix building TAS assignments for workloads with multiple PodSets (eg. JobSet or kubeflow Jobs). The assignment was computed independently for the PodSets which could result in conflicts rendering the pods unschedulable by the kube-scheduler.

/cherrypick release-0.9

Signed-off-by: kerthcet <[email protected]>
Signed-off-by: kerthcet <[email protected]>
Signed-off-by: kerthcet <[email protected]>
@k8s-ci-robot k8s-ci-robot added this to the v0.10 milestone Jan 14, 2025
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 14, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 14, 2025
Copy link

netlify bot commented Jan 14, 2025

Deploy Preview for kubernetes-sigs-kueue ready!

Name Link
🔨 Latest commit 4d1cb57
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/6786843455d49f0008355ba7
😎 Deploy Preview https://deploy-preview-3970--kubernetes-sigs-kueue.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@mimowo
Copy link
Contributor

mimowo commented Jan 14, 2025

/kind bug

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Jan 14, 2025
@mimowo
Copy link
Contributor

mimowo commented Jan 14, 2025

/release-note-edit

Fix building TAS assignments for workloads with multiple PodSets (eg. JobSet or kubeflow Jobs). The assignment was computed independently for the PodSets which could result in conflicts rendering the pods unschedulable by the kube-scheduler.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jan 14, 2025
@mimowo
Copy link
Contributor

mimowo commented Jan 14, 2025

/release-note-edit

Fix building TAS assignments for workloads with multiple PodSets (eg. JobSet or kubeflow Jobs). The assignment was computed independently for the PodSets which could result in conflicts rendering the pods unschedulable by the kube-scheduler.

@mimowo
Copy link
Contributor

mimowo commented Jan 14, 2025

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 14, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 763ffd4eab734bbfe345134b48feea28c5b402e8

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: k8s-infra-cherrypick-robot, mimowo

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 14, 2025
@k8s-ci-robot k8s-ci-robot merged commit e0b277d into kubernetes-sigs:release-0.10 Jan 14, 2025
16 checks passed
@k8s-infra-cherrypick-robot
Copy link
Contributor Author

@k8s-infra-cherrypick-robot: #3970 failed to apply on top of branch "release-0.9":

Applying: Fix: TAS assignment error
Using index info to reconstruct a base tree...
M	pkg/cache/tas_flavor_snapshot.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cache/tas_flavor_snapshot.go
CONFLICT (content): Merge conflict in pkg/cache/tas_flavor_snapshot.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fix: TAS assignment error

In response to this:

This is an automated cherry-pick of #3937

/assign mimowo

Fix building TAS assignments for workloads with multiple PodSets (eg. JobSet or kubeflow Jobs). The assignment was computed independently for the PodSets which could result in conflicts rendering the pods unschedulable by the kube-scheduler.

/cherrypick release-0.9

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-sigs/prow repository.

@mimowo
Copy link
Contributor

mimowo commented Jan 14, 2025

@kerthcet can we apply the fix for 0.9?

@kerthcet
Copy link
Contributor

See #3972

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants