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

feat: OpenTofu support to helm chart #430

Merged
merged 12 commits into from
Oct 13, 2024
Merged

Conversation

seifrajhi
Copy link
Contributor

what

Upgrade Atlantis to the latest version v0.30.0 that adds support to Opentufu

references

closes #429

@seifrajhi seifrajhi requested a review from a team as a code owner October 3, 2024 11:14
Copy link
Member

@GMartinez-Sisti GMartinez-Sisti left a comment

Choose a reason for hiding this comment

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

Hi @seifrajhi, thanks for the contribution! Please check the comments.

@@ -91,6 +91,7 @@ extraManifests:
| customPem | string | `""` | Allows to override the /etc/ssl/certs/ca-certificates.cer with your custom one. You have to create a secret with the specified name. |
| dataStorage | string | `""` | DEPRECATED - Disk space available to check out repositories. Example: 5Gi. |
| defaultTFVersion | string | `""` | Sets the default terraform version to be used in atlantis server. Check values.yaml for examples. |
| defaultTFVersion | string | `terraform` | Sets the default distribution to be used in atlantis server. Check values.yaml for examples. |
Copy link
Member

Choose a reason for hiding this comment

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

You probably meant:

Suggested change
| defaultTFVersion | string | `terraform` | Sets the default distribution to be used in atlantis server. Check values.yaml for examples. |
| defaultTFDistribution | string | `terraform` | Sets the default terraform distribution to use. Can be set to terraform or opentofu. |

@@ -228,6 +228,9 @@ hideUnchangedPlanComments: false
defaultTFVersion: ""
# Example: "0.12.0".

### -- Sets which TF distribution to use. Can be set to terraform or opentofu.
Copy link
Member

Choose a reason for hiding this comment

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

And since it needs to match the readme file:

Suggested change
### -- Sets which TF distribution to use. Can be set to terraform or opentofu.
### -- Sets the default terraform distribution to use. Can be set to terraform or opentofu.

charts/atlantis/Chart.yaml Show resolved Hide resolved
@@ -240,6 +243,7 @@ disableRepoLocking: false
# -- Use Diff Markdown Format for color coding diffs.
enableDiffMarkdownFormat: false


Copy link
Member

Choose a reason for hiding this comment

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

Typo? Please remove extra line.

Suggested change

@seifrajhi
Copy link
Contributor Author

@GMartinez-Sisti, It looks better now I think

@GMartinez-Sisti
Copy link
Member

Hi @seifrajhi, something got merged, can you fix the conflict on the chart version pls? 🙏

@@ -313,6 +313,10 @@
"type": "string",
"description": "Default Terraform version to be used by atlantis server"
},
"defaultTFDistribution": {
"type": "string",
"description": "Default Atlantis distribution to be used by atlantis server. Either Opentufu or terraform"
Copy link

@Sapr0 Sapr0 Oct 9, 2024

Choose a reason for hiding this comment

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

The default value is missing in the schema, and we can also add an enum.

Suggested change
"description": "Default Atlantis distribution to be used by atlantis server. Either Opentufu or terraform"
"description": "Default Atlantis distribution to be used by Atlantis server. Either terraform or opentofu",
"default": "terraform",
"enum": [
"terraform",
"opentofu"
]

There is a slight typo in opentofu as well

@seifrajhi
Copy link
Contributor Author

Hello @Sapr0 , thank you for the review, I just added that.
@GMartinez-Sisti, I just resolved the conflict too.

Co-authored-by: Gabriel Martinez <19713226+GMartinez-Sisti@users.noreply.github.com>
@seifrajhi
Copy link
Contributor Author

@GMartinez-Sisti, I addressed the above comments

@seifrajhi
Copy link
Contributor Author

@GMartinez-Sisti , I think the test is failing because the ordering of the properties is incorrect. To allow the test to pass, I moved the defaultTFDistribution property above defaultTFVersion

@GMartinez-Sisti
Copy link
Member

GMartinez-Sisti commented Oct 13, 2024

@seifrajhi to fix the CI please follow the recommendation steps:

Please run 'make docs' from the repository root and commit changes!

And you also need to increase the chart version again please.

@seifrajhi
Copy link
Contributor Author

@seifrajhi to fix the CI please follow the recommendation steps:

Please run 'make docs' from the repository root and commit changes!

And you also need to increase the chart version again please.

I ran make docs and it is ok now and also bumped chart version

image

@seifrajhi
Copy link
Contributor Author

I have updated test to support the new env 🤞

image

Copy link
Member

@GMartinez-Sisti GMartinez-Sisti left a comment

Choose a reason for hiding this comment

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

Thank you @seifrajhi 🚀

@GMartinez-Sisti GMartinez-Sisti merged commit bc98b31 into runatlantis:main Oct 13, 2024
4 checks passed
ryan-dyer-sp pushed a commit to ryan-dyer-sp/runatlantis-helm-charts that referenced this pull request Oct 23, 2024
* feat: OpenTofu support to helm chart

---------

Co-authored-by: Gabriel Martinez <19713226+GMartinez-Sisti@users.noreply.github.com>
Signed-off-by: Ryan Dyer <ryan.dyer@favordelivery.com>
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.

Upgrade chart to support new version v0.30.0
3 participants