From 5114b4f86d9dc775cb91e87a3e797a49a2c81abd Mon Sep 17 00:00:00 2001 From: ajsalow Date: Sat, 19 Jun 2021 18:36:12 -0500 Subject: [PATCH] use values.yaml when testing for postgres readiness (#1143) --- deployment/gcp/flyte_helm_generated.yaml | 2 +- helm/templates/admin/deployment.yaml | 2 +- helm/templates/postgres/service.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/gcp/flyte_helm_generated.yaml b/deployment/gcp/flyte_helm_generated.yaml index e9b4660f0d..84c12ffb78 100644 --- a/deployment/gcp/flyte_helm_generated.yaml +++ b/deployment/gcp/flyte_helm_generated.yaml @@ -3136,7 +3136,7 @@ spec: command: - sh - -c - - until pg_isready -h postgres -p 5432; do echo waiting for database; sleep 2; done; + - until pg_isready -h -p ; do echo waiting for database; sleep 2; done; - command: - flyteadmin - --config diff --git a/helm/templates/admin/deployment.yaml b/helm/templates/admin/deployment.yaml index 8650e23b75..e93cd2e134 100644 --- a/helm/templates/admin/deployment.yaml +++ b/helm/templates/admin/deployment.yaml @@ -24,7 +24,7 @@ spec: command: - sh - -c - - until pg_isready -h postgres -p 5432; do echo waiting for database; sleep 2; done; + - until pg_isready -h {{ .Values.db.database.host }} -p {{ .Values.db.database.port }}; do echo waiting for database; sleep 2; done; {{- end }} - command: - flyteadmin diff --git a/helm/templates/postgres/service.yaml b/helm/templates/postgres/service.yaml index 4309df215e..8af840421b 100644 --- a/helm/templates/postgres/service.yaml +++ b/helm/templates/postgres/service.yaml @@ -1,4 +1,4 @@ -{{- if .Values.minio.enabled }} +{{- if .Values.postgres.enabled }} apiVersion: v1 kind: Service metadata: