Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 19 additions & 10 deletions terraform/layer2-k8s/eks-external-secrets.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,28 @@ locals {
enabled = local.helm_releases[index(local.helm_releases.*.id, "external-secrets")].enabled
chart = local.helm_releases[index(local.helm_releases.*.id, "external-secrets")].chart
repository = local.helm_releases[index(local.helm_releases.*.id, "external-secrets")].repository
chart_version = local.helm_releases[index(local.helm_releases.*.id, "external-secrets")].version
chart_version = local.helm_releases[index(local.helm_releases.*.id, "external-secrets")].chart_version
namespace = local.helm_releases[index(local.helm_releases.*.id, "external-secrets")].namespace
}
}
external_secrets_values = <<VALUES
# Environment variables to set on deployment pod
env:
AWS_REGION: ${local.region}
AWS_DEFAULT_REGION: ${local.region}
POLLER_INTERVAL_MILLISECONDS: 30000
# trace, debug, info, warn, error, fatal
LOG_LEVEL: warn
LOG_MESSAGE_KEY: 'msg'
METRICS_PORT: 3001

data "template_file" "external_secrets" {
count = local.external_secrets.enabled ? 1 : 0
serviceAccount:
annotations:
"eks.amazonaws.com/role-arn": ${local.external_secrets.enabled ? module.aws_iam_external_secrets[0].role_arn : ""}

template = file("${path.module}/templates/external-secrets-values.yaml")
vars = {
role_arn = module.aws_iam_external_secrets[count.index].role_arn
region = local.region
}
securityContext:
# Required for use of IRSA, see https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts-technical-overview.html
fsGroup: 1000
VALUES
}

#tfsec:ignore:kubernetes-network-no-public-egress tfsec:ignore:kubernetes-network-no-public-ingress
Expand Down Expand Up @@ -99,7 +108,7 @@ resource "helm_release" "external_secrets" {
max_history = var.helm_release_history_size

values = [
data.template_file.external_secrets[count.index].rendered,
local.external_secrets_values
]

}
2 changes: 1 addition & 1 deletion terraform/layer2-k8s/helm-releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ releases:
enabled: true
chart: kubernetes-external-secrets
repository: https://external-secrets.github.io/kubernetes-external-secrets
version: 6.3.0
chart_version: 6.3.0
namespace: external-secrets
- id: gitlab-runner
enabled: false
Expand Down
17 changes: 0 additions & 17 deletions terraform/layer2-k8s/templates/external-secrets-values.yaml

This file was deleted.