From c62659ed384ea5a014445d2c494809ff230b7ee3 Mon Sep 17 00:00:00 2001 From: "Schiller, Tjorben" Date: Mon, 1 Jul 2024 17:36:24 +0200 Subject: [PATCH] feat: cleanup, fix postgres connection BREAKING CHANGE: remove or disable cluster specific resources --- .gitignore | 1 + README.md | 53 ++++++++------ demo-backend.values.yaml | 58 --------------- demo-frontend.values.yaml | 33 --------- .../charts/backend/charts/common-2.2.4.tgz | Bin 12364 -> 0 bytes .../charts/frontend/templates/configMap.yml | 9 --- .../resources/templates/postgresql.yaml | 11 --- .../charts/resources/values.yaml | 12 ---- .../.helmignore | 0 .../Chart.lock | 6 +- .../Chart.yaml | 0 .../charts/common-2.20.3.tgz | Bin 0 -> 16079 bytes .../charts/postgresql-12.1.2.tgz | Bin .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/deployment.yaml | 15 ++-- .../templates/hpa.yaml | 0 .../templates/ingress.yaml | 0 .../templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../values.yaml | 66 +----------------- .../.helmignore | 0 .../Chart.yaml | 0 .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/deployment.yaml | 20 ++---- .../templates/hpa.yaml | 0 .../templates/ingress.yaml | 0 .../templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 .../values.yaml | 0 .../Chart.yaml | 0 .../templates/_helpers.tpl | 0 .../templates/observability.yaml | 6 +- .../templates/traefik.yaml | 0 .../charts/terminfinder-resources/values.yaml | 8 +++ terminfinder-chart/values.yaml | 63 ++++------------- 37 files changed, 79 insertions(+), 282 deletions(-) delete mode 100644 demo-backend.values.yaml delete mode 100644 demo-frontend.values.yaml delete mode 100644 terminfinder-chart/charts/backend/charts/common-2.2.4.tgz delete mode 100644 terminfinder-chart/charts/frontend/templates/configMap.yml delete mode 100644 terminfinder-chart/charts/resources/templates/postgresql.yaml delete mode 100644 terminfinder-chart/charts/resources/values.yaml rename terminfinder-chart/charts/{backend => terminfinder-backend}/.helmignore (100%) rename terminfinder-chart/charts/{backend => terminfinder-backend}/Chart.lock (53%) rename terminfinder-chart/charts/{backend => terminfinder-backend}/Chart.yaml (100%) create mode 100644 terminfinder-chart/charts/terminfinder-backend/charts/common-2.20.3.tgz rename terminfinder-chart/charts/{backend => terminfinder-backend}/charts/postgresql-12.1.2.tgz (100%) rename terminfinder-chart/charts/{backend => terminfinder-backend}/templates/NOTES.txt (100%) rename terminfinder-chart/charts/{backend => terminfinder-backend}/templates/_helpers.tpl (100%) rename terminfinder-chart/charts/{backend => terminfinder-backend}/templates/deployment.yaml (87%) rename terminfinder-chart/charts/{backend => terminfinder-backend}/templates/hpa.yaml (100%) rename terminfinder-chart/charts/{backend => terminfinder-backend}/templates/ingress.yaml (100%) rename terminfinder-chart/charts/{backend => terminfinder-backend}/templates/service.yaml (100%) rename terminfinder-chart/charts/{backend => terminfinder-backend}/templates/serviceaccount.yaml (100%) rename terminfinder-chart/charts/{backend => terminfinder-backend}/values.yaml (67%) rename terminfinder-chart/charts/{frontend => terminfinder-frontend}/.helmignore (100%) rename terminfinder-chart/charts/{frontend => terminfinder-frontend}/Chart.yaml (100%) rename terminfinder-chart/charts/{frontend => terminfinder-frontend}/templates/NOTES.txt (100%) rename terminfinder-chart/charts/{frontend => terminfinder-frontend}/templates/_helpers.tpl (100%) rename terminfinder-chart/charts/{frontend => terminfinder-frontend}/templates/deployment.yaml (78%) rename terminfinder-chart/charts/{frontend => terminfinder-frontend}/templates/hpa.yaml (100%) rename terminfinder-chart/charts/{frontend => terminfinder-frontend}/templates/ingress.yaml (100%) rename terminfinder-chart/charts/{frontend => terminfinder-frontend}/templates/service.yaml (100%) rename terminfinder-chart/charts/{frontend => terminfinder-frontend}/templates/serviceaccount.yaml (100%) rename terminfinder-chart/charts/{frontend => terminfinder-frontend}/values.yaml (100%) rename terminfinder-chart/charts/{resources => terminfinder-resources}/Chart.yaml (100%) rename terminfinder-chart/charts/{resources => terminfinder-resources}/templates/_helpers.tpl (100%) rename terminfinder-chart/charts/{resources => terminfinder-resources}/templates/observability.yaml (81%) rename terminfinder-chart/charts/{resources => terminfinder-resources}/templates/traefik.yaml (100%) create mode 100644 terminfinder-chart/charts/terminfinder-resources/values.yaml diff --git a/.gitignore b/.gitignore index 485dee6..b17f7cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .idea +terminfinder-chart/Chart.lock diff --git a/README.md b/README.md index 574c9cc..8451be0 100644 --- a/README.md +++ b/README.md @@ -10,16 +10,12 @@ Complete Helm Chart repository for deploying the Terminfinder to any kubernetes [SECURITY.md](./docs/SECURITY.md) -## Components +It's recommended to use a dedicated PostgreSQL instance for production usage. -* Frontend: `registry.opencode.de/ig-bvc/demo-apps/terminfinder-sh/terminfinder-sh-frontend:v2.2.0` -* Backend: `registry.opencode.de/ig-bvc/demo-apps/terminfinder-sh/terminfinder-sh-backend:V1.0.9` -* Postgres (part of Backend): - Using [this public Helm chart](https://github.com/bitnami/charts/tree/main/bitnami/postgresql/) as fundament, but can - be disabled through `values.yaml` of the backend file. +## Local development -Please modify the `values.yaml` files or use the CLI method for deployment and configuration. It's recommended to use a -dedicated PostgreSQL instance for production usage. +1. install and run minikube or other local K8s services https://kubernetes.io/docs/tasks/tools/ +2. use scripts in installation below ## Installation @@ -38,31 +34,48 @@ dedicated PostgreSQL instance for production usage. ### Installation steps -1. Prepare the value files for the backend and frontend each. -2. Install the helm charts with `helm install ...` CLI Command +1. Prepare the value files. +2. Install the helm charts with `helm install ...` CLI Command: ```bash # Create a namespace (or use default), where to work in: -$ kubectl create ns terminfinder-demo +$ kubectl create namespace terminfinder-demo # First installing the helm chart, to the name -$ helm install terminfinder-backend ./charts/terminfinder-backend -n terminfinder-demo -f demo-backend.values.yaml - -# Second installing the helm chart of the frontend -$ helm install terminfinder-frontend ./charts/terminfinder-frontend -n terminfinder-demo -f demo-frontend.values.yaml +$ helm install terminfinder-demo terminfinder-chart -n terminfinder-demo # Verify installation of helm charts: $ helm list -n terminfinder-demo $ kubectl get deploy -n terminfinder-demo +``` + +### Upgrade release + +To upgrade the helm chart, use the `helm upgrade ...` command: -# Go to your configured ingress host domain (e.g. terminfinder.open-code.local) and test it out! -# The URL of the ingresses you can get here: -$ kubectl get ingress -n terminfinder-demo +```bash +# Upgrade HelmChart +$ helm upgrade terminfinder-demo terminfinder-chart -n terminfinder-demo ``` -Your can upgrade the helm chart as usually with `helm upgrade ...` command. +### Delete Release + +To delete the helm chart (release), use the `helm uninstall...` command. + +Note that the persistent volume may be available even if the helm release is uninstalled. + +```bash +# Delete release +$ helm uninstall terminfinder-demo -n terminfinder-demo +``` + +```bash +# Delete PVCs and namespace +$ kubectl delete pvc --all -n terminfinder-demo +$ kubectl delete namespace terminfinder-demo +``` -### Using an own PostgreSQL DB instance +## Using an own PostgreSQL DB instance The helm chart deployment of the `terminfinder-frontend` will be kept untouched. diff --git a/demo-backend.values.yaml b/demo-backend.values.yaml deleted file mode 100644 index e45b8b1..0000000 --- a/demo-backend.values.yaml +++ /dev/null @@ -1,58 +0,0 @@ -replicaCount: 1 - -ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/rewrite-target: "/$2" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-origin: "https://terminfinder.opencode.local" - nginx.ingress.kubernetes.io/ssl-redirect: "true" - cert-manager.io/cluster-issuer: selfsigned # More here: https://cert-manager.io/docs/configuration/selfsigned/#deployment - hosts: - # For this demo, we create a local dns entry (e.g. via /etc/hosts) and try it out with that - # TODO: Change domain for your use-case - - host: terminfinder.opencode.local - paths: - - path: /api(/|$)(.*) - pathType: Prefix - tls: - - secretName: cert-terminfinder.opencode.local - hosts: - - terminfinder.opencode.local - -# For testing, enabled the autoscaling -autoscaling: - enabled: true - minReplicas: 1 - maxReplicas: 10 - targetCPUUtilizationPercentage: 80 - targetMemoryUtilizationPercentage: 80 - -# This is just for testing, since in minikube we cant run completely as non-root -postgresql: - volumePermissions: - enabled: false - - primary: - ## Update permissions for the data folder - initContainers: - - name: update-permissions - image: docker.io/busybox:latest - imagePullPolicy: Always - command: - - "sh" - - "-c" - - "chown -R 1001:1001 /bitnami/postgresql && chmod -R 0700 /bitnami/postgresql" - securityContext: - runAsUser: 0 - volumeMounts: - - name: data - mountPath: /bitnami/postgresql - resources: - requests: - memory: 64Mi - cpu: 250m - limits: - memory: 64Mi - cpu: 250m diff --git a/demo-frontend.values.yaml b/demo-frontend.values.yaml deleted file mode 100644 index 5f18005..0000000 --- a/demo-frontend.values.yaml +++ /dev/null @@ -1,33 +0,0 @@ -app: - title: "Terminfinder Helm Demo" - locale: "DE-de" # supported: DE-de, EN-en - addressing: "du" # supported: du, sie - backend_url: https://terminfinder.opencode.local/api # Public URL to our Backend - -replicaCount: 1 - -ingress: - enabled: true - className: "nginx" - annotations: - nginx.ingress.kubernetes.io/ssl-redirect: "true" - cert-manager.io/cluster-issuer: selfsigned - hosts: - # For this demo, we create a local dns entry (e.g. via /etc/hosts) to try it out with this domain - # TODO: Change domain for your use-case - - host: terminfinder.opencode.local - paths: - - path: / - pathType: Prefix - tls: - - secretName: cert-terminfinder.opencode.local - hosts: - - terminfinder.opencode.local - -# For testing, enabled the autoscaling -autoscaling: - enabled: true - minReplicas: 1 - maxReplicas: 5 - targetCPUUtilizationPercentage: 80 - targetMemoryUtilizationPercentage: 80 diff --git a/terminfinder-chart/charts/backend/charts/common-2.2.4.tgz b/terminfinder-chart/charts/backend/charts/common-2.2.4.tgz deleted file mode 100644 index 9016f32e2cfd76371466da567554893ec977e7c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12364 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 diff --git a/terminfinder-chart/charts/frontend/templates/configMap.yml b/terminfinder-chart/charts/frontend/templates/configMap.yml deleted file mode 100644 index 6fa82e2..0000000 --- a/terminfinder-chart/charts/frontend/templates/configMap.yml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-customer-config -data: - Anrede: "{{ .Values.customerConfig.ADDRESSING }}" - Sprache: "{{ .Values.customerConfig.LOCALE }}" - Titel: "{{ .Values.customerConfig.TITLE }}" - email: "{{ .Values.customerConfig.EMAIL }}" diff --git a/terminfinder-chart/charts/resources/templates/postgresql.yaml b/terminfinder-chart/charts/resources/templates/postgresql.yaml deleted file mode 100644 index 07e9d3f..0000000 --- a/terminfinder-chart/charts/resources/templates/postgresql.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if .Values.postgres.enabled -}} -apiVersion: cloud.dataport.de/v1alpha1 -kind: PostgreSQL -metadata: - name: {{ include "terminfinder-resources.fullname" . }}-db - namespace: {{ .Release.Namespace }} -spec: - storageSize: {{ .Values.postgres.storageSize }} - pgVersion: "{{ .Values.postgres.pgVersion }}" - instances: {{ .Values.postgres.instances }} -{{- end }} diff --git a/terminfinder-chart/charts/resources/values.yaml b/terminfinder-chart/charts/resources/values.yaml deleted file mode 100644 index e7a855c..0000000 --- a/terminfinder-chart/charts/resources/values.yaml +++ /dev/null @@ -1,12 +0,0 @@ -loki: - endpoint: http://loki-gateway.logging-system.svc.cluster.local/loki/api/v1/push - tenantId: 6703bd86-3601-4ea8-96e4-ecff048f1de9 - -postgres: - storageSize: "2Gi" - pgVersion: "15" - instances: 3 - enabled: true - -traefik: - enabled: true diff --git a/terminfinder-chart/charts/backend/.helmignore b/terminfinder-chart/charts/terminfinder-backend/.helmignore similarity index 100% rename from terminfinder-chart/charts/backend/.helmignore rename to terminfinder-chart/charts/terminfinder-backend/.helmignore diff --git a/terminfinder-chart/charts/backend/Chart.lock b/terminfinder-chart/charts/terminfinder-backend/Chart.lock similarity index 53% rename from terminfinder-chart/charts/backend/Chart.lock rename to terminfinder-chart/charts/terminfinder-backend/Chart.lock index 5ad7ab0..54f5fc0 100644 --- a/terminfinder-chart/charts/backend/Chart.lock +++ b/terminfinder-chart/charts/terminfinder-backend/Chart.lock @@ -4,6 +4,6 @@ dependencies: version: 12.1.2 - name: common repository: https://charts.bitnami.com/bitnami - version: 2.2.4 -digest: sha256:55f16e9b5bade9e719e7e6673b24d182e9316e8669820cdc68b4c37f518c3e5b -generated: "2023-03-23T11:14:06.498295+01:00" + version: 2.20.3 +digest: sha256:8fccf7c770b0e1a7a1f64fcd77a3afede13a967fe7c182ebbfe2d21f9cfed0b7 +generated: "2024-07-01T16:33:04.750757+02:00" diff --git a/terminfinder-chart/charts/backend/Chart.yaml b/terminfinder-chart/charts/terminfinder-backend/Chart.yaml similarity index 100% rename from terminfinder-chart/charts/backend/Chart.yaml rename to terminfinder-chart/charts/terminfinder-backend/Chart.yaml diff --git a/terminfinder-chart/charts/terminfinder-backend/charts/common-2.20.3.tgz b/terminfinder-chart/charts/terminfinder-backend/charts/common-2.20.3.tgz new file mode 100644 index 0000000000000000000000000000000000000000..cbac269ae4a8ad6ae67c7993758f2151d970ef65 GIT binary patch literal 16079 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 Vd{%n?{{R30|Nq*QIoAM+0RYWJqyGQ^ literal 0 HcmV?d00001 diff --git a/terminfinder-chart/charts/backend/charts/postgresql-12.1.2.tgz b/terminfinder-chart/charts/terminfinder-backend/charts/postgresql-12.1.2.tgz similarity index 100% rename from terminfinder-chart/charts/backend/charts/postgresql-12.1.2.tgz rename to terminfinder-chart/charts/terminfinder-backend/charts/postgresql-12.1.2.tgz diff --git a/terminfinder-chart/charts/backend/templates/NOTES.txt b/terminfinder-chart/charts/terminfinder-backend/templates/NOTES.txt similarity index 100% rename from terminfinder-chart/charts/backend/templates/NOTES.txt rename to terminfinder-chart/charts/terminfinder-backend/templates/NOTES.txt diff --git a/terminfinder-chart/charts/backend/templates/_helpers.tpl b/terminfinder-chart/charts/terminfinder-backend/templates/_helpers.tpl similarity index 100% rename from terminfinder-chart/charts/backend/templates/_helpers.tpl rename to terminfinder-chart/charts/terminfinder-backend/templates/_helpers.tpl diff --git a/terminfinder-chart/charts/backend/templates/deployment.yaml b/terminfinder-chart/charts/terminfinder-backend/templates/deployment.yaml similarity index 87% rename from terminfinder-chart/charts/backend/templates/deployment.yaml rename to terminfinder-chart/charts/terminfinder-backend/templates/deployment.yaml index be60cf3..d371577 100644 --- a/terminfinder-chart/charts/backend/templates/deployment.yaml +++ b/terminfinder-chart/charts/terminfinder-backend/templates/deployment.yaml @@ -1,4 +1,4 @@ -{{- $svc := .Values.global.postgresql.service.name | default (printf "%s-postgresql-hl" (include "terminfinder-backend.fullname" .)) }} +{{- $svc := .Values.global.postgresql.service.name | default (printf "%s-postgresql" (include "common.names.namespace" .)) }} apiVersion: apps/v1 kind: Deployment metadata: @@ -41,7 +41,7 @@ spec: - name: DB_PORT value: {{ .Values.global.postgresql.service.ports.postgresql | quote }} - name: DB_ADDRESS - value: {{ printf "%s.%s.svc" $svc .Release.Namespace }} + value: {{ printf "%s" $svc }} - name: DB_USERNAME value: {{ .Values.global.postgresql.auth.username }} - name: ASPNETCORE_URLS @@ -50,7 +50,7 @@ spec: - name: DB_PASSWORD valueFrom: secretKeyRef: - name: {{ .Values.global.postgresql.auth.existingSecret | default (printf "%s-postgresql" (include "common.names.fullname" .)) }} + name: {{ .Values.global.postgresql.auth.existingSecret | default (printf "%s-postgresql" (include "common.names.namespace" .)) }} key: {{ .Values.global.postgresql.auth.secretKeys.userPasswordKey | default "password" }} # Patches - name: Terminfinder__UseHttps @@ -60,12 +60,19 @@ spec: - name: Terminfinder__Log4NetConfigFilename value: log4net.Console.debug.config - name: ConnectionStrings__TerminfinderConnection - value: "Server=$(DB_ADDRESS);Port=$(DB_PORT);Database=$(DB_DATABASE);User ID=$(DB_USERNAME);password=$(DB_PASSWORD);" + value: "Server=$(DB_ADDRESS),$(DB_PORT);Database=$(DB_DATABASE);User ID=$(DB_USERNAME);password=$(DB_PASSWORD);" ports: - name: http containerPort: 8080 protocol: TCP + startupProbe: + failureThreshold: 3 + periodSeconds: 10 + httpGet: + path: /app + port: http livenessProbe: + initialDelaySeconds: 10 httpGet: path: /app port: http diff --git a/terminfinder-chart/charts/backend/templates/hpa.yaml b/terminfinder-chart/charts/terminfinder-backend/templates/hpa.yaml similarity index 100% rename from terminfinder-chart/charts/backend/templates/hpa.yaml rename to terminfinder-chart/charts/terminfinder-backend/templates/hpa.yaml diff --git a/terminfinder-chart/charts/backend/templates/ingress.yaml b/terminfinder-chart/charts/terminfinder-backend/templates/ingress.yaml similarity index 100% rename from terminfinder-chart/charts/backend/templates/ingress.yaml rename to terminfinder-chart/charts/terminfinder-backend/templates/ingress.yaml diff --git a/terminfinder-chart/charts/backend/templates/service.yaml b/terminfinder-chart/charts/terminfinder-backend/templates/service.yaml similarity index 100% rename from terminfinder-chart/charts/backend/templates/service.yaml rename to terminfinder-chart/charts/terminfinder-backend/templates/service.yaml diff --git a/terminfinder-chart/charts/backend/templates/serviceaccount.yaml b/terminfinder-chart/charts/terminfinder-backend/templates/serviceaccount.yaml similarity index 100% rename from terminfinder-chart/charts/backend/templates/serviceaccount.yaml rename to terminfinder-chart/charts/terminfinder-backend/templates/serviceaccount.yaml diff --git a/terminfinder-chart/charts/backend/values.yaml b/terminfinder-chart/charts/terminfinder-backend/values.yaml similarity index 67% rename from terminfinder-chart/charts/backend/values.yaml rename to terminfinder-chart/charts/terminfinder-backend/values.yaml index 4ae88ca..7ba12ab 100644 --- a/terminfinder-chart/charts/backend/values.yaml +++ b/terminfinder-chart/charts/terminfinder-backend/values.yaml @@ -9,8 +9,7 @@ global: database: terminfinder existingSecret: "" # if not set, default: "{{ Release.Name }}-postgres" secretKeys: - userPasswordKey: "terminfinder" - + userPasswordKey: "password" service: name: "" # if not set, default: "{{ Release.Name }}-postgres" ports: @@ -100,22 +99,13 @@ affinity: { } postgresql: enabled: true - #architecture: standalone - serviceAccount: create: true - image: - registry: docker.io # Notice, may this is not allowed - repository: mxzinke/postgresql-rootless # This is an special image, which is based on bitnami/postgresql - tag: 15 - pullPolicy: IfNotPresent - pullSecrets: [ ] - ## Set permissions for the data volume ## Only needed when volume has not correct permissions volumePermissions: - enabled: false + enabled: true image: registry: docker.io # Notice, may this is not allowed @@ -124,58 +114,6 @@ postgresql: # pullPolicy: Always # pullSecrets: [] - resources: - requests: - memory: 64Mi - cpu: 250m - limits: - memory: 64Mi - cpu: 250m - - containerSecurityContext: - enabled: true - runAsUser: 1001 - runAsGroup: 1001 - allowPrivilegeEscalation: false - runAsNonRoot: true - capabilities: - drop: - - ALL - - primary: - ## Enable security context with non-root user - podSecurityContext: - enabled: true - runAsUser: 1001 - runAsGroup: 1001 - fsGroup: 1001 - containerSecurityContext: - enabled: true - runAsUser: 1001 - runAsGroup: 1001 - allowPrivilegeEscalation: false - runAsNonRoot: true - capabilities: - drop: - - ALL - - ## Enable persistence using Persistent Volume Claims - ## For BSI compliance, we need to use non-root user - persistence: - enabled: true - accessModes: - - ReadWriteOnce - size: 8Gi - - # Resources (minimal) - resources: - requests: - memory: 256Mi - cpu: 250m - limits: - memory: 256Mi - cpu: 250m - initdb: # Enabling the UUID-OSSP scripts: diff --git a/terminfinder-chart/charts/frontend/.helmignore b/terminfinder-chart/charts/terminfinder-frontend/.helmignore similarity index 100% rename from terminfinder-chart/charts/frontend/.helmignore rename to terminfinder-chart/charts/terminfinder-frontend/.helmignore diff --git a/terminfinder-chart/charts/frontend/Chart.yaml b/terminfinder-chart/charts/terminfinder-frontend/Chart.yaml similarity index 100% rename from terminfinder-chart/charts/frontend/Chart.yaml rename to terminfinder-chart/charts/terminfinder-frontend/Chart.yaml diff --git a/terminfinder-chart/charts/frontend/templates/NOTES.txt b/terminfinder-chart/charts/terminfinder-frontend/templates/NOTES.txt similarity index 100% rename from terminfinder-chart/charts/frontend/templates/NOTES.txt rename to terminfinder-chart/charts/terminfinder-frontend/templates/NOTES.txt diff --git a/terminfinder-chart/charts/frontend/templates/_helpers.tpl b/terminfinder-chart/charts/terminfinder-frontend/templates/_helpers.tpl similarity index 100% rename from terminfinder-chart/charts/frontend/templates/_helpers.tpl rename to terminfinder-chart/charts/terminfinder-frontend/templates/_helpers.tpl diff --git a/terminfinder-chart/charts/frontend/templates/deployment.yaml b/terminfinder-chart/charts/terminfinder-frontend/templates/deployment.yaml similarity index 78% rename from terminfinder-chart/charts/frontend/templates/deployment.yaml rename to terminfinder-chart/charts/terminfinder-frontend/templates/deployment.yaml index 146b62a..7ccaa11 100644 --- a/terminfinder-chart/charts/frontend/templates/deployment.yaml +++ b/terminfinder-chart/charts/terminfinder-frontend/templates/deployment.yaml @@ -36,25 +36,13 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} env: - name: ADDRESSING - valueFrom: - configMapKeyRef: - name: {{ .Release.Name }}-customer-config - key: Anrede + value: {{ .Values.customerConfig.ADDRESSING }} - name: LOCALE - valueFrom: - configMapKeyRef: - name: {{ .Release.Name }}-customer-config - key: Sprache + value: {{ .Values.customerConfig.LOCALE }} - name: TITLE - valueFrom: - configMapKeyRef: - name: {{ .Release.Name }}-customer-config - key: Titel + value: {{ .Values.customerConfig.TITLE }} - name: EMAIL - valueFrom: - configMapKeyRef: - name: {{ .Release.Name }}-customer-config - key: email + value: {{ .Values.customerConfig.EMAIL }} - name: API_URL value: {{ .Values.app.backend_url }} ports: diff --git a/terminfinder-chart/charts/frontend/templates/hpa.yaml b/terminfinder-chart/charts/terminfinder-frontend/templates/hpa.yaml similarity index 100% rename from terminfinder-chart/charts/frontend/templates/hpa.yaml rename to terminfinder-chart/charts/terminfinder-frontend/templates/hpa.yaml diff --git a/terminfinder-chart/charts/frontend/templates/ingress.yaml b/terminfinder-chart/charts/terminfinder-frontend/templates/ingress.yaml similarity index 100% rename from terminfinder-chart/charts/frontend/templates/ingress.yaml rename to terminfinder-chart/charts/terminfinder-frontend/templates/ingress.yaml diff --git a/terminfinder-chart/charts/frontend/templates/service.yaml b/terminfinder-chart/charts/terminfinder-frontend/templates/service.yaml similarity index 100% rename from terminfinder-chart/charts/frontend/templates/service.yaml rename to terminfinder-chart/charts/terminfinder-frontend/templates/service.yaml diff --git a/terminfinder-chart/charts/frontend/templates/serviceaccount.yaml b/terminfinder-chart/charts/terminfinder-frontend/templates/serviceaccount.yaml similarity index 100% rename from terminfinder-chart/charts/frontend/templates/serviceaccount.yaml rename to terminfinder-chart/charts/terminfinder-frontend/templates/serviceaccount.yaml diff --git a/terminfinder-chart/charts/frontend/values.yaml b/terminfinder-chart/charts/terminfinder-frontend/values.yaml similarity index 100% rename from terminfinder-chart/charts/frontend/values.yaml rename to terminfinder-chart/charts/terminfinder-frontend/values.yaml diff --git a/terminfinder-chart/charts/resources/Chart.yaml b/terminfinder-chart/charts/terminfinder-resources/Chart.yaml similarity index 100% rename from terminfinder-chart/charts/resources/Chart.yaml rename to terminfinder-chart/charts/terminfinder-resources/Chart.yaml diff --git a/terminfinder-chart/charts/resources/templates/_helpers.tpl b/terminfinder-chart/charts/terminfinder-resources/templates/_helpers.tpl similarity index 100% rename from terminfinder-chart/charts/resources/templates/_helpers.tpl rename to terminfinder-chart/charts/terminfinder-resources/templates/_helpers.tpl diff --git a/terminfinder-chart/charts/resources/templates/observability.yaml b/terminfinder-chart/charts/terminfinder-resources/templates/observability.yaml similarity index 81% rename from terminfinder-chart/charts/resources/templates/observability.yaml rename to terminfinder-chart/charts/terminfinder-resources/templates/observability.yaml index 4271ef0..eb1a4b7 100644 --- a/terminfinder-chart/charts/resources/templates/observability.yaml +++ b/terminfinder-chart/charts/terminfinder-resources/templates/observability.yaml @@ -1,3 +1,4 @@ +{{- if .Values.grafana.enabled -}} apiVersion: monitoring.grafana.com/v1alpha1 kind: LogsInstance metadata: @@ -5,8 +6,8 @@ metadata: namespace: {{ .Release.Namespace }} spec: clients: - - url: {{.Values.loki.endpoint}} - tenantId: {{.Values.loki.tenantId}} + - url: {{.Values.grafana.loki.endpoint}} + tenantId: {{.Values.grafana.loki.tenantId}} podLogsSelector: matchLabels: {{- include "terminfinder-resources.labels" . | nindent 6 }} @@ -24,3 +25,4 @@ spec: - cri: {} selector: matchLabels: {} +{{- end }} diff --git a/terminfinder-chart/charts/resources/templates/traefik.yaml b/terminfinder-chart/charts/terminfinder-resources/templates/traefik.yaml similarity index 100% rename from terminfinder-chart/charts/resources/templates/traefik.yaml rename to terminfinder-chart/charts/terminfinder-resources/templates/traefik.yaml diff --git a/terminfinder-chart/charts/terminfinder-resources/values.yaml b/terminfinder-chart/charts/terminfinder-resources/values.yaml new file mode 100644 index 0000000..c7927e3 --- /dev/null +++ b/terminfinder-chart/charts/terminfinder-resources/values.yaml @@ -0,0 +1,8 @@ +grafana: + loki: + endpoint: http://loki-gateway.logging-system.svc.cluster.local/loki/api/v1/push + tenantId: 6703bd86-3601-4ea8-96e4-ecff048f1de9 + enabled: true + +traefik: + enabled: true diff --git a/terminfinder-chart/values.yaml b/terminfinder-chart/values.yaml index 115e24b..2dd7bf5 100644 --- a/terminfinder-chart/values.yaml +++ b/terminfinder-chart/values.yaml @@ -1,4 +1,4 @@ -terminfinder-frontend-oss: +terminfinder-frontend: # Default values for terminfinder-frontend. # This is a YAML-formatted file. # Declare variables to be passed into your templates. @@ -14,12 +14,6 @@ terminfinder-frontend-oss: replicaCount: 1 # Not HA for now! - image: - repository: registry.opencode.de/dataport/terminfinder/terminfinder-frontend - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - imagePullSecrets: [ ] nameOverride: "" fullnameOverride: "" @@ -96,31 +90,13 @@ terminfinder-frontend-oss: affinity: { } -terminfinder-backend-oss: +terminfinder-backend: # Default values for terminfinder-backend. # This is a YAML-formatted file. # Declare variables to be passed into your templates. - global: - postgresql: - auth: - username: pgsql-admin - database: terminfinder - existingSecret: "" # if not set, default: "{{ Release.Name }}-postgres" - - service: - name: "" # if not set, default: "{{ Release.Name }}-postgres" - ports: - postgresql: 5432 # Default port - replicaCount: 1 - image: - repository: registry.opencode.de/dataport/terminfinder/terminfinder-backend - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - imagePullSecrets: [ ] nameOverride: "" fullnameOverride: "" @@ -203,24 +179,14 @@ terminfinder-backend-oss: serviceAccount: create: true - image: - registry: docker.io # Notice, may this is not allowed - repository: mxzinke/postgresql-rootless # This is an special image, which is based on bitnami/postgresql - tag: 15 - pullPolicy: IfNotPresent - pullSecrets: [ ] - ## Set permissions for the data volume ## Only needed when volume has not correct permissions volumePermissions: enabled: false image: - registry: docker.io # Notice, may this is not allowed + registry: docker.io repository: bitnami/bitnami-shell - # tag: 11-debian-11-r77 - # pullPolicy: Always - # pullSecrets: [] resources: requests: @@ -231,7 +197,7 @@ terminfinder-backend-oss: cpu: 250m containerSecurityContext: - enabled: true + enabled: false runAsUser: 1001 runAsGroup: 1001 allowPrivilegeEscalation: false @@ -243,12 +209,12 @@ terminfinder-backend-oss: primary: ## Enable security context with non-root user podSecurityContext: - enabled: true + enabled: false runAsUser: 1001 runAsGroup: 1001 fsGroup: 1001 containerSecurityContext: - enabled: true + enabled: false runAsUser: 1001 runAsGroup: 1001 allowPrivilegeEscalation: false @@ -285,15 +251,12 @@ terminfinder-backend-oss: # https://github.com/bitnami/charts/tree/main/bitnami/postgresql#parameters terminfinder-resources: - loki: - endpoint: http://loki-gateway.logging-system.svc.cluster.local/loki/api/v1/push - tenantId: 6703bd86-3601-4ea8-96e4-ecff048f1de9 - - postgres: - storageSize: "2Gi" - pgVersion: "15" - instances: 3 - enabled: true + grafana: + enabled: false + loki: + endpoint: http://loki-gateway.logging-system.svc.cluster.local/loki/api/v1/push + tenantId: 6703bd86-3601-4ea8-96e4-ecff048f1de9 + enabled: false traefik: - enabled: true + enabled: false