From e5f3493b06a8fdad586ea04eb79ce4902cb120ff Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 15 Apr 2023 04:30:02 +0000 Subject: [PATCH] trying something --- k8s/argoapps/templates/secrets.yaml | 16 ++++++++-------- .../values/shared/infrastructureCharts.yaml | 2 +- k8s/argocd/values/shared/secrets.yaml | 8 +++++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/k8s/argoapps/templates/secrets.yaml b/k8s/argoapps/templates/secrets.yaml index a958871..4b3c34b 100644 --- a/k8s/argoapps/templates/secrets.yaml +++ b/k8s/argoapps/templates/secrets.yaml @@ -1,33 +1,33 @@ -{{ range $secretsNS, $secrets := .Values.secrets }} +{{ range $_, $secretsData := .Values.secrets }} --- apiVersion: external-secrets.io/v1beta1 kind: ClusterSecretStore metadata: - name: {{ $secretsNS }} + name: {{ $secretsData.namespace }} spec: provider: kubernetes: - remoteNamespace: {{ $secretsNS }} + remoteNamespace: {{ $secretsData.namespace }} server: caProvider: type: ConfigMap name: kube-root-ca.crt key: ca.crt - namespace: {{ $secretsNS }} + namespace: {{ $secretsData.namespace }} auth: serviceAccount: - name: {{ $secretsNS }} - namespace: {{ $secretsNS }} + name: {{ $secretsData.namespace }} + namespace: {{ $secretsData.namespace }} -{{ range $key, $value := $secrets.named }} +{{ range $key, $value := $secretsData.secrets }} --- apiVersion: v1 kind: Secret type: Opaque metadata: name: {{ $value.name }} - namespace: {{ $secretsNS }} + namespace: {{ $secretsData.namespace }} annotations: homelab-secret/type: "externally-filled" data: diff --git a/k8s/argocd/values/shared/infrastructureCharts.yaml b/k8s/argocd/values/shared/infrastructureCharts.yaml index 1b9addc..4d69af3 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.chart-database.dbmain.name }}" + existingSecret: "{{ .Values.secrets.database.secrets.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 aabd3c0..45b9c55 100644 --- a/k8s/argocd/values/shared/secrets.yaml +++ b/k8s/argocd/values/shared/secrets.yaml @@ -1,4 +1,6 @@ secrets: - chart-database: - dbmain: - name: "pg.password" + database: + namespace: chart-database + secrets: + dbmain: + name: "pg.password"