Update charts

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

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 }}

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

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

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 }}

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 }}

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 }}

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