From ac5196d68497690a06b014d3f0825958826b0d9c Mon Sep 17 00:00:00 2001 From: Bruce Date: Fri, 27 Jun 2025 10:21:08 -0400 Subject: [PATCH 1/3] feat: use v1 externalsecrets clusterstore if available --- .../external-ssm-secrets/templates/ssm-secret-store.yaml | 4 ++++ src/main.tf | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/charts/external-ssm-secrets/templates/ssm-secret-store.yaml b/src/charts/external-ssm-secrets/templates/ssm-secret-store.yaml index a148267..7c3abd7 100644 --- a/src/charts/external-ssm-secrets/templates/ssm-secret-store.yaml +++ b/src/charts/external-ssm-secrets/templates/ssm-secret-store.yaml @@ -1,4 +1,8 @@ +{{ if $.Capabilities.APIVersions.Has "external-secrets.io/v1/ClusterSecretStore" -}} +apiVersion: external-secrets.io/v1 +{{- else -}} apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: ClusterSecretStore metadata: name: "secret-store-parameter-store" diff --git a/src/main.tf b/src/main.tf index bd79a04..27babc9 100644 --- a/src/main.tf +++ b/src/main.tf @@ -129,14 +129,6 @@ module "external_ssm_secrets" { values = compact([ yamlencode({ region = var.region, - parameter_store_paths = var.parameter_store_paths - resources = var.resources - serviceAccount = { - name = module.this.name - } - rbac = { - create = var.rbac_enabled - } }) ]) From dfe12f57dced15c85d53399fd3090017a2e35574 Mon Sep 17 00:00:00 2001 From: Bruce Date: Fri, 27 Jun 2025 10:39:31 -0400 Subject: [PATCH 2/3] remove $ --- src/charts/external-ssm-secrets/templates/ssm-secret-store.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/charts/external-ssm-secrets/templates/ssm-secret-store.yaml b/src/charts/external-ssm-secrets/templates/ssm-secret-store.yaml index 7c3abd7..b89e9bf 100644 --- a/src/charts/external-ssm-secrets/templates/ssm-secret-store.yaml +++ b/src/charts/external-ssm-secrets/templates/ssm-secret-store.yaml @@ -1,4 +1,4 @@ -{{ if $.Capabilities.APIVersions.Has "external-secrets.io/v1/ClusterSecretStore" -}} +{{ if .Capabilities.APIVersions.Has "external-secrets.io/v1/ClusterSecretStore" -}} apiVersion: external-secrets.io/v1 {{- else -}} apiVersion: external-secrets.io/v1beta1 From 2b16e1cbf96f40fb922b9cc8ed760549f8470d15 Mon Sep 17 00:00:00 2001 From: Bruce Date: Tue, 1 Jul 2025 11:06:53 -0400 Subject: [PATCH 3/3] fix: format --- src/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.tf b/src/main.tf index 27babc9..367bfad 100644 --- a/src/main.tf +++ b/src/main.tf @@ -128,7 +128,7 @@ module "external_ssm_secrets" { values = compact([ yamlencode({ - region = var.region, + region = var.region }) ])