From e02a9b1b031622282fce8bb84c30c385d729e85b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Busse?= <bj.rn@baerlin.eu>
Date: Fri, 12 Jan 2024 02:05:22 +0100
Subject: [PATCH] Update charts

---
 charts/gtfso-import/Chart.yaml             |  2 +-
 charts/gtfso-import/templates/secrets.yaml |  4 ++--
 charts/gtfso-import/values.yaml            |  3 +--
 charts/gtfso-vbb/Chart.yaml                |  2 +-
 charts/gtfso-vbb/templates/deployment.yaml |  4 ++--
 charts/gtfso-vbb/templates/secrets.yaml    | 14 ++++++++++++++
 charts/gtfso-vbb/templates/service.yaml    | 14 ++++++++++++++
 charts/gtfso-vbb/values.yaml               |  7 +++++++
 8 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 charts/gtfso-vbb/templates/secrets.yaml
 create mode 100644 charts/gtfso-vbb/templates/service.yaml

diff --git a/charts/gtfso-import/Chart.yaml b/charts/gtfso-import/Chart.yaml
index 12d757e..081b08f 100644
--- a/charts/gtfso-import/Chart.yaml
+++ b/charts/gtfso-import/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/gtfso-import/templates/secrets.yaml b/charts/gtfso-import/templates/secrets.yaml
index 5b20d83..fdf417e 100644
--- a/charts/gtfso-import/templates/secrets.yaml
+++ b/charts/gtfso-import/templates/secrets.yaml
@@ -7,7 +7,7 @@ metadata:
 
 stringData:
   DB_HOST:  {{ .Values.db_host }}
-  DB_USER: {{ .Values.db_user}}
+  DB_USER: {{ .Values.db_user }}
+  DB_PASS: {{ .Values.db_pass }}
   DB_NAME: {{ .Values.db_name }}
   DB_LOCALE: {{ .Values.db_locale }}
-  URL_DATA: {{ .Values.url_data }}
diff --git a/charts/gtfso-import/values.yaml b/charts/gtfso-import/values.yaml
index 369ef6d..3c75c8e 100644
--- a/charts/gtfso-import/values.yaml
+++ b/charts/gtfso-import/values.yaml
@@ -82,8 +82,7 @@ tolerations: []
 affinity: {}
 
 # Database
-db_host: fdc7:a61d:d247::42
+db_host: pgsql-ha-postgresql-ha-pgpool
 db_user: gtfso
 db_name: gtfso
 db_locale: de_DE.UTF-8
-url_data: https://www.vbb.de/vbbgtfs
diff --git a/charts/gtfso-vbb/Chart.yaml b/charts/gtfso-vbb/Chart.yaml
index a422402..bb193ea 100644
--- a/charts/gtfso-vbb/Chart.yaml
+++ b/charts/gtfso-vbb/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/gtfso-vbb/templates/deployment.yaml b/charts/gtfso-vbb/templates/deployment.yaml
index ef81c02..b3eb4d8 100644
--- a/charts/gtfso-vbb/templates/deployment.yaml
+++ b/charts/gtfso-vbb/templates/deployment.yaml
@@ -40,11 +40,11 @@ spec:
           livenessProbe:
             httpGet:
               path: /healthz
-              port: http
+              port: 5000
           readinessProbe:
             httpGet:
               path: /healthy
-              port: http
+              port: 5000
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
diff --git a/charts/gtfso-vbb/templates/secrets.yaml b/charts/gtfso-vbb/templates/secrets.yaml
new file mode 100644
index 0000000..8a88722
--- /dev/null
+++ b/charts/gtfso-vbb/templates/secrets.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "gtfso-vbb.fullname" . }}
+  labels:
+    {{- include "gtfso-vbb.labels" . | nindent 4 }}
+
+stringData:
+  DB_HOST:  {{ .Values.db_host }}
+  DB_USER: {{ .Values.db_user }}
+  DB_PASS: {{ .Values.db_pass }}
+  DB_NAME: {{ .Values.db_name }}
+  DB_LOCALE: {{ .Values.db_locale }}
+  URL_DATA: {{ .Values.url_data }}
diff --git a/charts/gtfso-vbb/templates/service.yaml b/charts/gtfso-vbb/templates/service.yaml
new file mode 100644
index 0000000..154b92a
--- /dev/null
+++ b/charts/gtfso-vbb/templates/service.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    {{- include "gtfso-vbb.labels" . | fromYaml | toYaml | nindent 4 }}
+  name: {{ include "gtfso-vbb.fullname" . }}
+spec:
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 5000
+  selector:
+    {{- include "gtfso-vbb.selectorLabels" . | fromYaml | toYaml | nindent 4 }}
diff --git a/charts/gtfso-vbb/values.yaml b/charts/gtfso-vbb/values.yaml
index e03cbd0..3dbef1b 100644
--- a/charts/gtfso-vbb/values.yaml
+++ b/charts/gtfso-vbb/values.yaml
@@ -77,3 +77,10 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+# Database
+db_host: pgsql-ha-postgresql-ha-pgpool
+db_user: gtfso
+db_name: gtfso
+db_locale: de_DE.UTF-8
+url_data: https://www.vbb.de/vbbgtfs