Skip to content

Commit b0b57ac

Browse files
authored
feat: GitHub App Support (#16)
* upstream changes for argo cd * upstream changes for argo cd * changelog * correct ingress class
1 parent 3971671 commit b0b57ac

File tree

10 files changed

+179
-45
lines changed

10 files changed

+179
-45
lines changed

src/CHANGELOG.md

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## `aws-eks-argocd` Component PR [#16](https://github.com/cloudposse-terraform-components/aws-eks-argocd/pull/16)
2+
3+
Corrected the spelling of "succeded" to "succeeded" in the `on-deploy-succeded` notification. As a result, the `argocd-repo` component will need to be updated to correct the same spelling in the Argo CD desired state repository application set.
4+
5+
See the [PR for argocd-repo](https://github.com/cloudposse-terraform-components/aws-argocd-github-repo/pull/17)
6+
17
## Components PR [#905](https://github.com/cloudposse/terraform-aws-components/pull/905)
28

39
The `notifications.tf` file has been renamed to `notifications.tf`. Delete `notifications.tf` after vendoring these
@@ -10,22 +16,22 @@ This is a bug fix and feature enhancement update. There are few actions necessar
1016
## Upgrade actions
1117

1218
1. Update atmos stack yaml config
13-
1. Add `github_default_notifications_enabled: true`
14-
2. Add `github_webhook_enabled: true`
15-
3. Remove `notifications_triggers`
16-
4. Remove `notifications_templates`
17-
5. Remove `notifications_notifiers`
19+
1. Add `github_default_notifications_enabled: true`
20+
2. Add `github_webhook_enabled: true`
21+
3. Remove `notifications_triggers`
22+
4. Remove `notifications_templates`
23+
5. Remove `notifications_notifiers`
1824

1925
```diff
2026
components:
21-
terraform:
22-
argocd:
23-
settings:
24-
spacelift:
25-
workspace_enabled: true
26-
metadata:
27-
component: eks/argocd
28-
vars:
27+
terraform:
28+
argocd:
29+
settings:
30+
spacelift:
31+
workspace_enabled: true
32+
metadata:
33+
component: eks/argocd
34+
vars:
2935
+ github_default_notifications_enabled: true
3036
+ github_webhook_enabled: true
3137
- notifications_triggers:
@@ -49,7 +55,7 @@ This is a bug fix and feature enhancement update. There are few actions necessar
4955
```
5056

5157
2. Move secrets from `/argocd/notifications/notifiers/service_webhook_github-commit-status/github-token` to
52-
`argocd/notifications/notifiers/common/github-token`
58+
`argocd/notifications/notifiers/common/github-token`
5359

5460
```bash
5561
chamber read -q argocd/notifications/notifiers/service_webhook_github-commit-status github-token | chamber write argocd/notifications/notifiers/common github-token

src/README.md

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

src/context.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ variable "descriptor_formats" {
264264
Describe additional descriptors to be output in the `descriptors` output map.
265265
Map of maps. Keys are names of descriptors. Values are maps of the form
266266
`{
267-
format = string
268-
labels = list(string)
267+
format = string
268+
labels = list(string)
269269
}`
270270
(Type is `any` so the map values can later be enhanced to provide additional options.)
271271
`format` is a Terraform format string to be passed to the `format()` function.

src/main.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ locals {
5151
value = data.aws_ssm_parameter.slack_notifications[0].value
5252
type = "string"
5353
}
54+
] : [],
55+
var.github_notifications_app_enabled ? [
56+
{
57+
name = "notifications.secret.items.github-privateKey"
58+
value = data.aws_ssm_parameter.github_notifications_app_private_key[0].value
59+
type = "string"
60+
}
5461
] : []
5562
))
5663
regional_service_discovery_domain = "${module.this.environment}.${module.dns_gbl_delegated.outputs.default_domain_name}"

0 commit comments

Comments
 (0)