From b452bfeb3bd404c6f71448d663202aa7e916765a Mon Sep 17 00:00:00 2001
From: Btodhunter <brady.todhunter@gmail.com>
Date: Wed, 29 Aug 2018 11:38:38 -0700
Subject: [PATCH] Fixed external postgres endpoint in worker_configmap. (#7424)

Updated appVersion.

Updated chart version.

Signed-off-by: Brady Todhunter <bradyt@anchore.com>
---
 stable/anchore-engine/Chart.yaml                      | 4 ++--
 stable/anchore-engine/templates/worker_configmap.yaml | 7 +++++--
 stable/anchore-engine/values.yaml                     | 3 +--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/stable/anchore-engine/Chart.yaml b/stable/anchore-engine/Chart.yaml
index 02b595b476..6ae00598be 100644
--- a/stable/anchore-engine/Chart.yaml
+++ b/stable/anchore-engine/Chart.yaml
@@ -1,6 +1,6 @@
 name: anchore-engine
-version: 0.2.0
-appVersion: 0.2.3
+version: 0.2.1
+appVersion: 0.2.4
 description: Anchore container analysis and policy evaluation engine service
 keywords:
  - analysis
diff --git a/stable/anchore-engine/templates/worker_configmap.yaml b/stable/anchore-engine/templates/worker_configmap.yaml
index 28e792265a..a3ba240d9b 100644
--- a/stable/anchore-engine/templates/worker_configmap.yaml
+++ b/stable/anchore-engine/templates/worker_configmap.yaml
@@ -35,7 +35,11 @@ data:
            #auto_policy_sync: true
 
       database:
-        db_connect: "postgresql+pg8000://${ANCHORE_DB_USER}:${ANCHORE_DB_PASSWORD}@${ANCHORE_DB_HOST}:5432/${ANCHORE_DB}"
+        {{ if .Values.postgresql.enabled }}
+        db_connect: 'postgresql+pg8000://${ANCHORE_DB_USER}:${ANCHORE_DB_PASSWORD}@{{ template "postgres.fullname" . }}:5432/{{ .Values.postgresql.postgresDatabase }}'
+        {{ else }}
+        db_connect: 'postgresql+pg8000://${ANCHORE_DB_USER}:${ANCHORE_DB_PASSWORD}@{{ .Values.postgresql.externalEndpoint}}/{{ .Values.postgresql.postgresDatabase }}'
+        {{ end }}
         db_connect_args:
           timeout: 120
           ssl: {{ .Values.globalConfig.dbConfig.ssl }}
@@ -53,4 +57,3 @@ data:
         ssl_cert: {{ .Values.workerConfig.ssl.certDir -}}/{{- .Values.workerConfig.ssl.certSecretCertName }}
         ssl_key: {{ .Values.workerConfig.ssl.certDir -}}/{{ .Values.workerConfig.ssl.certSecretKeyName }}
         ssl_enable: {{ .Values.globalConfig.internalServicesSslEnabled }}
-
diff --git a/stable/anchore-engine/values.yaml b/stable/anchore-engine/values.yaml
index 6b79bb8c32..37fd0a8629 100644
--- a/stable/anchore-engine/values.yaml
+++ b/stable/anchore-engine/values.yaml
@@ -12,7 +12,7 @@ service:
 
 image:
   # Can use 'latest' but not recommended
-  tag: "docker.io/anchore/anchore-engine:v0.2.3"
+  tag: "docker.io/anchore/anchore-engine:v0.2.4"
   # pullPolicy: IfNotPresent
 
 # Used to create Ingress record (should used with service.type: ClusterIP or NodePort depending on platform)
@@ -98,7 +98,6 @@ globalConfig:
 # Configuration for the core engine service that serves the API
 # The core service handles the user facing APIs and coordination of workers as well as storage interfaces for data
 coreConfig:
-  # For the moment, the replica count should stay at 1. That restriction should change soon.
   replicaCount: 1
   logLevel: INFO