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

[workload] Allow specifying PodSetUpdates for a subset of PodSets #2265

Merged

Conversation

trasc
Copy link
Contributor

@trasc trasc commented May 23, 2024

What type of PR is this?

/kind bug

What this PR does / why we need it:

Allow an admission check controller to provide podSetUpdates for a podSet subset when needed.

Which issue(s) this PR fixes:

Fixes #2260

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fix support for MPIJobs when using a ProvisioningRequest engine that applies updates only to worker templates.

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. labels May 23, 2024
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 23, 2024
Copy link

netlify bot commented May 23, 2024

Deploy Preview for kubernetes-sigs-kueue ready!

Name Link
🔨 Latest commit e961250
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/6654250cd416790008f9c84a
😎 Deploy Preview https://deploy-preview-2265--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.

@trasc
Copy link
Contributor Author

trasc commented May 23, 2024

/assign @alculquicondor

@trasc trasc changed the title [workload] Allow specifying PodSetUpdates for subset of PodSets [workload] Allow specifying PodSetUpdates for a subset of PodSets May 23, 2024
@alculquicondor
Copy link
Contributor

/approve
/hold for nits

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 24, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alculquicondor, trasc

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 May 24, 2024
@alculquicondor
Copy link
Contributor

/release-note-edit

Fix support for MPIJobs when using a ProvisioningRequest engine that applies updates only to worker templates.

@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 May 24, 2024
@trasc trasc force-pushed the specify-podsetupdates-for-subset branch from c93b093 to e961250 Compare May 27, 2024 06:15
@mimowo
Copy link
Contributor

mimowo commented May 27, 2024

/lgtm
/hold cancel
I believe all comments are addressed. If there are some remaining improvements we can follow up.

@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 May 27, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 27, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 909d211236f73193915a9084b5e2e63186db885c

@k8s-ci-robot k8s-ci-robot merged commit ca102ce into kubernetes-sigs:main May 27, 2024
15 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v0.7 milestone May 27, 2024
@tenzen-y
Copy link
Member

/cherry-pick release-0.6

@k8s-infra-cherrypick-robot

@tenzen-y: #2265 failed to apply on top of branch "release-0.6":

Applying: Allow specifying PodSetUpdates for subset of PodSets
Using index info to reconstruct a base tree...
M	pkg/webhooks/workload_webhook.go
M	pkg/webhooks/workload_webhook_test.go
M	test/integration/controller/jobs/mpijob/mpijob_controller_test.go
M	test/integration/webhook/workload_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/integration/webhook/workload_test.go
CONFLICT (content): Merge conflict in test/integration/webhook/workload_test.go
Auto-merging test/integration/controller/jobs/mpijob/mpijob_controller_test.go
Auto-merging pkg/webhooks/workload_webhook_test.go
Auto-merging pkg/webhooks/workload_webhook.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Allow specifying PodSetUpdates for subset of PodSets
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-0.6

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.

@tenzen-y
Copy link
Member

@trasc Could you create a cherry-pick PR?

@trasc trasc deleted the specify-podsetupdates-for-subset branch May 27, 2024 07:46
k8s-ci-robot pushed a commit that referenced this pull request May 27, 2024
…ates for a subset of PodSets (#2281)

* Allow specifying PodSetUpdates for subset of PodSets

* Review remarks
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MPIJobs can't run with ProvisioningRequest with DWS
6 participants