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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Apr 30, 2024
Merged

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

merged 2 commits into from
Apr 30, 2024

Conversation

mbobrovskyi
Copy link
Contributor

@mbobrovskyi mbobrovskyi commented Apr 29, 2024 •
edited by k8s-ci-robot

Cherry pick of #2074 on release-0.6.
#2074: Using patch/apply on update pods.
For details on the cherry pick process, see the cherry pick requests page.

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

@k8s-ci-robot k8s-ci-robot added this to the v0.6 milestone Apr 29, 2024
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 29, 2024
@k8s-ci-robot
Copy link
Contributor

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 29, 2024
@netlify Netlify
Copy link

netlify bot commented Apr 29, 2024 •
edited

✅ Deploy Preview for kubernetes-sigs-kueue canceled.

Name Link
🔨 Latest commit 49d3262
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/662f9caf514a7c0008ca23cf

@mbobrovskyi
Copy link
Contributor Author

/assign @tenzen-y @alculquicondor

@IrvingMg
Copy link
Contributor

/ok-to-test

@k8s-ci-robot 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 29, 2024
@tenzen-y
Copy link
Member

/release-note-edit

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

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Apr 29, 2024
tenzen-y
tenzen-y reviewed Apr 29, 2024
View reviewed changes
pkg/controller/jobs/pod/pod_controller_test.go Outdated
@@ -3569,3 +3569,126 @@ func TestGetWorkloadNameForPod(t *testing.T) {
t.Errorf("Expected different workload name\n want: %s\n got: %s", wantWlName, wlName)
}
}

func TestReconciler_DeletePodAfterTransientErrorsOnUpdateOrDeleteOps(t *testing.T) {
Copy link
Member

Choose a reason for hiding this comment

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

To avoid these conflicts, I will cherry-pick #1721 to release-0.6.

Copy link
Member

Choose a reason for hiding this comment

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

@mbobrovskyi Could you rebase this PR to the top of release-0.6 after #2090 is merged?

Copy link
Member

Choose a reason for hiding this comment

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

Uhm, the TestReconciler_DeletePodAfterTransientErrorsOnUpdateOrDeleteOps could not be performed in the release-0.6 branch without this PR. (#2090)

So, could we just drop the TestReconciler_DeletePodAfterTransientErrorsOnUpdateOrDeleteOps from this cherry-pick PR?
@alculquicondor WDYT?

Copy link
Contributor Author

@mbobrovskyi mbobrovskyi Apr 29, 2024 •
edited

Choose a reason for hiding this comment

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

Yes, sure. I will remove it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@alculquicondor WDYT?

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm ok with removing the test.

/approve

@tenzen-y anything to add?

Copy link
Member

Choose a reason for hiding this comment

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

Everything looks good to me.
Thanks!
/lgtm

This was referenced Apr 29, 2024
Merged
Closed
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 29, 2024
@k8s-ci-robot
Copy link
Contributor

[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:

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

LGTM label has been added.

Git tree hash: 726847edfa891dc892e9b69ceb9ae2c0fa55c101

@k8s-ci-robot k8s-ci-robot merged commit a9a4b54 into kubernetes-sigs:release-0.6 Apr 30, 2024
13 checks passed
@tenzen-y tenzen-y mentioned this pull request May 4, 2024
Merged
@mbobrovskyi mbobrovskyi deleted the automated-cherry-pick-of-#2074-upstream-release-0.6 branch May 6, 2024 09:53
@alculquicondor
Copy link
Contributor

/kind bug

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tenzen-y tenzen-y tenzen-y left review comments

@alculquicondor alculquicondor Awaiting requested review from alculquicondor

@mimowo mimowo Awaiting requested review from mimowo

Assignees

@alculquicondor alculquicondor

@tenzen-y tenzen-y

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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
Milestone
v0.6
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mbobrovskyi @k8s-ci-robot @IrvingMg @tenzen-y @alculquicondor