Skip to content

Conversation

@carlory
Copy link
Member

@carlory carlory commented Jan 7, 2025

@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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 7, 2025
@k8s-ci-robot k8s-ci-robot added language/en Issues or PRs related to English language size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 7, 2025
@netlify
Copy link

netlify bot commented Jan 7, 2025

👷 Deploy Preview for kubernetes-io-vnext-staging processing.

Name Link
🔨 Latest commit 00fc123
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/6822a58f0ab12100085005cf

@netlify
Copy link

netlify bot commented Jan 7, 2025

Pull request preview available for checking

Built without sensitive environment variables

Name Link
🔨 Latest commit 00fc123
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/6822a58fb0d3c500086279be
😎 Deploy Preview https://deploy-preview-49315--kubernetes-io-main-staging.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.

@Shubham82
Copy link
Contributor

Please change the feature gate file name to PodDisruptionConditions.md before making the change as the file name is changed in the main branch. Otherwise, it will create a merge conflict error.

@carlory carlory force-pushed the PodDisruptionConditions branch from 534dd02 to 100c9a3 Compare January 20, 2025 08:08
@Shubham82
Copy link
Contributor

Thanks @carlory
/lgtm

unhold it, when Upstream PR merges.

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

LGTM label has been added.

Git tree hash: 39ca94fa84eef971349a5a755f242e37dc7e0cd4

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 29, 2025
@Shubham82
Copy link
Contributor

Please resolve merge conflicts.

@carlory carlory force-pushed the PodDisruptionConditions branch from 100c9a3 to 2c82900 Compare February 2, 2025 02:29
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 2, 2025
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 2, 2025
@Shubham82
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 Feb 3, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: adbd3ddba3d1a475b983efaeaf4cb78bc96fb139

@reylejano
Copy link
Member

The related k/k PR kubernetes/kubernetes#129501 is still open
This PR may need to re-pointed to a future appropriate dev branch when the PR merges

@carlory
Copy link
Member Author

carlory commented Apr 24, 2025

Thanks for your reminder. I will change the base branch once the branch dev-1.34 is available.

@reylejano
Copy link
Member

Since kubernetes/kubernetes#129501 did not merge in the 1.33 release cycle, please target the dev-1.34 branch

@carlory carlory changed the base branch from dev-1.33 to dev-1.34 May 13, 2025 01:49
@carlory carlory force-pushed the PodDisruptionConditions branch from 2c82900 to 00fc123 Compare May 13, 2025 01:51
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 13, 2025
@carlory
Copy link
Member Author

carlory commented May 13, 2025

@reylejano updated.

@lmktfy
Copy link
Member

lmktfy commented Jun 8, 2025

If you've got time to, please rebase this against main.

@carlory
Copy link
Member Author

carlory commented Jun 9, 2025

Since kubernetes/kubernetes#129501 did not merge in the 1.33 release cycle, please target the dev-1.34 branch

Hi @lmktfy, the upstream has not been merged. Do I need to rebase this against main?

@carlory
Copy link
Member Author

carlory commented Jun 13, 2025

/hold cancel

k/k is merged.
/cc @lmktfy @reylejano

@k8s-ci-robot k8s-ci-robot requested a review from lmktfy June 13, 2025 02:29
@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 Jun 13, 2025
Copy link
Member

@lmktfy lmktfy left a comment

Choose a reason for hiding this comment

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

/LGTM
/approve


removed: true
---
Enables support for appending a dedicated pod condition indicating that the pod is being deleted due to a disruption.
Copy link
Member

Choose a reason for hiding this comment

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

(nit)

Suggested change
Enables support for appending a dedicated pod condition indicating that the pod is being deleted due to a disruption.
Enabled support for appending a dedicated pod condition indicating that the pod is being deleted due to a disruption.

Copy link
Member Author

Choose a reason for hiding this comment

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

@lmktfy I submit a new PR to fix it becase it is merged. please review #51515

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

LGTM label has been added.

Git tree hash: 0a2dc8e6768c09788190c32206393986a8da85d5

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lmktfy

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 Jul 4, 2025
@k8s-ci-robot k8s-ci-robot merged commit ee2d076 into kubernetes:dev-1.34 Jul 4, 2025
6 checks passed
@k8s-ci-robot k8s-ci-robot added this to the 1.34 milestone Jul 4, 2025
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. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants