From 31e23ce0e78d56f3e9ef051309edf9218541671c Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 27 Mar 2023 17:07:11 +0000 Subject: [PATCH] trying multi secret approach --- .../authellia/templates/secert-authellia.yaml | 19 ++++++++++++++++++- k8s/infra/authellia/values-prod.yaml | 12 ++++++++++++ k8s/infra/authellia/values.yaml | 14 -------------- k8s/infra/secrets/templates/secret-store.yaml | 19 +++++++++++++++++++ k8s/infra/secrets/templates/smtp.yaml | 9 +++++++++ k8s/infra/secrets/values.yaml | 2 ++ 6 files changed, 60 insertions(+), 15 deletions(-) create mode 100644 k8s/infra/secrets/templates/secret-store.yaml create mode 100644 k8s/infra/secrets/templates/smtp.yaml diff --git a/k8s/infra/authellia/templates/secert-authellia.yaml b/k8s/infra/authellia/templates/secert-authellia.yaml index 2307ba4..04b7317 100644 --- a/k8s/infra/authellia/templates/secert-authellia.yaml +++ b/k8s/infra/authellia/templates/secert-authellia.yaml @@ -11,7 +11,24 @@ spec: target: name: "{{ .Values.authelia.secret.existingSecret }}" data: - - secretKey: "password" + - secretKey: "STORAGE_PASSWORD" remoteRef: key: "password.pg.authelia" property: password +--- +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: "{{ .Values.authelia.secret.existingSecret }}" +spec: + refreshInterval: 1h + secretStoreRef: + kind: ClusterSecretStore + name: secrets + target: + name: "{{ .Values.authelia.secret.existingSecret }}" + data: + - secretKey: "SMTP_PASSWORD" + remoteRef: + key: "smtp" + property: password diff --git a/k8s/infra/authellia/values-prod.yaml b/k8s/infra/authellia/values-prod.yaml index e69de29..c403cae 100644 --- a/k8s/infra/authellia/values-prod.yaml +++ b/k8s/infra/authellia/values-prod.yaml @@ -0,0 +1,12 @@ +authelia: + notifier: + disable_startup_check: false + smtp: + enabled: true + enabledSecret: true + username: arielsosnovsky@gmail.com + sender: authellia@sosnovsky.ca + host: smtp.gmail.com + port: 587 + filesystem: + enabled: false diff --git a/k8s/infra/authellia/values.yaml b/k8s/infra/authellia/values.yaml index a9e711f..bb1e183 100644 --- a/k8s/infra/authellia/values.yaml +++ b/k8s/infra/authellia/values.yaml @@ -39,7 +39,6 @@ authelia: enabled: true theme: dark - ## The available providers are: `local`, `mysql`, `postgres`. You must use one and only one of these providers. storage: postgres: enabled: true @@ -54,19 +53,6 @@ authelia: disable_startup_check: false smtp: enabled: false - enabledSecret: false - host: smtp.mail.svc.cluster.local - port: 25 - timeout: 5s - username: test - sender: admin@example.com - identifier: localhost - startup_check_address: test@authelia.com - disable_require_tls: false - disable_starttls: false - tls: - server_name: "" - skip_verify: false filesystem: enabled: true filename: /config/notification.txt diff --git a/k8s/infra/secrets/templates/secret-store.yaml b/k8s/infra/secrets/templates/secret-store.yaml new file mode 100644 index 0000000..100bb76 --- /dev/null +++ b/k8s/infra/secrets/templates/secret-store.yaml @@ -0,0 +1,19 @@ +--- +apiVersion: external-secrets.io/v1beta1 +kind: ClusterSecretStore +metadata: + name: secrets +spec: + provider: + kubernetes: + remoteNamespace: "{{ .Release.Namespace }}" + server: + caProvider: + type: ConfigMap + name: kube-root-ca.crt + key: ca.crt + namespace: "{{ .Release.Namespace }}" + auth: + serviceAccount: + name: "{{ .Release.Namespace }}" + namespace: "{{ .Release.Namespace }}" diff --git a/k8s/infra/secrets/templates/smtp.yaml b/k8s/infra/secrets/templates/smtp.yaml new file mode 100644 index 0000000..9f86151 --- /dev/null +++ b/k8s/infra/secrets/templates/smtp.yaml @@ -0,0 +1,9 @@ +# TODO: auto fill this from a vault +--- +apiVersion: v1 +kind: Secret +type: Opaque +metadata: + name: smtp +data: + email: "{{ .Values.smtp.emailFrom }}" diff --git a/k8s/infra/secrets/values.yaml b/k8s/infra/secrets/values.yaml index e69de29..6dee6b5 100644 --- a/k8s/infra/secrets/values.yaml +++ b/k8s/infra/secrets/values.yaml @@ -0,0 +1,2 @@ +smtp: + emailFrom: "ariel.sosnovsky@gmail.com"