diff --git a/k8s/argoapps/templates/secrets.yaml b/k8s/argoapps/templates/secrets.yaml index e40711d..a958871 100644 --- a/k8s/argoapps/templates/secrets.yaml +++ b/k8s/argoapps/templates/secrets.yaml @@ -1,15 +1,9 @@ -{{ $secretsNS := .Values.secrets.namespace }} ---- -apiVersion: v1 -kind: Namespace -metadata: - name: "{{ $secretsNS }}" - +{{ range $secretsNS, $secrets := .Values.secrets }} --- apiVersion: external-secrets.io/v1beta1 kind: ClusterSecretStore metadata: - name: secrets + name: {{ $secretsNS }} spec: provider: kubernetes: @@ -26,7 +20,7 @@ spec: namespace: {{ $secretsNS }} -{{ range $key, $value := .Values.secrets.named }} +{{ range $key, $value := $secrets.named }} --- apiVersion: v1 kind: Secret @@ -39,3 +33,5 @@ metadata: data: _placeholder: "" {{ end }} + +{{ end }} diff --git a/k8s/argocd/values/shared/infrastructureCharts.yaml b/k8s/argocd/values/shared/infrastructureCharts.yaml index 0e5ca8f..1b9addc 100644 --- a/k8s/argocd/values/shared/infrastructureCharts.yaml +++ b/k8s/argocd/values/shared/infrastructureCharts.yaml @@ -35,7 +35,7 @@ infrastructureCharts: auth: secretKeys: adminPasswordKey: password - existingSecret: "{{ .Values.secrets.named.dbmain.name }}" + existingSecret: "{{ .Values.secrets.chart-database.dbmain.name }}" architecture: standalone postgresqlDataDir: /bitnami/postgresql/data primary: diff --git a/k8s/argocd/values/shared/secrets.yaml b/k8s/argocd/values/shared/secrets.yaml index 5abe497..aabd3c0 100644 --- a/k8s/argocd/values/shared/secrets.yaml +++ b/k8s/argocd/values/shared/secrets.yaml @@ -1,5 +1,4 @@ secrets: - namespace: "secrets" - named: + chart-database: dbmain: name: "pg.password"