From 0ceceb4eb05d121117c6faf37ee988d34b1429e5 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Fri, 3 Jun 2022 11:53:16 +0200 Subject: [PATCH] feat: secrets --- README.md | 9 ++++++ docs/architecture_view.drawio | 1 + docs/architecture_view.svg | 3 ++ smardigo/templates/connect/deployment.yml | 38 +++++++++++++++++++---- smardigo/templates/connect/secret.yml | 8 +++++ 5 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 README.md create mode 100644 docs/architecture_view.drawio create mode 100644 docs/architecture_view.svg diff --git a/README.md b/README.md new file mode 100644 index 0000000..7570290 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# Smardigo Mobene + +## Description + +## Development + +## Architektur + +![architecture view](docs/architecture_view.svg "architecture view") diff --git a/docs/architecture_view.drawio b/docs/architecture_view.drawio new file mode 100644 index 0000000..0cc5d86 --- /dev/null +++ b/docs/architecture_view.drawio @@ -0,0 +1 @@ +3Zpdb5swFIZ/TS6RwE4I3DZpu3Wqqo11k3bngPlQTIyMk8B+/UxjmsBJpUzL6sJVzGsD9mPLPu8hE7zIq3tBivSRR5RNkB1VE7ycIOT4vqt+GqXWiu34ByURWaS1oxBkv2nbUKvbLKJlp6HknMms6Ioh32xoKDsaEYLvu81izrpvLUhCgRCEhEH1ZxbJ9KB6aH7UP9EsSds3O64eX07axnokZUoivj+R8O0ELwTn8lDKqwVlDb2Wy+G+uzdqXzsm6EZecoP7dXn3sPtRLYTkTw/xXYA/P1r6KTvCtnrALchDn2XdghB8u4lo8yx7gm/2aSZpUJCwqd2ruVdaKnOmrhxVjDPGFpxx8XIvjuMYhaHSSyn4mp7URO7KnbmqBo6m7RoVklYnkh7dPeU5laJWTXQtsjVpvdawq6/3x4lzWi09mTRPa0SvleT10UecqqCJ/gXdGaC7pAXjdd4M8pqAI0K9+CxgN/ToKr4O4Om0CxjN3xEw+vUlq2+e48dvPKm/e89Py11gIQCYMlLKLDSzfAHKM8AvXr7TmWm6GNDNSD4CsrOpabJTQDYnIiMjYOti02zhplvwUiZCRRHDxztHpvG6AG9JC2LRquBqnGIEjD3HNOM5YLxdjQqxb5tG7AHEey6iQu0SY9gmfN80Xx/wDajYZeGVd+GLA9+r4jUf+LZb1Anf20rtDZvrLl4vpOcX78qbNfHpVehaH85WONAWv8Rnlu2MgK/5EM2Bvq2N0caB2HyY5kDzpq2xVUoSrq32quHtMtWdm5WKLNykKb3REl3cEo9gDs37bwceokazc/+Et588etfs3PnkETxDh5nf6KM1n99A8AAdukvsQzbvEhE8RQduE/uMzdtEBI/RIftEANi4T0QwFbqmdcg4WY8jFHRszzhjmBINaCioHKIXd70uX/NuEcGU6HDDtD7eDxCmwWzoMMO0PtoPEKbBLOhwv5/28Zr3bwj6t6F+5uvDNZ9Dajswju98fb7mE0gYWrghR759wOYjXzw6+wYYG7dvGNq3oech+pD/Zx5CXR7/n/hSd/I3T3z7Bw== \ No newline at end of file diff --git a/docs/architecture_view.svg b/docs/architecture_view.svg new file mode 100644 index 0000000..bb0da19 --- /dev/null +++ b/docs/architecture_view.svg @@ -0,0 +1,3 @@ + + +
connect
connect
Deployment
Deployment
elastic
elastic
iam
iam
maria
maria
postgres
postgres
sepa-exporter
sepa-exporter
uba-exporter
uba-exporter
wordpress
wordpress
Services
Services
Extern
Extern
maria-01
maria-01
postgres-01
postgres-01
elastic-stack-elastic-01
elastic-stack-elastic-02
elastic-stack-elastic-03
elastic-stack-elastic-01...
connect
connect
iam
iam
sepa-exporter
sepa-exporter
uba-exporter
uba-exporter
wordpress
wordpress
keycloak-01
keycloak-01
Secrets
Secrets
connect
connect
iam
iam
elastic
elastic
maria
maria
postgres
postgres
wordpress
wordpress
uba-exporter
uba-exporter
sepa-exporter
sepa-exporterViewer does not support full SVG 1.1 \ No newline at end of file diff --git a/smardigo/templates/connect/deployment.yml b/smardigo/templates/connect/deployment.yml index de96c7a..0780e06 100644 --- a/smardigo/templates/connect/deployment.yml +++ b/smardigo/templates/connect/deployment.yml @@ -47,7 +47,10 @@ spec: - name: ADMIN_LOGIN value: "{{ .Values.connect.admin.username }}" - name: ADMIN_PASSWORD - value: "{{ .Values.connect.admin.password }}" + valueFrom: + secretKeyRef: + name: "connect-secrets" + key: ADMIN_PASSWORD - name: SMA_JWT_ENABLED value: "True" - name: SMA_JWT_SECRET @@ -62,18 +65,30 @@ spec: - name: DATASOURCE_URL value: "jdbc:postgresql://{{ .Values.connect.database.host }}:{{ .Values.connect.database.port }}/{{ .Values.connect.database.name }}" - name: DATASOURCE_USERNAME - value: "{{ .Values.connect.database.username }}" + valueFrom: + secretKeyRef: + name: "connect-secrets" + key: DATASOURCE_USERNAME - name: DATASOURCE_PASSWORD - value: "{{ .Values.connect.database.password }}" + valueFrom: + secretKeyRef: + name: "connect-secrets" + key: DATASOURCE_PASSWORD - name: ELASTIC_HOST value: "{{ .Values.connect.elastic.host }}" - name: ELASTIC_PREFIX value: "{{ .Release.Name }}-connect" - name: ELASTIC_USERNAME - value: "{{ .Values.connect.elastic.username }}" + valueFrom: + secretKeyRef: + name: "connect-secrets" + key: ELASTIC_USERNAME - name: ELASTIC_PASSWORD - value: "{{ .Values.connect.elastic.password }}" + valueFrom: + secretKeyRef: + name: "connect-secrets" + key: ELASTIC_PASSWORD - name: ELASTIC_CA value: "file:/usr/share/smardigo/ca.crt" @@ -82,7 +97,10 @@ spec: - name: OIDC_CLIENT_ID value: "{{ .Values.connect.oidc.client_id }}" - name: OIDC_CLIENT_SECRET - value: "{{ .Values.connect.oidc.client_secret }}" + valueFrom: + secretKeyRef: + name: "connect-secrets" + key: OIDC_CLIENT_SECRET - name: OIDC_REGISTRATION_ID value: "{{ .Values.connect.oidc.registration_id }}" - name: OIDC_ISSUER_URI @@ -102,8 +120,16 @@ spec: - name: MAIL_PORT value: "{{ .Values.connect.mail.post }}" - name: MAIL_USER + valueFrom: + secretKeyRef: + name: "connect-secrets" + key: MAIL_USER value: "{{ .Values.connect.mail.username }}" - name: MAIL_PASSWORD + valueFrom: + secretKeyRef: + name: "connect-secrets" + key: MAIL_PASSWORD value: "{{ .Values.connect.mail.password }}" - name: MAIL_PROPERTIES_SIMULATION value: "{{ .Values.connect.mail.properties.simulation }}" diff --git a/smardigo/templates/connect/secret.yml b/smardigo/templates/connect/secret.yml index 15ba809..578a6aa 100644 --- a/smardigo/templates/connect/secret.yml +++ b/smardigo/templates/connect/secret.yml @@ -5,3 +5,11 @@ metadata: name: connect-secrets data: JWT_SECRET: "{{ .Values.connect.jwt.secret | b64enc }}" + ADMIN_PASSWORD: "{{ .Values.connect.database.password | b64enc}}" + DATASOURCE_USERNAME: "{{ .Values.connect.database.username | b64enc }}" + DATASOURCE_PASSWORD: "{{ .Values.connect.database.password | b64enc }}" + ELASTIC_USERNAME: "{{ .Values.connect.database.username | b64enc }}" + ELASTIC_PASSWORD: "{{ .Values.connect.database.password | b64enc }}" + OIDC_CLIENT_SECRET: "{{ .Values.connect.oidc.client_secret | b64enc }}" + MAIL_USER: "{{ .Values.connect.mail.username | b64enc }}" + MAIL_PASSWORD: "{{ .Values.connect.mail.password | b64enc }}"