Skip to content

Conversation

@tomleb
Copy link
Contributor

@tomleb tomleb commented Mar 19, 2024

Issue: rancher/rancher#43728

Forwardports the following issue/PR: rancher/rancher#44018 (PR: #335)

Depends on rancher/rancher#43619

Problem

We want to support 1.28 k8s.

Solution

Bump relevant dependencies.

Note: sigs.k8s.io/cluster-api v1.5.5 conflicts with k8s.io/* 0.28. One option is to remove it entirely from webhook since we aren't using it anymore (since v2.7.7). 2.9 still imports cluster-api v1.5.0 indirectly because github.com/rancher/rancher/pkg/apis still imports that version.

The changes are:

  • Upgraded controller-runtime to v0.15.3
  • Upgraded github.com/rancher/rke to v1.5.7-rc2
  • Upgraded lasso which supports 1.28
  • Upgraded to wrangler v2 so that's why there is a LOT of files modified.
  • Upgraded dynamiclistener to v0.5.0-rc2 because it contains 1.28 support + wrangler v2. Otherwise conflicts, can't compile. Here's the comparison of the previous version vs this one: rancher/dynamiclistener@v0.3.5...v0.5.0-rc2. Some non-trivial changes here, but it seemed okay to do in rancher/rancher so should be safe here.
  • Upgrade the k8s dependencies to v0.28.6
  • Bumped Go to 1.22

CheckList

  • Tested a subset of integration tests from rancher/rancher

@tomleb tomleb force-pushed the webhook-v2.9-1.28 branch 2 times, most recently from e742ff1 to 4937b66 Compare March 21, 2024 20:24
@tomleb tomleb marked this pull request as ready for review March 22, 2024 15:27
@tomleb tomleb requested a review from a team as a code owner March 22, 2024 15:27
@tomleb tomleb force-pushed the webhook-v2.9-1.28 branch from 4937b66 to 32b4a6e Compare March 25, 2024 15:53
@tomleb tomleb merged commit 49160de into rancher:release/v0.5 Mar 27, 2024
@tomleb tomleb deleted the webhook-v2.9-1.28 branch March 27, 2024 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants