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

support 1.24 #2948

Merged
merged 2 commits into from
Jun 29, 2022
Merged

support 1.24 #2948

merged 2 commits into from
Jun 29, 2022

Conversation

jiaqiluo
Copy link
Member

@jiaqiluo jiaqiluo commented Jun 8, 2022

Issues:

Changes in this PR:

  • update related Go packages to the 1.24 version
  • enforce cri-dockerd to be enabled when the cluster version >= 1.24 and the option enable_cri_dockerd is not configured in the cluster.yml file

Test:
This PR has been tested locally by pointing the KDM to my forked which contains the template for 1.24.1-rancher1-1.

  • The provision of a single-node 1.24.1-rancher1-1 cluster succeeded.
  • The provision of a single-node 1.24.1-rancher1-1 cluster failed as expected when enable_cri_dockerd=false is set in the cluster.yml file
  • Upgrading a single-node cluster from v1.23.6-rancher1-1 to 1.24.1-rancher1-1 also succeeded.

Related PRs:

@jiaqiluo jiaqiluo requested review from kinarashah and a team June 8, 2022 22:35
@jiaqiluo jiaqiluo marked this pull request as draft June 9, 2022 16:25
@jiaqiluo jiaqiluo force-pushed the support-1-24 branch 3 times, most recently from 85db5ac to ddc575d Compare June 9, 2022 18:49
@jiaqiluo jiaqiluo marked this pull request as ready for review June 9, 2022 18:53
@jiaqiluo jiaqiluo force-pushed the support-1-24 branch 2 times, most recently from eb4f47f to 34b7db9 Compare June 21, 2022 22:46
kinarashah
kinarashah previously approved these changes Jun 29, 2022
go.mod Outdated Show resolved Hide resolved
cluster/plan.go Outdated Show resolved Hide resolved
cluster/defaults.go Outdated Show resolved Hide resolved
… enable_cri_dockerd is not configured; 2. drop the flag --address when the cluster version >= 1.24 in the DinD case
@jiaqiluo jiaqiluo requested a review from a team June 29, 2022 00:29
@jiaqiluo jiaqiluo merged commit 9b7a148 into rancher:release/v1.3 Jun 29, 2022
@jiaqiluo jiaqiluo deleted the support-1-24 branch June 29, 2022 00:59
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.

3 participants