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

RKE2 cluster by terraform #1070

Merged
merged 4 commits into from
Jan 31, 2024
Merged

Conversation

albinsun
Copy link
Contributor

@albinsun albinsun commented Jan 22, 2024

Changes

  1. Specify rancher provider version by config.yml:terraform-provider-rancher

  2. Add TCs for RKE2 cluster using terraform rancher provider1, includes:

    • rancher2_cloud_credential resource
    • rancher2_machine_config_v2 resource
    • rancher2_cluster_v2 resource

Verification

  • harvester-runtests/461 using -k test_z_terraform
    image

Footnotes

  1. https://github.com/rancher/terraform-provider-rancher2/tree/v3.1.1/docs/resources

@albinsun albinsun marked this pull request as ready for review January 23, 2024 02:10
Copy link
Member

@lanfon72 lanfon72 left a comment

Choose a reason for hiding this comment

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

Let's merge the fixture terraform_rancher.py into fixture terraform.py, It looks there have several duplicated fixtures and help classes.

To notice that the BaseTerraformResource could also merge into the exist one, and the TerraformResource should have Rancher to distinguish with Harvester one.

There might have some naming conflict when merging, those should add rancher to distinguish with exist one.

@albinsun
Copy link
Contributor Author

Fix comment requests and verified in harvester-runtests#463
image

@albinsun albinsun requested a review from lanfon72 January 26, 2024 03:49
@lanfon72
Copy link
Member

@albinsun, I think you would need to rebase to reduce duplicated file changes from other (merged) PRs.
It would be something like:

# in local repo
git checkout main && git pull
git checkout <this-branch>
git rebase main
# then you will need to force push to update the PR
git push -f

@albinsun
Copy link
Contributor Author

albinsun commented Jan 26, 2024

@albinsun, I think you would need to rebase to reduce duplicated file changes from other (merged) PRs. It would be something like:

# in local repo
git checkout main && git pull
git checkout <this-branch>
git rebase main
# then you will need to force push to update the PR
git push -f

@lanfon72, done, thanks for ur comment, will use rebase instead of merge then.

@lanfon72 lanfon72 merged commit 2ac7f68 into harvester:main Jan 31, 2024
2 of 3 checks passed
@albinsun albinsun deleted the rke2_by_terraform branch February 1, 2024 06:20
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