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

Update to RKE 1.3.11 #340

Merged
merged 3 commits into from
Jun 6, 2022
Merged

Update to RKE 1.3.11 #340

merged 3 commits into from
Jun 6, 2022

Conversation

tsde
Copy link

@tsde tsde commented May 3, 2022

Issue: #342

Bump RKE version to 1.3.11

This version uses etcd v3.5.3 that includes the fix for this issue. Due to this etcd bug, versions 1.3.9 was not recommended for production use.

I'm far form being a golang guru so I based my changes mainly on @VIKMSTR and @fe-ax already opened PRs. Since 1.3.10 ships with the etcd fix, I think we should concentrate on this PRs if that's OK for you @VIKMSTR and @fe-ax. I successfully built the provider and used it to build a test cluster with 3 control planes nodes and 2 workers. Still, I may have missed some key changes that should be made, so double checking would be wise ^^.

Changes includes

  • Update Go version to 1.17.9 (1.17 is the version used by RKE)
  • Updating dependencies in go.mod. I updated all deps to their latest available version except for github.com/hashicorp/terraform-plugin-sdk. I didn't upgrade it to v2 because it seems like many changes in provider code should be made to make it compatible so this should be part of a dedicated PR IMO. Therefore, I simply updated this dep to the last v1.x available
  • Force github.com/spf13/afero to stick to v1.2.2 required by the version of github.com/hashicorp/terraform-plugin-sdk mentioned above

Can anyone from Rancher shed some lights on the current status of this project ? Activity seemed to have drastically dropped during the last few months. I can understand that efforts are now mainly directing towards Rancher 2 / RKE 2 products but for users of RKE 1, this provider is still very useful. A little bit of visibility would be great 😉 Maybe @rawmind0 or @annablender can help with this PR ?

@VIKMSTR
Copy link

VIKMSTR commented May 3, 2022

Thumbs up!
Make sense to merge this instead.

I'm also kind of interested what's the status of the project, how it looks like with the future support and possibly with further support of RKE2.

@tsde tsde changed the title Update to RKE 1.3.10 Update to RKE 1.3.11 May 17, 2022
@tsde
Copy link
Author

tsde commented May 17, 2022

I've just updated the PR to use RKE 1.3.11 as it was released a week ago. Kubernetes 1.23 is now officially supported.
It would be great to have some feedback and a review from Rancher team. @HarrisonWAffel @rawmind0 @annablender Any chance to see this PR merged soon ? Any blocker that would prevent this PR from being merged ?

@HarrisonWAffel HarrisonWAffel requested a review from a team May 17, 2022 19:08
@a-blender a-blender requested review from jakefhyde and kinarashah May 18, 2022 16:40
@a-blender a-blender added this to the v2.6.6 - Terraform milestone May 18, 2022
@a-blender
Copy link
Contributor

a-blender commented May 18, 2022

I'll review but @kinarashah has more experience with upgrading RKE for Kubernetes 1.24, so I'll wait for her review on this one. DNM - pending 2.6.5 Terraform release.

@a-blender a-blender changed the title Update to RKE 1.3.11 [DNM] Update to RKE 1.3.11 May 18, 2022
@tsde
Copy link
Author

tsde commented May 19, 2022

Thanks for your feedback @annablender

go.mod Outdated Show resolved Hide resolved
Copy link
Member

@kinarashah kinarashah left a comment

Choose a reason for hiding this comment

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

@annablender Changes LGTM, could you look at the test cases we'd need to verify? Looks like a few things have already been tested per the PR description but would be helpful to have a list of things to check for both dev and QA testing.

@tsde We still support RKE1 and release new k8s updates, bug fixes etc for RKE1. I'll try to find more information about terraform's release cycle for RKE1. Thank you for bringing in 1.23 for terraform.

@a-blender
Copy link
Contributor

a-blender commented May 19, 2022

I've added a new issue for the RKE update to 1.3.11 #342. Test notes will be added there. Terraform has an RKE test suite that can be run using make testacc and it would be prudent to make sure nodes with all roles (cp, etcd, worker) and enabling the dockerd CRI works on an RKE cluster once #337 (review) is merged.

@a-blender a-blender self-requested a review May 19, 2022 19:25
@tsde
Copy link
Author

tsde commented May 19, 2022

@tsde We still support RKE1 and release new k8s updates, bug fixes etc for RKE1. I'll try to find more information about terraform's release cycle for RKE1. Thank you for bringing in 1.23 for terraform.

@kinarashah Thank you for your feedback on this matter 👍

Copy link
Contributor

@a-blender a-blender left a comment

Choose a reason for hiding this comment

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

LGTM with discussed test cases. DNM - pending 2.6.5 Terraform release

@a-blender a-blender changed the title [DNM] Update to RKE 1.3.11 Update to RKE 1.3.11 May 25, 2022
@a-blender
Copy link
Contributor

a-blender commented May 25, 2022

Terraform RKE v1.3.1 patch is released and sufficient smoke testing has been done to verify an RKE all role cluster with cri_dockerd_enable works as expected. Ok to merge.

@hutm
Copy link

hutm commented Jun 6, 2022

are there any blockers to merge it?

@a-blender a-blender merged commit acb5b7c into rancher:master Jun 6, 2022
@tsde tsde deleted the update_rke1310 branch April 11, 2023 09:32
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.

7 participants