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

[release-2.25] Bump Kubernetes to 1.29.6 #11355

Merged
merged 3 commits into from
Jul 26, 2024
Merged

[release-2.25] Bump Kubernetes to 1.29.6 #11355

merged 3 commits into from
Jul 26, 2024

Conversation

tico88612
Copy link
Member

What type of PR is this?

/kind feature

What this PR does / why we need it:

related #11351

Which issue(s) this PR fixes:

Fixed #

Special notes for your reviewer:

I can't cherry-pick #11351, so I open this PR.

Does this PR introduce a user-facing change?:

Default Kubernetes version change to 1.29.6

@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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 6, 2024
@yankay
Copy link
Member

yankay commented Jul 6, 2024

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Jul 6, 2024
@tico88612
Copy link
Member Author

/retest-failed

MrFreezeex
MrFreezeex approved these changes Jul 6, 2024
View reviewed changes
Copy link
Member

@MrFreezeex MrFreezeex left a comment

Choose a reason for hiding this comment

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

Thanks!
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 6, 2024
@tico88612
Copy link
Member Author

@yankay, should we fix the centos7 CI? or cherry pick #11344 to release-2.25?

@yankay
Copy link
Member

yankay commented Jul 7, 2024

@yankay, should we fix the centos7 CI? or cherry pick #11344 to release-2.25?

Thanks @tico88612

I think cherry-pick is better :-)

@tico88612
Copy link
Member Author

tico88612 commented Jul 7, 2024 •
edited
Loading

It looks like I need to cherry-pick #11226 #11292 #11315 #11251 #11324 #11344 #11347 in order to cherry-pick #11344.

There are a lot of changes to the CI process in this period.

@ant31
Copy link
Contributor

ant31 commented Jul 7, 2024

I think the branch would need to be manually resolved to continue to cherry pick.

@tico88612
Copy link
Member Author

tico88612 commented Jul 7, 2024 •
edited
Loading

I think the branch would need to be manually resolved to continue to cherry pick.

@ant31 Actually, yes. I want to try cherry-picking other PRs for the release-2.25 branch, but it will also be impossible to merge because of the failure of the CentOS 7 CI.

Is there a better solution for this?

https://kubernetes.slack.com/archives/CDQSC941H/p1720327403131739

@tico88612
Copy link
Member Author

/hold

@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 Jul 7, 2024
@tico88612
Feat: add k8s 1.29.6 checksum
95e4201 
Signed-off-by: tico88612 <17496418+tico88612@users.noreply.github.com>
@tico88612
Feat: change default version to 1.29.6
b7757dd 
Signed-off-by: tico88612 <17496418+tico88612@users.noreply.github.com>
@tico88612
Docs: change kubernetes version to 1.29.6
64ffcbf 
Signed-off-by: tico88612 <17496418+tico88612@users.noreply.github.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 11, 2024
@mzaian
Copy link
Contributor

mzaian commented Jul 17, 2024

Hello @tico88612

Kubernetes 1.29.7 is released also new versions of 1.27 and 1.28 it's better also to include these hashes in this PR.

/hold

@tico88612
Copy link
Member Author

@mzaian Got it. I will rebase this after all the cherry-pick commits are merged.

@yankay
Copy link
Member

yankay commented Jul 26, 2024

/approve

@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 26, 2024
mzaian
mzaian approved these changes Jul 26, 2024
View reviewed changes
Copy link
Contributor

@mzaian mzaian left a comment

Choose a reason for hiding this comment

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

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MrFreezeex, mzaian, tico88612, yankay

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

@yankay yankay merged commit 0651e77 into kubernetes-sigs:release-2.25 Jul 26, 2024
65 of 66 checks passed
@tico88612 tico88612 deleted the bump/k8s-1.29.6 branch August 7, 2024 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mzaian mzaian mzaian approved these changes

@MrFreezeex MrFreezeex MrFreezeex approved these changes

@yankay yankay Awaiting requested review from yankay

Assignees

@mzaian mzaian

@MrFreezeex MrFreezeex

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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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. 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@tico88612 @yankay @ant31 @mzaian @k8s-ci-robot @MrFreezeex