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

Bump Kubernetes to v1.31.5 #5442

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Jan 16, 2025

Description

https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.31.md#changelog-since-v1313
https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.31.md#changelog-since-v1314

Fixes CVE-2024-9042.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@twz123 twz123 added security fix backport/release-1.31 PR that needs to be backported/cherrypicked to the release-1.31 branch labels Jan 16, 2025
@twz123 twz123 marked this pull request as ready for review January 17, 2025 12:39
@twz123 twz123 requested review from a team as code owners January 17, 2025 12:39
@twz123 twz123 requested review from ncopa and jnummelin January 17, 2025 12:39
@twz123 twz123 merged commit 9e5ad0f into k0sproject:main Jan 17, 2025
99 checks passed
@twz123 twz123 deleted the bump-kubernetes-1.31 branch January 17, 2025 15:37
@k0s-bot
Copy link

k0s-bot commented Jan 17, 2025

Backport failed for release-1.31, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-1.31
git worktree add -d .worktree/backport-5442-to-release-1.31 origin/release-1.31
cd .worktree/backport-5442-to-release-1.31
git switch --create backport-5442-to-release-1.31
git cherry-pick -x 1391ed25c5575a675de0a06163ec89dea519242b

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/release-1.31 PR that needs to be backported/cherrypicked to the release-1.31 branch security fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants