Skip to content

Commit a77909b

Browse files
lara-template-sync[bot]jaygridleyjaygridley
authored
feat(sync): sync universal-addon changes (#21)
Merge https://github.com/lablabs/terraform-aws-eks-universal-addon 8cf38d3 --------- Signed-off-by: jaygridley <[email protected]> Co-authored-by: jaygridley <[email protected]> Co-authored-by: jaygridley <[email protected]>
1 parent d9b6a9c commit a77909b

18 files changed

+118
-82
lines changed

.github/workflows/cache-warmup.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,15 @@ jobs:
4343
if: ${{ steps.asdf-cache.outputs.cache-hit != 'true' }}
4444
with:
4545
asdf_version: ${{ env.ASDF_VERSION }}
46+
47+
- name: Cache pre-commit
48+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
49+
with:
50+
path: ~/.cache/pre-commit
51+
key: ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}-warmup
52+
restore-keys: ${{ runner.os }}-pre-commit-
53+
54+
- name: Run pre-commit
55+
run: pre-commit install --install-hooks
56+
env:
57+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required for GH API calls quota

.github/workflows/pre-commit.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ jobs:
5555
shell: bash
5656
run: asdf reshim
5757

58+
- name: Cache pre-commit
59+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
60+
with:
61+
path: ~/.cache/pre-commit
62+
key: ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
63+
restore-keys: ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}-
64+
5865
- name: Run pre-commit
5966
run: pre-commit run --show-diff-on-failure --color=always --all-files
6067
env:

.github/workflows/template-sync.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
persist-credentials: false
3737

3838
- name: Sync universal-addon template
39-
uses: AndreasAugustin/actions-template-sync@bcb94410a4f1dffdfe5eaabc8234c3b8e76ebc5b # v2.5.1
39+
uses: AndreasAugustin/actions-template-sync@8ec19a5f2721ffb81ff809aa340ddf75e6a85ea6 # v2.5.2
4040
with:
4141
source_gh_token: ${{ steps.template-sync-app-token.outputs.token }}
4242
source_repo_path: lablabs/terraform-aws-eks-universal-addon

.github/workflows/validate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Extract Terraform min/max versions
2525
id: terraform-min-max
26-
uses: clowdhaus/terraform-min-max@503e88c41953f537fc2b283a310c85e0a2cd585c # v1.4.0
26+
uses: clowdhaus/terraform-min-max@04440fe3b2a1e64eb5ad115f8f7c57c4d6a54333 # v1.4.1
2727
with:
2828
directory: .
2929
outputs:

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313

1414
- repo: https://github.com/antonbabenko/pre-commit-terraform
1515
# renovate: datasource=github-releases depName=antonbabenko/pre-commit-terraform
16-
rev: 2f8bda194a420ad77a050a9de627d77a74841fdc # v1.99.4 # pragma: allowlist secret
16+
rev: c0f51014b8ec51c4455a7dac40697be15e285668 # v1.99.5 # pragma: allowlist secret
1717
hooks:
1818
- id: terraform_validate
1919
- id: terraform_fmt
@@ -40,7 +40,7 @@ repos:
4040

4141
- repo: https://github.com/antonbabenko/pre-commit-terraform
4242
# renovate: datasource=github-releases depName=antonbabenko/pre-commit-terraform
43-
rev: 2f8bda194a420ad77a050a9de627d77a74841fdc # v1.99.4 # pragma: allowlist secret
43+
rev: c0f51014b8ec51c4455a7dac40697be15e285668 # v1.99.5 # pragma: allowlist secret
4444
hooks:
4545
- id: terraform_docs # should be run after luactl sync
4646
args:

.terraform-docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ header-from: main.tf
44
footer-from: docs/.footer.md
55

66
content: |-
7+
{{ include "docs/.intro.md" }}
78
{{ .Header }}
89
{{ include "docs/.addon.md" }}
910
{{ .Requirements }}

.terraform.lock.hcl

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

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
terraform 1.5.7
22
terraform-docs 0.20.0
33
tflint 0.50.3
4-
checkov 3.2.447
5-
awscli 2.27.49
4+
checkov 3.2.457
5+
awscli 2.27.62
66
pre-commit 4.2.0

README.md

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
<!-- BEGIN_TF_DOCS -->
2+
[<img src="https://cdn.prod.website-files.com/66b4bc4ca83726f5a87183ab/685136470d15399f106cb13e_adcbd542a834a1942d077cd5c09d3057_GitHub%20cover%20image%201584x396.png">](https://lablabs.io/)
3+
4+
**About us:**</br>
5+
[Labyrinth Labs](https://lablabs.io/) is a one-stop-shop for **DevOps, Cloud & Kubernetes**! We specialize in creating **powerful**, **scalable** and **cloud-native platforms** tailored to elevate your business.
6+
7+
[As a team of experienced DevOps engineers](https://lablabs.io/about/), we know how to help our customers start their journey in the cloud, address the issues they have in their current setups and provide a **strategic solution to transform their infrastructure**.
8+
9+
----
210
# AWS EKS EBS CSI driver Terraform module
311

412
A terraform module to deploy the [AWS EBS CSI driver](https://github.com/kubernetes-sigs/aws-ebs-csi-driver) on Amazon EKS cluster.
@@ -8,29 +16,27 @@ A terraform module to deploy the [AWS EBS CSI driver](https://github.com/kuberne
816

917
---
1018

11-
## Related Projects
12-
13-
Check out other [Terraform Kubernetes addons](https://github.com/orgs/lablabs/repositories?q=terraform-aws-eks&type=public&language=&sort=).
14-
15-
[<img src="https://lablabs.io/static/ll-logo.png" width=350px>](https://lablabs.io/)
19+
## Supported Terraform provider versions
1620

17-
We help companies build, run, deploy and scale software and infrastructure by embracing the right technologies and principles. Check out our website at <https://lablabs.io/>.
21+
While we are not setting upper bound on the Terraform providers used by the addon we are testing its functionality only against versions specified in the [`.terraform.lock.hcl`](.terraform.lock.hcl) file.
1822

1923
## Deployment methods
2024

2125
### Helm
26+
2227
Deploy Helm chart via Helm resource (default method, set `enabled = true`)
2328

2429
### Argo Kubernetes
30+
2531
Deploy Helm chart as ArgoCD Application via Kubernetes manifest resource (set `enabled = true` and `argo_enabled = true`)
2632

27-
> **Warning**
28-
>
33+
> [!WARNING]
2934
> When deploying with ArgoCD application, Kubernetes terraform provider requires access to Kubernetes cluster API during plan time. This introduces potential issue when you want to deploy the cluster with this addon at the same time, during the same Terraform run.
3035
>
3136
> To overcome this issue, the module deploys the ArgoCD application object using the Helm provider, which does not require API access during plan. If you want to deploy the application using this workaround, you can set the `argo_helm_enabled` variable to `true`.
3237
3338
### Argo Helm
39+
3440
Deploy Helm chart as ArgoCD Application via Helm resource (set `enabled = true`, `argo_enabled = true` and `argo_helm_enabled = true`)
3541

3642
## Examples
@@ -40,18 +46,18 @@ See [basic example](examples/basic) for further information.
4046

4147
| Name | Version |
4248
|------|---------|
43-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.5 |
44-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5 |
45-
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.6 |
46-
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | ~> 2.20 |
47-
| <a name="requirement_utils"></a> [utils](#requirement\_utils) | ~> 1 |
49+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5 |
50+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5 |
51+
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.6 |
52+
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.20 |
53+
| <a name="requirement_utils"></a> [utils](#requirement\_utils) | >= 1 |
4854

4955
## Modules
5056

5157
| Name | Source | Version |
5258
|------|--------|---------|
53-
| <a name="module_addon"></a> [addon](#module\_addon) | git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon | v0.0.23 |
54-
| <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 | v0.0.23 |
59+
| <a name="module_addon"></a> [addon](#module\_addon) | git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon | v0.0.24 |
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 | v0.0.24 |
5561
## Resources
5662

5763
| Name | Type |
@@ -70,7 +76,7 @@ See [basic example](examples/basic) for further information.
7076
| <a name="input_argo_helm_enabled"></a> [argo\_helm\_enabled](#input\_argo\_helm\_enabled) | If set to `true`, the ArgoCD Application manifest will be deployed using Kubernetes provider as a Helm release. Otherwise it'll be deployed as a Kubernetes manifest. See README for more info. Defaults to `false`. | `bool` |
7177
| <a name="input_argo_helm_values"></a> [argo\_helm\_values](#input\_argo\_helm\_values) | Value overrides to use when deploying ArgoCD Application object with Helm. Defaults to `""`. | `string` |
7278
| <a name="input_argo_helm_wait_backoff_limit"></a> [argo\_helm\_wait\_backoff\_limit](#input\_argo\_helm\_wait\_backoff\_limit) | Backoff limit for ArgoCD Application Helm release wait job. Defaults to `6`. | `number` |
73-
| <a name="input_argo_helm_wait_kubectl_version"></a> [argo\_helm\_wait\_kubectl\_version](#input\_argo\_helm\_wait\_kubectl\_version) | Version of kubectl to use for ArgoCD Application wait job. Defaults to `1.33.2`. | `string` |
79+
| <a name="input_argo_helm_wait_kubectl_version"></a> [argo\_helm\_wait\_kubectl\_version](#input\_argo\_helm\_wait\_kubectl\_version) | Version of kubectl to use for ArgoCD Application wait job. Defaults to `1.33.3`. | `string` |
7480
| <a name="input_argo_helm_wait_node_selector"></a> [argo\_helm\_wait\_node\_selector](#input\_argo\_helm\_wait\_node\_selector) | Node selector for ArgoCD Application Helm release wait job. Defaults to `{}`. | `map(string)` |
7581
| <a name="input_argo_helm_wait_timeout"></a> [argo\_helm\_wait\_timeout](#input\_argo\_helm\_wait\_timeout) | Timeout for ArgoCD Application Helm release wait job. Defaults to `10m`. | `string` |
7682
| <a name="input_argo_helm_wait_tolerations"></a> [argo\_helm\_wait\_tolerations](#input\_argo\_helm\_wait\_tolerations) | Tolerations for ArgoCD Application Helm release wait job. Defaults to `[]`. | `list(any)` |
@@ -187,20 +193,22 @@ details.
187193

188194
See [LICENSE](LICENSE) for full details.
189195

190-
Licensed to the Apache Software Foundation (ASF) under one
191-
or more contributor license agreements. See the NOTICE file
192-
distributed with this work for additional information
193-
regarding copyright ownership. The ASF licenses this file
194-
to you under the Apache License, Version 2.0 (the
195-
"License"); you may not use this file except in compliance
196-
with the License. You may obtain a copy of the License at
197-
198-
https://www.apache.org/licenses/LICENSE-2.0
199-
200-
Unless required by applicable law or agreed to in writing,
201-
software distributed under the License is distributed on an
202-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
203-
KIND, either express or implied. See the License for the
204-
specific language governing permissions and limitations
205-
under the License.
196+
```plan
197+
Licensed to the Apache Software Foundation (ASF) under one
198+
or more contributor license agreements. See the NOTICE file
199+
distributed with this work for additional information
200+
regarding copyright ownership. The ASF licenses this file
201+
to you under the Apache License, Version 2.0 (the
202+
"License"); you may not use this file except in compliance
203+
with the License. You may obtain a copy of the License at
204+
205+
<https://www.apache.org/licenses/LICENSE-2.0>
206+
207+
Unless required by applicable law or agreed to in writing,
208+
software distributed under the License is distributed on an
209+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
210+
KIND, either express or implied. See the License for the
211+
specific language governing permissions and limitations
212+
under the License.
213+
```
206214
<!-- END_TF_DOCS -->

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=v0.0.23"
5+
source = "git::https://github.com/lablabs/terraform-aws-eks-universal-addon.git//modules/addon-irsa?ref=v0.0.24"
66

77
enabled = var.enabled
88

0 commit comments

Comments
 (0)