Using patch/apply on update pods. #2074

mbobrovskyi · 2024-04-26T08:51:20Z

What type of PR is this?

/kind bug
/kind feature

What this PR does / why we need it:

Using patch/apply on update pods.

Which issue(s) this PR fixes:

Fixes #2056

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Pod Integration: Use PATCH updates for pods. This fixes support for Pods when using the latest features in Kubernetes v1.29

k8s-ci-robot · 2024-04-26T08:51:29Z

Hi @mbobrovskyi. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

netlify · 2024-04-26T08:51:39Z

✅ Deploy Preview for kubernetes-sigs-kueue ready!

Name	Link
🔨 Latest commit	`f96e2eb`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/662b6b0aaae7b000089ad1ed
😎 Deploy Preview	https://deploy-preview-2074--kubernetes-sigs-kueue.netlify.app
📱 Preview on mobile	Toggle 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 · 2024-04-26T08:54:55Z

/ok-to-test

trasc · 2024-04-26T08:55:05Z

/test all

mbobrovskyi · 2024-04-26T15:25:05Z

/cc @alculquicondor

alculquicondor · 2024-04-26T15:59:13Z

pkg/util/client/client.go

+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+func CreatePatch(before, after client.Object) (client.Patch, error) {


can you remove the similar function in the workload package?

You mean this one dddbf3d? I didn't found it.

oh sorry, @gabesaba just experimented with it but we didn't merge it :)

alculquicondor · 2024-04-26T16:10:27Z

/lgtm
/approve
/retest

k8s-ci-robot · 2024-04-26T16:10:33Z

LGTM label has been added.

Git tree hash: dcff22d9687f8cb0ff1dd34a8f2b2aa4d8e8797f

k8s-ci-robot · 2024-04-26T16:10:35Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

~~pkg/controller/OWNERS~~ [alculquicondor]
~~pkg/util/OWNERS~~ [alculquicondor]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

alculquicondor · 2024-04-26T16:52:05Z

/release-note-edit
/kind bug

Use PATCH updates for pods. This fixes support for Pods when using the latest features in Kubernetes v1.29

tenzen-y · 2024-04-26T16:54:44Z

@alculquicondor Could we cherry pick this to 0.6?

alculquicondor · 2024-04-26T17:14:56Z

/cherry-pick release-0.6

k8s-infra-cherrypick-robot · 2024-04-26T17:15:31Z

@alculquicondor: #2074 failed to apply on top of branch "release-0.6":

Applying: Using patch/apply on update pods.
Using index info to reconstruct a base tree...
M	pkg/controller/jobs/pod/pod_controller.go
M	pkg/controller/jobs/pod/pod_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/jobs/pod/pod_controller_test.go
CONFLICT (content): Merge conflict in pkg/controller/jobs/pod/pod_controller_test.go
Auto-merging pkg/controller/jobs/pod/pod_controller.go
CONFLICT (content): Merge conflict in pkg/controller/jobs/pod/pod_controller.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 Using patch/apply on update pods.
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/test-infra repository.

tenzen-y · 2024-04-26T17:19:03Z

@mbobrovskyi Could you submit a cherry pick PR manually? This cherrypicker would be helpful: https://github.com/kubernetes-sigs/kueue/blob/main/hack/cherry_pick_pull.sh

) * Using patch/apply on update pods. * Removed TestReconciler_DeletePodAfterTransientErrorsOnUpdateOrDeleteOps.

alculquicondor · 2024-05-30T14:10:13Z

/release-note-edit

Pod Integration: Use PATCH updates for pods. This fixes support for Pods when using the latest features in Kubernetes v1.29

alculquicondor · 2024-05-30T14:10:28Z

/remove-kind feature

Using patch/apply on update pods.

f96e2eb

k8s-ci-robot requested review from denkensk and trasc April 26, 2024 08:51

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 26, 2024

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 26, 2024

mbobrovskyi mentioned this pull request Apr 26, 2024

REQUEST: New membership for mbobrovskyi kubernetes/org#4915

Closed

11 tasks

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 26, 2024

mbobrovskyi marked this pull request as ready for review April 26, 2024 15:24

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 26, 2024

k8s-ci-robot requested a review from kerthcet April 26, 2024 15:24

k8s-ci-robot requested a review from alculquicondor April 26, 2024 15:25

alculquicondor reviewed Apr 26, 2024

View reviewed changes

k8s-ci-robot assigned alculquicondor Apr 26, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 26, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 26, 2024

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 26, 2024

k8s-ci-robot merged commit 6516ada into kubernetes-sigs:main Apr 26, 2024
15 checks passed

k8s-ci-robot added this to the v0.7 milestone Apr 26, 2024

mbobrovskyi mentioned this pull request Apr 29, 2024

Automated cherry pick of #2074: Using patch/apply on update pods. #2089

Merged

k8s-ci-robot pushed a commit that referenced this pull request Apr 30, 2024

Automated cherry pick of #2074: Using patch/apply on update pods. (#2089

a9a4b54

) * Using patch/apply on update pods. * Removed TestReconciler_DeletePodAfterTransientErrorsOnUpdateOrDeleteOps.

mbobrovskyi deleted the fix/ungating-pods-should-use-patch-or-apply-instead-of-update branch May 6, 2024 09:53

k8s-ci-robot removed the kind/feature Categorizes issue or PR as related to a new feature. label May 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Using patch/apply on update pods. #2074

Using patch/apply on update pods. #2074

mbobrovskyi commented Apr 26, 2024 •

edited by k8s-ci-robot

Loading

k8s-ci-robot commented Apr 26, 2024

netlify bot commented Apr 26, 2024 •

edited

Loading

trasc commented Apr 26, 2024

trasc commented Apr 26, 2024

mbobrovskyi commented Apr 26, 2024

alculquicondor Apr 26, 2024

mbobrovskyi Apr 26, 2024

alculquicondor Apr 26, 2024

alculquicondor commented Apr 26, 2024

k8s-ci-robot commented Apr 26, 2024

k8s-ci-robot commented Apr 26, 2024

alculquicondor commented Apr 26, 2024

tenzen-y commented Apr 26, 2024

alculquicondor commented Apr 26, 2024

k8s-infra-cherrypick-robot commented Apr 26, 2024

tenzen-y commented Apr 26, 2024

alculquicondor commented May 30, 2024

alculquicondor commented May 30, 2024

Using patch/apply on update pods. #2074

Using patch/apply on update pods. #2074

Conversation

mbobrovskyi commented Apr 26, 2024 • edited by k8s-ci-robot Loading

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

k8s-ci-robot commented Apr 26, 2024

netlify bot commented Apr 26, 2024 • edited Loading

✅ Deploy Preview for kubernetes-sigs-kueue ready!

trasc commented Apr 26, 2024

trasc commented Apr 26, 2024

mbobrovskyi commented Apr 26, 2024

alculquicondor Apr 26, 2024

Choose a reason for hiding this comment

mbobrovskyi Apr 26, 2024

Choose a reason for hiding this comment

alculquicondor Apr 26, 2024

Choose a reason for hiding this comment

alculquicondor commented Apr 26, 2024

k8s-ci-robot commented Apr 26, 2024

k8s-ci-robot commented Apr 26, 2024

alculquicondor commented Apr 26, 2024

tenzen-y commented Apr 26, 2024

alculquicondor commented Apr 26, 2024

k8s-infra-cherrypick-robot commented Apr 26, 2024

tenzen-y commented Apr 26, 2024

alculquicondor commented May 30, 2024

alculquicondor commented May 30, 2024

mbobrovskyi commented Apr 26, 2024 •

edited by k8s-ci-robot

Loading

netlify bot commented Apr 26, 2024 •

edited

Loading