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.0 #4647

Merged
merged 4 commits into from
Sep 11, 2024
Merged

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Jun 17, 2024

Description

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

  • Restore runc module version test
    The Kubernetes 1.31 bump reintroduced the transitive runc go dependency again. Restore the module version check for it. See Bump containerd to v1.7.12 #3928.

  • Adapt fake client's ObjectTracker to k/k PR 125560
    The interface changed upstream, add the variadic option arguments and missing Patch and apply methods. Moreover, remove the capacity from the external channel for Watch. This could introduce double-buffering. Introduce internalized helper, which allows for reusing the internalize error handling.

  • Bump controller-runtime to v0.19.0
    https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.19.0
    This is the version which is compatible with Kubernetes 1.31.

  • Skip name checks when restarting Autpoilot root controller
    If the autpoilot root controller is started multiple times due to reconfiguration events, this means that all controller-runtime controllers have already been successfully registered to another manager during the initial startup. However, controller-runtime maintains a global checklist of controller names and doesn't currently provide a way to unregister names from discarded managers. So it's necessary to suppress the global name check each time things are restarted for reconfiguration.

See:

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 the chore label Jun 17, 2024
@twz123 twz123 changed the title Bump Kubernetes to v1.31-alpha.1 Bump Kubernetes to v1.31.0-alpha.1 Jun 17, 2024
@twz123 twz123 force-pushed the bump-kubernetes-1.31 branch from 8f0ce6c to b4e2473 Compare June 19, 2024 07:10
@twz123 twz123 changed the title Bump Kubernetes to v1.31.0-alpha.1 Bump Kubernetes to v1.31.0-alpha.2 Jun 19, 2024
@twz123 twz123 force-pushed the bump-kubernetes-1.31 branch 2 times, most recently from 670d04d to 65e991c Compare June 19, 2024 07:26
Copy link
Contributor

github-actions bot commented Jul 1, 2024

This pull request has merge conflicts that need to be resolved.

@twz123 twz123 force-pushed the bump-kubernetes-1.31 branch from 65e991c to f14ea50 Compare July 1, 2024 10:10
@twz123 twz123 force-pushed the bump-kubernetes-1.31 branch 4 times, most recently from dee9717 to 3e42b15 Compare July 3, 2024 07:53
@twz123 twz123 changed the title Bump Kubernetes to v1.31.0-alpha.2 Bump Kubernetes to v1.31.0-alpha.3 Jul 3, 2024
@twz123 twz123 force-pushed the bump-kubernetes-1.31 branch 3 times, most recently from 9d56c51 to eded00b Compare July 3, 2024 13:50
Copy link
Contributor

github-actions bot commented Jul 3, 2024

This pull request has merge conflicts that need to be resolved.

Copy link
Contributor

github-actions bot commented Jul 6, 2024

This pull request has merge conflicts that need to be resolved.

Copy link
Contributor

This pull request has merge conflicts that need to be resolved.

@twz123 twz123 force-pushed the bump-kubernetes-1.31 branch from d53166b to b454134 Compare July 24, 2024 10:48
@twz123 twz123 force-pushed the bump-kubernetes-1.31 branch from 2bfd6d9 to d830f04 Compare July 24, 2024 21:21
Copy link
Contributor

This pull request has merge conflicts that need to be resolved.

@twz123 twz123 force-pushed the bump-kubernetes-1.31 branch from d830f04 to 52059fa Compare August 21, 2024 15:19
@twz123 twz123 changed the title Bump Kubernetes to v1.31.0-beta.0 Bump Kubernetes to v1.31.0 Aug 21, 2024
@twz123 twz123 force-pushed the bump-kubernetes-1.31 branch from 1c6b013 to 8a7056a Compare August 23, 2024 12:15
Copy link
Contributor

This pull request has merge conflicts that need to be resolved.

Copy link
Contributor

This pull request has merge conflicts that need to be resolved.

Allows for reusing the internalize error handling.

Signed-off-by: Tom Wieczorek <[email protected]>
https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.31.md#changelog-since-v1300

* Adapt fake client's ObjectTracker to k/k PR 125560
  The interface changed upstream, add the variadic option arguments and
  missing Patch and apply methods. Moreover, remove the capacity from
  the external channel for Watch. This could introduce double-buffering.

* Bump controller-runtime to v0.19.0
  https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.19.0
  This is the version which is compatible with Kubernetes 1.31.

* Skip name checks when restarting Autpoilot root controller
  If the autpoilot root controller is started multiple times due
  to reconfiguration events, this means that all controller-runtime
  controllers have already been successfully registered to another
  manager during the initial startup. However, controller-runtime
  maintains a global checklist of controller names and doesn't currently
  provide a way to unregister names from discarded managers. So it's
  necessary to suppress the global name check each time things are
  restarted for reconfiguration.

Signed-off-by: Tom Wieczorek <[email protected]>
So that the number of matched packages can be asserted separately, if
required.

Signed-off-by: Tom Wieczorek <[email protected]>
The Kubernetes 1.31 bump reintroduced the transitive runc go dependency
again. Restore the module version check for it.

See: 537ebdb ("Bump containerd to v1.7.12")
Signed-off-by: Tom Wieczorek <[email protected]>
@jnummelin jnummelin marked this pull request as ready for review September 11, 2024 08:07
@jnummelin jnummelin requested a review from a team as a code owner September 11, 2024 08:07
@jnummelin jnummelin requested review from ncopa and kke September 11, 2024 08:07
@jnummelin jnummelin merged commit bfcdb9d into k0sproject:main Sep 11, 2024
87 checks passed
@twz123 twz123 deleted the bump-kubernetes-1.31 branch November 14, 2024 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants