Skip to content

feat(base): pass cloudwatch service account annotations for IRSA support #441

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.

Sign up for GitHub

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

Merged
davidf-null merged 2 commits into from
Jul 16, 2026
Merged

feat(base): pass cloudwatch service account annotations for IRSA support #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5822fc7
feat(base): pass cloudwatch service account annotations for IRSA support
Jul 16, 2026
bd2de50
fix(base): gate cloudwatch SA annotations on cloudwatch_enabled
Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions nullplatform/base/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ resource "example_resource" "this" {
| <a name="input_cloudwatch_enabled"></a> [cloudwatch\_enabled](#input\_cloudwatch\_enabled) | Enable CloudWatch (global switch). | `bool` | `false` | no |
| <a name="input_cloudwatch_logs_enabled"></a> [cloudwatch\_logs\_enabled](#input\_cloudwatch\_logs\_enabled) | Enable log forwarding to CloudWatch. | `bool` | `false` | no |
| <a name="input_cloudwatch_performance_metrics_enabled"></a> [cloudwatch\_performance\_metrics\_enabled](#input\_cloudwatch\_performance\_metrics\_enabled) | Enable performance metrics in CloudWatch. | `bool` | `false` | no |
| <a name="input_cloudwatch_service_account_annotations"></a> [cloudwatch\_service\_account\_annotations](#input\_cloudwatch\_service\_account\_annotations) | Annotations for the logs controller ServiceAccount (nullplatform-pod-metadata-reader-sa). Rendered only when cloudwatch\_enabled is true. Set eks.amazonaws.com/role-arn here to use IRSA instead of the node instance role. | `map(string)` | `{}` | no |
| <a name="input_control_plane_enabled"></a> [control\_plane\_enabled](#input\_control\_plane\_enabled) | Enable the control plane. | `bool` | `false` | no |
| <a name="input_datadog_api_key"></a> [datadog\_api\_key](#input\_datadog\_api\_key) | Datadog API key. | `string` | `""` | no |
| <a name="input_datadog_enabled"></a> [datadog\_enabled](#input\_datadog\_enabled) | Enable Datadog integration. | `bool` | `false` | no |
Expand Down Expand Up @@ -482,6 +483,11 @@ resource "example_resource" "this" {
"description": "Enable access logs in CloudWatch.",
"required": false
},
{
"name": "cloudwatch_service_account_annotations",
"description": "Annotations for the logs controller ServiceAccount (nullplatform-pod-metadata-reader-sa). Rendered only when cloudwatch_enabled is true. Set eks.amazonaws.com/role-arn here to use IRSA instead of the node instance role.",
"required": false
},
{
"name": "metrics_server_enabled",
"description": "Enable the metrics server.",
Expand Down
11 changes: 6 additions & 5 deletions nullplatform/base/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,12 @@ locals {
newrelic_region = var.newrelic_region

# ---- cloudwatch ----
cloudwatch_enabled = var.cloudwatch_enabled ? "true" : "false"
cloudwatch_logs_enabled = var.cloudwatch_logs_enabled ? "true" : "false"
cloudwatch_performancemetrics_enabled = var.cloudwatch_performance_metrics_enabled ? "true" : "false"
cloudwatch_custommetrics_enabled = var.cloudwatch_custom_metrics_enabled ? "true" : "false"
cloudwatch_accesslogs_enabled = var.cloudwatch_access_logs_enabled ? "true" : "false"
cloudwatch_enabled = var.cloudwatch_enabled ? "true" : "false"
cloudwatch_logs_enabled = var.cloudwatch_logs_enabled ? "true" : "false"
cloudwatch_performancemetrics_enabled = var.cloudwatch_performance_metrics_enabled ? "true" : "false"
cloudwatch_custommetrics_enabled = var.cloudwatch_custom_metrics_enabled ? "true" : "false"
cloudwatch_accesslogs_enabled = var.cloudwatch_access_logs_enabled ? "true" : "false"
cloudwatch_service_account_annotations = var.cloudwatch_service_account_annotations

# ---- metrics server ----
metricsserver_enabled = var.metrics_server_enabled ? "true" : "false"
Expand Down
7 changes: 7 additions & 0 deletions nullplatform/base/templates/nullplatform_base_values.tmpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,13 @@ cloudwatch:
enabled: ${cloudwatch_custommetrics_enabled}
accessLogs:
enabled: ${cloudwatch_accesslogs_enabled}
%{ if cloudwatch_enabled == "true" && length(cloudwatch_service_account_annotations) > 0 ~}
serviceAccount:
annotations:
%{ for key, value in cloudwatch_service_account_annotations ~}
${key}: "${value}"
%{ endfor ~}
%{ endif ~}
# Metrics server configuration
metricsServer:
enabled: ${metricsserver_enabled}
Expand Down
6 changes: 6 additions & 0 deletions nullplatform/base/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,12 @@ variable "cloudwatch_access_logs_enabled" {
default = false
}

variable "cloudwatch_service_account_annotations" {
type = map(string)
description = "Annotations for the logs controller ServiceAccount (nullplatform-pod-metadata-reader-sa). Rendered only when cloudwatch_enabled is true. Set eks.amazonaws.com/role-arn here to use IRSA instead of the node instance role."
default = {}
}

############################################
# Metrics Server
############################################
Expand Down