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

TAS: Respect node taints if the lowest level is node #3678

Merged
merged 1 commit into from
Nov 28, 2024

Conversation

mimowo
Copy link
Contributor

@mimowo mimowo commented Nov 28, 2024

What type of PR is this?

/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes:

Part of #3658

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Respect node taints in Topology-Aware Scheduling when the lowest topology level is kubernetes.io/hostname.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 28, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 28, 2024
Copy link

netlify bot commented Nov 28, 2024

Deploy Preview for kubernetes-sigs-kueue canceled.

Name Link
🔨 Latest commit e345655
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/67488075c393d2000746d9df

Copy link
Contributor Author

@mimowo mimowo left a comment

Choose a reason for hiding this comment

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

/assign @PBundyra

@mimowo
Copy link
Contributor Author

mimowo commented Nov 28, 2024

cc @tenzen-y

@mimowo mimowo force-pushed the tas-respect-taints branch 2 times, most recently from c5e2f19 to 9d2ce84 Compare November 28, 2024 11:08
@mimowo
Copy link
Contributor Author

mimowo commented Nov 28, 2024

rebased after #3676

@mimowo mimowo force-pushed the tas-respect-taints branch 2 times, most recently from 74b129a to c7d282d Compare November 28, 2024 12:57
@mimowo mimowo force-pushed the tas-respect-taints branch 2 times, most recently from ed9a0e3 to aa83015 Compare November 28, 2024 13:30
@PBundyra
Copy link
Contributor

Thank you
/lgtm
/hold to address nits

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Nov 28, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 9dca769ed8fda7ba5eddfebb81c2e15e5a5c5a8e

# Conflicts:
#	pkg/cache/tas_flavor_snapshot.go
@mimowo mimowo force-pushed the tas-respect-taints branch from aa83015 to e345655 Compare November 28, 2024 14:38
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 28, 2024
@PBundyra
Copy link
Contributor

/lgtm

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

LGTM label has been added.

Git tree hash: d2233ab5b468a118929be7f68bf51f7bd2d82efa

@mimowo
Copy link
Contributor Author

mimowo commented Nov 28, 2024

/hold cancel
as the nits are addressed

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 28, 2024
@k8s-ci-robot k8s-ci-robot merged commit 60f85d7 into kubernetes-sigs:main Nov 28, 2024
17 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v0.10 milestone Nov 28, 2024
@mimowo mimowo deleted the tas-respect-taints branch January 21, 2025 11:26
@tenzen-y
Copy link
Member

/cherry-pick release-0.9

Prepare for #4322

@k8s-infra-cherrypick-robot
Copy link
Contributor

@tenzen-y: #3678 failed to apply on top of branch "release-0.9":

Applying: TAS: Respect node taints if the lowest level is node
Using index info to reconstruct a base tree...
M	pkg/cache/tas_cache_test.go
M	pkg/cache/tas_flavor_snapshot.go
M	test/integration/tas/tas_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/integration/tas/tas_test.go
Auto-merging pkg/cache/tas_flavor_snapshot.go
CONFLICT (content): Merge conflict in pkg/cache/tas_flavor_snapshot.go
Auto-merging pkg/cache/tas_cache_test.go
CONFLICT (content): Merge conflict in pkg/cache/tas_cache_test.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 TAS: Respect node taints if the lowest level is node

In response to this:

/cherry-pick release-0.9

Prepare for #4322

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.

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/feature Categorizes issue or PR as related to a new feature. 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.

5 participants