Skip to content

Commit de41d6d

Browse files
goruhagoruha
authored
Merge branch 'main' into renovate/nick-fields-assert-action-2.x
2 parents db118e9 + 9dc2211 commit de41d6d

8 files changed

Lines changed: 92 additions & 97 deletions

‎.github/workflows/test-destroy.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
services:
2323
localstack:
24-
image: localstack/localstack:2.1.0
24+
image: localstack/localstack:4.14.0
2525
ports:
2626
- 4566:4566
2727
- 4510-4559:4510-4559
@@ -30,7 +30,7 @@ jobs:
3030
password: ${{ secrets.DOCKERHUB_PASSWORD }}
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v6
3434
with:
3535
path: ./action
3636

@@ -75,7 +75,7 @@ jobs:
7575
needs: [setup]
7676
services:
7777
localstack:
78-
image: localstack/localstack:2.1.0
78+
image: localstack/localstack:4.14.0
7979
ports:
8080
- 4566:4566
8181
- 4510-4559:4510-4559
@@ -84,7 +84,7 @@ jobs:
8484
password: ${{ secrets.DOCKERHUB_PASSWORD }}
8585
steps:
8686
- name: Checkout
87-
uses: actions/checkout@v3
87+
uses: actions/checkout@v6
8888
with:
8989
path: ./action
9090

@@ -113,7 +113,7 @@ jobs:
113113
## Use localhost to connect localstack because the commands runs not in a container
114114
AWS_ENDPOINT_OVERRIDE: http://localhost:4566
115115
116-
- uses: actions/create-github-app-token@v2
116+
- uses: actions/create-github-app-token@v3
117117
id: github-app
118118
with:
119119
app-id: ${{ vars.BOT_GITHUB_APP_ID }}
@@ -127,7 +127,7 @@ jobs:
127127
toolchain: helmfile
128128
environment: staging
129129
namespace: staging
130-
path: ./action/test/helmfile/helmfile.yaml
130+
path: ./action/test/helmfile/helmfile.yaml.gotmpl
131131
application: test-app
132132
ssm-path: platform/default
133133
github-pat: ${{ steps.github-app.outputs.token }}
@@ -157,7 +157,7 @@ jobs:
157157
actual: "${{ needs.test.outputs.sha }}"
158158
comparison: notEqual
159159

160-
- uses: actions/create-github-app-token@v2
160+
- uses: actions/create-github-app-token@v3
161161
id: github-app
162162
with:
163163
app-id: ${{ vars.BOT_GITHUB_APP_ID }}

‎.github/workflows/test-helm-raw-default-kube-version.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
needs: [setup]
3939
services:
4040
localstack:
41-
image: localstack/localstack:2.1.0
41+
image: localstack/localstack:4.14.0
4242
ports:
4343
- 4566:4566
4444
- 4510-4559:4510-4559
@@ -47,7 +47,7 @@ jobs:
4747
password: ${{ secrets.DOCKERHUB_PASSWORD }}
4848
steps:
4949
- name: Checkout
50-
uses: actions/checkout@v3
50+
uses: actions/checkout@v6
5151
with:
5252
path: ./action
5353

@@ -70,7 +70,7 @@ jobs:
7070
## Use localhost to connect localstack because the commands runs not in a container
7171
AWS_ENDPOINT_OVERRIDE: http://localhost:4566
7272
73-
- uses: actions/create-github-app-token@v2
73+
- uses: actions/create-github-app-token@v3
7474
id: github-app
7575
with:
7676
app-id: ${{ vars.BOT_GITHUB_APP_ID }}
@@ -125,15 +125,15 @@ jobs:
125125
actual: "${{ needs.test.outputs.sha }}"
126126
comparison: notEqual
127127

128-
- uses: actions/create-github-app-token@v2
128+
- uses: actions/create-github-app-token@v3
129129
id: github-app
130130
with:
131131
app-id: ${{ vars.BOT_GITHUB_APP_ID }}
132132
private-key: ${{ secrets.BOT_GITHUB_APP_PRIVATE_KEY }}
133133
owner: 'cloudposse-tests'
134134

135135
- name: Checkout Argo Configuration
136-
uses: actions/checkout@v3
136+
uses: actions/checkout@v6
137137
with:
138138
repository: cloudposse-tests/argocd-deploy-non-prod-test
139139
ref: ${{ needs.test.outputs.sha }}

‎.github/workflows/test-helm-raw.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
needs: [setup]
3939
services:
4040
localstack:
41-
image: localstack/localstack:2.1.0
41+
image: localstack/localstack:4.14.0
4242
ports:
4343
- 4566:4566
4444
- 4510-4559:4510-4559
@@ -47,7 +47,7 @@ jobs:
4747
password: ${{ secrets.DOCKERHUB_PASSWORD }}
4848
steps:
4949
- name: Checkout
50-
uses: actions/checkout@v3
50+
uses: actions/checkout@v6
5151
with:
5252
path: ./action
5353

@@ -76,7 +76,7 @@ jobs:
7676
## Use localhost to connect localstack because the commands runs not in a container
7777
AWS_ENDPOINT_OVERRIDE: http://localhost:4566
7878
79-
- uses: actions/create-github-app-token@v2
79+
- uses: actions/create-github-app-token@v3
8080
id: github-app
8181
with:
8282
app-id: ${{ vars.BOT_GITHUB_APP_ID }}
@@ -131,15 +131,15 @@ jobs:
131131
actual: "${{ needs.test.outputs.sha }}"
132132
comparison: notEqual
133133

134-
- uses: actions/create-github-app-token@v2
134+
- uses: actions/create-github-app-token@v3
135135
id: github-app
136136
with:
137137
app-id: ${{ vars.BOT_GITHUB_APP_ID }}
138138
private-key: ${{ secrets.BOT_GITHUB_APP_PRIVATE_KEY }}
139139
owner: 'cloudposse-tests'
140140

141141
- name: Checkout Argo Configuration
142-
uses: actions/checkout@v3
142+
uses: actions/checkout@v6
143143
with:
144144
repository: cloudposse-tests/argocd-deploy-non-prod-test
145145
ref: ${{ needs.test.outputs.sha }}

‎.github/workflows/test-helmfile-raw-default-kube-version.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
needs: [setup]
4040
services:
4141
localstack:
42-
image: localstack/localstack:2.1.0
42+
image: localstack/localstack:4.14.0
4343
ports:
4444
- 4566:4566
4545
- 4510-4559:4510-4559
@@ -48,7 +48,7 @@ jobs:
4848
password: ${{ secrets.DOCKERHUB_PASSWORD }}
4949
steps:
5050
- name: Checkout
51-
uses: actions/checkout@v3
51+
uses: actions/checkout@v6
5252
with:
5353
path: ./action
5454

@@ -71,7 +71,7 @@ jobs:
7171
## Use localhost to connect localstack because the commands runs not in a container
7272
AWS_ENDPOINT_OVERRIDE: http://localhost:4566
7373
74-
- uses: actions/create-github-app-token@v2
74+
- uses: actions/create-github-app-token@v3
7575
id: github-app
7676
with:
7777
app-id: ${{ vars.BOT_GITHUB_APP_ID }}
@@ -85,7 +85,7 @@ jobs:
8585
toolchain: helmfile
8686
environment: staging
8787
namespace: staging
88-
path: ./action/test/helmfile/helmfile.yaml
88+
path: ./action/test/helmfile/helmfile.yaml.gotmpl
8989
application: test-app
9090
ssm-path: platform/default
9191
github-pat: ${{ steps.github-app.outputs.token }}
@@ -128,15 +128,15 @@ jobs:
128128
actual: "${{ needs.test.outputs.sha }}"
129129
comparison: notEqual
130130

131-
- uses: actions/create-github-app-token@v2
131+
- uses: actions/create-github-app-token@v3
132132
id: github-app
133133
with:
134134
app-id: ${{ vars.BOT_GITHUB_APP_ID }}
135135
private-key: ${{ secrets.BOT_GITHUB_APP_PRIVATE_KEY }}
136136
owner: 'cloudposse-tests'
137137

138138
- name: Checkout Argo Configuration
139-
uses: actions/checkout@v3
139+
uses: actions/checkout@v6
140140
with:
141141
repository: cloudposse-tests/argocd-deploy-non-prod-test
142142
ref: ${{ needs.test.outputs.sha }}

‎.github/workflows/test-helmfile-raw.yml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ on:
1616
required: false
1717
type: string
1818

19+
permissions:
20+
pull-requests: write
21+
statuses: write
22+
1923
jobs:
2024
setup:
2125
runs-on: ubuntu-latest
@@ -41,7 +45,7 @@ jobs:
4145
needs: [setup]
4246
services:
4347
localstack:
44-
image: localstack/localstack:2.1.0
48+
image: localstack/localstack:4.14.0
4549
ports:
4650
- 4566:4566
4751
- 4510-4559:4510-4559
@@ -50,7 +54,7 @@ jobs:
5054
password: ${{ secrets.DOCKERHUB_PASSWORD }}
5155
steps:
5256
- name: Checkout
53-
uses: actions/checkout@v3
57+
uses: actions/checkout@v6
5458
with:
5559
path: ./action
5660

@@ -79,7 +83,7 @@ jobs:
7983
## Use localhost to connect localstack because the commands runs not in a container
8084
AWS_ENDPOINT_OVERRIDE: http://localhost:4566
8185
82-
- uses: actions/create-github-app-token@v2
86+
- uses: actions/create-github-app-token@v3
8387
id: github-app
8488
with:
8589
app-id: ${{ vars.BOT_GITHUB_APP_ID }}
@@ -93,7 +97,7 @@ jobs:
9397
toolchain: helmfile
9498
environment: ${{ needs.setup.outputs.environment }}
9599
namespace: ${{ needs.setup.outputs.environment }}
96-
path: ./action/test/helmfile/helmfile.yaml
100+
path: ./action/test/helmfile/helmfile.yaml.gotmpl
97101
application: test-app
98102
ssm-path: platform/default
99103
github-pat: ${{ steps.github-app.outputs.token }}
@@ -121,15 +125,15 @@ jobs:
121125
environment: terratest
122126
needs: [setup]
123127
steps:
124-
- uses: actions/create-github-app-token@v2
128+
- uses: actions/create-github-app-token@v3
125129
id: github-app
126130
with:
127131
app-id: ${{ vars.BOT_GITHUB_APP_ID }}
128132
private-key: ${{ secrets.BOT_GITHUB_APP_PRIVATE_KEY }}
129133
owner: 'cloudposse-tests'
130134

131135
- name: Checkout Argo Configuration
132-
uses: actions/checkout@v3
136+
uses: actions/checkout@v6
133137
with:
134138
repository: cloudposse-tests/argocd-deploy-non-prod-test
135139
token: ${{ steps.github-app.outputs.token }}
@@ -182,7 +186,7 @@ jobs:
182186
with:
183187
repo: ${{ github.repository }}
184188
sha: ${{ github.sha }}
185-
token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}
189+
token: ${{ secrets.GITHUB_TOKEN }}
186190
status: success
187191
context: continuous-delivery/${{ needs.setup.outputs.environment }}.test-app
188192

@@ -207,15 +211,15 @@ jobs:
207211
actual: "${{ needs.test.outputs.sha }}"
208212
comparison: notEqual
209213

210-
- uses: actions/create-github-app-token@v2
214+
- uses: actions/create-github-app-token@v3
211215
id: github-app
212216
with:
213217
app-id: ${{ vars.BOT_GITHUB_APP_ID }}
214218
private-key: ${{ secrets.BOT_GITHUB_APP_PRIVATE_KEY }}
215219
owner: 'cloudposse-tests'
216220

217221
- name: Checkout Argo Configuration
218-
uses: actions/checkout@v3
222+
uses: actions/checkout@v6
219223
with:
220224
repository: cloudposse-tests/argocd-deploy-non-prod-test
221225
ref: ${{ needs.test.outputs.sha }}

‎README.md‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
**
1919
** This file was automatically generated by the `cloudposse/build-harness`.
2020
** 1) Make all changes to `README.yaml`
21-
** 2) Run `make init` (you only need to do this once)
22-
** 3) Run`make readme` to rebuild this file.
21+
** 2) Install [atmos](https://atmos.tools/install/) (you only need to do this once)
22+
** 3) Run`atmos readme` to rebuild this file.
2323
**
2424
** (We maintain HUNDREDS of open source projects. This is how we maintain our sanity.)
2525
**
@@ -148,18 +148,19 @@ Destroy environment
148148
| gitref-sha | Git SHA (Depricated. Use `ref` instead) | | false |
149149
| helm-args | Additional helm arguments | | false |
150150
| helm-dependency-build | Run helm dependency build, only for helm toolchain, `true` or `false` | false | false |
151-
| helm-version | Helm version | v3.10.2 | false |
151+
| helm-version | Helm version | v3.20.1 | false |
152152
| helmfile-args | Additional helmfile arguments | | false |
153-
| helmfile-version | Helmfile version | v0.148.1 | false |
153+
| helmfile-version | Helmfile version | v1.4.3 | false |
154154
| image | Docker image | N/A | true |
155155
| image-tag | Docker image tag | N/A | true |
156+
| kube-version | Kubernetes version for helm/helmfile rendering (e.g. `1.28`). When provided, skips SSM metadata lookup via chamber. | | false |
156157
| namespace | Kubernetes namespace | N/A | true |
157158
| operation | Operation with helmfiles. (valid options - `deploy`, `destroy`) | deploy | true |
158159
| path | The path where lives the helmfile or helm chart. | N/A | true |
159160
| ref | Git ref | N/A | true |
160161
| release\_label\_name | The name of the label used to describe the helm release | release | false |
161162
| repository | Application GitHub repository full name | N/A | true |
162-
| ssm-path | SSM path to read environment secrets | N/A | true |
163+
| ssm-path | SSM path to read environment secrets | | false |
163164
| synchronously | Wait until ArgoCD successfully apply the changes | false | false |
164165
| toolchain | Toolchain ('helm', 'helmfile') | helmfile | false |
165166
| values\_file | Helm values file, this can be a single file or a comma separated list of files | | false |
@@ -216,38 +217,6 @@ In general, PRs are welcome. We follow the typical "fork-and-pull" Git workflow.
216217

217218
**NOTE:** Be sure to merge the latest changes from "upstream" before making a pull request!
218219

219-
220-
## Running Terraform Tests
221-
222-
We use [Atmos](https://atmos.tools) to streamline how Terraform tests are run. It centralizes configuration and wraps common test workflows with easy-to-use commands.
223-
224-
All tests are located in the [`test/`](test) folder.
225-
226-
Under the hood, tests are powered by Terratest together with our internal [Test Helpers](https://github.com/cloudposse/test-helpers) library, providing robust infrastructure validation.
227-
228-
Setup dependencies:
229-
- Install Atmos ([installation guide](https://atmos.tools/install/))
230-
- Install Go [1.24+ or newer](https://go.dev/doc/install)
231-
- Install Terraform or OpenTofu
232-
233-
To run tests:
234-
235-
- Run all tests:
236-
```sh
237-
atmos test run
238-
```
239-
- Clean up test artifacts:
240-
```sh
241-
atmos test clean
242-
```
243-
- Explore additional test options:
244-
```sh
245-
atmos test --help
246-
```
247-
The configuration for test commands is centrally managed. To review what's being imported, see the [`atmos.yaml`](https://raw.githubusercontent.com/cloudposse/.github/refs/heads/main/.github/atmos/terraform-module.yaml) file.
248-
249-
Learn more about our [automated testing in our documentation](https://docs.cloudposse.com/community/contribute/automated-testing/) or implementing [custom commands](https://atmos.tools/core-concepts/custom-commands/) with atmos.
250-
251220
### 🌎 Slack Community
252221

253222
Join our [Open Source Community](https://cpco.io/slack?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/github-action-deploy-argocd&utm_content=slack) on Slack. It's **FREE** for everyone! Our "SweetOps" community is where you get to talk with others who share a similar vision for how to rollout and manage infrastructure. This is the best place to talk shop, ask questions, solicit feedback, and work together as a community to build totally *sweet* infrastructure.
@@ -298,7 +267,7 @@ All other trademarks referenced herein are the property of their respective owne
298267

299268

300269
---
301-
Copyright © 2017-2025 [Cloud Posse, LLC](https://cpco.io/copyright)
270+
Copyright © 2017-2026 [Cloud Posse, LLC](https://cpco.io/copyright)
302271

303272

304273
<a href="https://cloudposse.com/readme/footer/link?utm_source=github&utm_medium=readme&utm_campaign=cloudposse/github-action-deploy-argocd&utm_content=readme_footer_link"><img alt="README footer" src="https://cloudposse.com/readme/footer/img"/></a>

0 commit comments

Comments
 (0)