From cd60951428966a2c38a1443eb3dbef6a44a4e322 Mon Sep 17 00:00:00 2001 From: Amit Sagtani Date: Tue, 6 Dec 2022 20:39:25 +0530 Subject: [PATCH] add required env vars --- helm_chart/roman/templates/deployment.yaml | 10 ++++++++-- helm_chart/roman/templates/ingress.yaml | 4 ++-- helm_chart/roman/values.yaml | 18 ++++++++++-------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/helm_chart/roman/templates/deployment.yaml b/helm_chart/roman/templates/deployment.yaml index ab7a2e6..6d0c193 100644 --- a/helm_chart/roman/templates/deployment.yaml +++ b/helm_chart/roman/templates/deployment.yaml @@ -15,7 +15,7 @@ spec: app: roman spec: containers: - - app: roman + - name: roman image: "{{ .Values.roman.image.repository }}:{{ .Values.roman.image.tag | default .Chart.AppVersion }}" imagePullPolicy: IfNotPresent @@ -41,7 +41,13 @@ spec: key: pubKeyBase64 - name: DB_URL - value: "{{ required "Must specify publicURL" .Values.roman.dbURL }}" + value: "{{ required "Must specify dbURL" .Values.roman.dbURL }}" + + - name: WIRE_API_HOST + value: "{{ required "Must specify wireApiHost" .Values.roman.wireApiHost }}" + + - name: PROXY_DOMAIN + value: "{{ .Values.roman.proxyDomain }}" - name: DB_USER value: "{{ required "Must specify dbUser" .Values.roman.dbUser }}" diff --git a/helm_chart/roman/templates/ingress.yaml b/helm_chart/roman/templates/ingress.yaml index d1fcc05e..6ec5a26 100644 --- a/helm_chart/roman/templates/ingress.yaml +++ b/helm_chart/roman/templates/ingress.yaml @@ -11,10 +11,10 @@ metadata: spec: tls: - hosts: - - "{{ required "Must specify host" .Values.roman.host }}" + - "{{ required "Must specify host" .Values.roman.publicURL }}" # secretName: "{{ include "roman.fullname" . }}" rules: - - host: "{{ .Values.roman.host }}" + - host: "{{ .Values.roman.publicURL }}" http: paths: - path: / diff --git a/helm_chart/roman/values.yaml b/helm_chart/roman/values.yaml index a74d2f0..e30e8f0 100644 --- a/helm_chart/roman/values.yaml +++ b/helm_chart/roman/values.yaml @@ -12,22 +12,24 @@ roman: serviceToken: # Provide the roman service token. # randomly generated for local testing appKey: b53181dd-6400-4960-8988-f775545588ff-0949f503-421e-4588-a2c5-f64fd9c180fd + wireApiHost: wire.com + proxyDomain: # random base 64 string used as certificate, replace with real one pubKeyBase64: bm90aGluZyBhbmQgdGhhdAo= publicURL: # Link to the subdomain pointing to roman. - dbURL: jdbc:postgresql://data-postgres:5432/romanservice # Link to your Postgres server. - dbUser: romanservice # Provide your Postgres DB username. - dbPassword: romanservice # Provide your Postgres DB password. - host: + dbURL: jdbc:postgresql://data-postgres:5432/recording # Link to your Postgres server. + dbUser: recording # Provide your Postgres DB username. + dbPassword: recording # Provide your Postgres DB password. + postgresql: enabled: false fullnameOverride: data-postgres auth: - postgresPassword: romanservice - username: romanservice - password: romanservice - database: romanservice + postgresPassword: recording + username: recording + password: recording + database: recording primary: persistence: existingClaim: postgresql-pv-claim