Skip to content

Commit 5c5436a

Browse files
refactor(terraform): aws provider upgrade to v6 (#23)
# Description This PR updates Terraform provider lock data to include AWS provider v6 and aligns template sync ignore behavior for addon-specific local files. Compared to main, this branch: - Upgrades locked `hashicorp/aws` provider version in `.terraform.lock.hcl` from `5.100.0` to `6.42.0` (including checksum updates). - Normalizes the locked `hashicorp/helm` constraint in `.terraform.lock.hcl` to `>= 3.0.0`. - Adds `migrations.tf` and `.templatesyncignore.local` to `.templatesyncignore`. - Adds `.templatesyncignore.local` to prevent overriding addon-specific templated files. - Syncs `helm_keyring` description wording in `variables-addon.tf` and generated `README.md`. No issue is fixed by this PR. ## Type of change - [ ] A bug fix (PR prefix `fix`) - [ ] A new feature (PR prefix `feat`) - [x] A code change that neither fixes a bug nor adds a feature (PR prefix `refactor`) - [ ] Adding missing tests or correcting existing tests (PR prefix `test`) - [ ] Changes that do not affect the meaning of the code like white-spaces, formatting, missing semi-colons, etc. (PR prefix `style`) - [ ] Changes to our CI configuration files and scripts (PR prefix `ci`) - [ ] Documentation only changes (PR prefix `docs`) ## How Has This Been Tested? - Plan and apply with the updated lock file to ensure no issues with provider versions.
1 parent 11f9397 commit 5c5436a

10 files changed

Lines changed: 32 additions & 118 deletions

File tree

.github/workflows/template-sync.yaml

Lines changed: 0 additions & 91 deletions
This file was deleted.

.github/workflows/validate.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,6 @@ jobs:
5353

5454
- name: Terraform Validate
5555
run: terraform validate
56+
57+
- name: Terraform Test
58+
run: terraform test -verbose

.templatesyncignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ README.md
77
.secrets.baseline
88
.github/workflows/renovate.yaml
99
renovate.json
10-
addon-oidc.tf
11-
variables-addon-oidc.tf
10+
migrations.tf
11+
.templatesyncignore.local

.templatesyncignore.local

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
addon-oidc.tf
2+
variables-addon-oidc.tf

.terraform.lock.hcl

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ See [basic example](examples/basic) for further information.
5656

5757
| Name | Source | Version |
5858
|------|--------|---------|
59-
| <a name="module_addon"></a> [addon](#module\_addon) | git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon | v1.0.0-rc2 |
60-
| <a name="module_addon-irsa"></a> [addon-irsa](#module\_addon-irsa) | git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon-irsa | v1.0.0-rc2 |
59+
| <a name="module_addon"></a> [addon](#module\_addon) | git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon | v1.0.0 |
60+
| <a name="module_addon-irsa"></a> [addon-irsa](#module\_addon-irsa) | git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon-irsa | v1.0.0 |
6161
## Resources
6262

6363
| Name | Type |
@@ -113,7 +113,7 @@ See [basic example](examples/basic) for further information.
113113
| <a name="input_helm_disable_webhooks"></a> [helm\_disable\_webhooks](#input\_helm\_disable\_webhooks) | Prevent Helm chart hooks from running. Defaults to `false`. | `bool` |
114114
| <a name="input_helm_enabled"></a> [helm\_enabled](#input\_helm\_enabled) | Set to false to prevent installation of the module via Helm release. Defaults to `true`. | `bool` |
115115
| <a name="input_helm_force_update"></a> [helm\_force\_update](#input\_helm\_force\_update) | Force Helm resource update through delete/recreate if needed. Defaults to `false`. | `bool` |
116-
| <a name="input_helm_keyring"></a> [helm\_keyring](#input\_helm\_keyring) | Location of public keys used for verification. Used only if `helm_package_verify` is `true`. Used only when `helm_package_verify` is `true`. Defaults to `~/.gnupg/pubring.gpg`. | `string` |
116+
| <a name="input_helm_keyring"></a> [helm\_keyring](#input\_helm\_keyring) | Location of public keys used for verification. Used only when `helm_package_verify` is `true`. Defaults to `~/.gnupg/pubring.gpg`. | `string` |
117117
| <a name="input_helm_lint"></a> [helm\_lint](#input\_helm\_lint) | Run the Helm chart linter during the plan. Defaults to `false`. | `bool` |
118118
| <a name="input_helm_package_verify"></a> [helm\_package\_verify](#input\_helm\_package\_verify) | Verify the package before installing it. Helm uses a provenance file to verify the integrity of the chart; this must be hosted alongside the chart. Defaults to `false`. | `bool` |
119119
| <a name="input_helm_postrender"></a> [helm\_postrender](#input\_helm\_postrender) | Value block with a path to a binary file to run after Helm renders the manifest which can alter the manifest contents. Defaults to `null`. | <pre>object({<br/> binary_path = string<br/> args = optional(list(string))<br/> })</pre> |

addon-irsa.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
module "addon-irsa" {
33
for_each = local.addon_irsa
44

5-
source = "git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon-irsa?ref=v1.0.0-rc2"
5+
source = "git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon-irsa?ref=v1.0.0"
66

77
enabled = var.enabled
88

addon.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ locals {
1111
}
1212

1313
module "addon" {
14-
source = "git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon?ref=v1.0.0-rc2"
14+
source = "git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon?ref=v1.0.0"
1515

1616
enabled = var.enabled
1717

examples/basic/base.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module "eks_cluster" {
2727
}
2828

2929
name = "eks"
30-
region = data.aws_region.this.name
30+
region = data.aws_region.this.id
3131
subnet_ids = module.vpc.public_subnets
3232
}
3333

variables-addon.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ variable "helm_package_verify" {
261261
variable "helm_keyring" {
262262
type = string
263263
default = null
264-
description = "Location of public keys used for verification. Used only if `helm_package_verify` is `true`. Used only when `helm_package_verify` is `true`. Defaults to `~/.gnupg/pubring.gpg`."
264+
description = "Location of public keys used for verification. Used only when `helm_package_verify` is `true`. Defaults to `~/.gnupg/pubring.gpg`."
265265
}
266266

267267
variable "helm_timeout" {

0 commit comments

Comments
 (0)