From aa65b46be71c12a14c91f75c2d175f715a6d3840 Mon Sep 17 00:00:00 2001
From: Javier Sotelo <javier.a.sotelo@gmail.com>
Date: Thu, 11 Jun 2020 12:03:51 -0700
Subject: [PATCH] fix: add missing neo4j.host helm var (#1698)

Co-authored-by: jsotelo <javier.sotelo@viasat.com>
---
 .../datahub/charts/datahub-gms/templates/configmap.yaml      | 3 ++-
 .../datahub/charts/datahub-gms/templates/deployment.yaml     | 5 +++++
 contrib/kubernetes/datahub/charts/datahub-gms/values.yaml    | 1 +
 .../charts/datahub-mae-consumer/templates/deployment.yaml    | 5 +++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/contrib/kubernetes/datahub/charts/datahub-gms/templates/configmap.yaml b/contrib/kubernetes/datahub/charts/datahub-gms/templates/configmap.yaml
index 25afb6a1dc..d234940beb 100644
--- a/contrib/kubernetes/datahub/charts/datahub-gms/templates/configmap.yaml
+++ b/contrib/kubernetes/datahub/charts/datahub-gms/templates/configmap.yaml
@@ -12,4 +12,5 @@ data:
   kafka.schemaregistry.url: "{{ .Values.global.kafka.schemaregistry.url }}"
   elasticsearch.host: "{{ .Values.global.elasticsearch.host }}"
   elasticsearch.port: "{{ .Values.global.elasticsearch.port }}"
-  neo4j.uri: "{{ .Values.global.neo4j.uri }}"
+  neo4j.host: "{{ .Values.global.neo4j.host }}"
+  neo4j.uri: "{{ .Values.global.neo4j.uri }}"
\ No newline at end of file
diff --git a/contrib/kubernetes/datahub/charts/datahub-gms/templates/deployment.yaml b/contrib/kubernetes/datahub/charts/datahub-gms/templates/deployment.yaml
index 3f632e332f..91e1bf6516 100644
--- a/contrib/kubernetes/datahub/charts/datahub-gms/templates/deployment.yaml
+++ b/contrib/kubernetes/datahub/charts/datahub-gms/templates/deployment.yaml
@@ -81,6 +81,11 @@ spec:
                 configMapKeyRef:
                   name: {{ include "datahub-gms.fullname" . }}-configmap
                   key: elasticsearch.port
+            - name: NEO4J_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ include "datahub-gms.fullname" . }}-configmap
+                  key: neo4j.host
             - name: NEO4J_URI
               valueFrom:
                 configMapKeyRef:
diff --git a/contrib/kubernetes/datahub/charts/datahub-gms/values.yaml b/contrib/kubernetes/datahub/charts/datahub-gms/values.yaml
index 0eba6b486b..54db7ac8f0 100644
--- a/contrib/kubernetes/datahub/charts/datahub-gms/values.yaml
+++ b/contrib/kubernetes/datahub/charts/datahub-gms/values.yaml
@@ -82,6 +82,7 @@ global:
       url: "http://schema-registry:8081"
 
   neo4j:
+    host: "neo4j:7474"
     uri: "bolt://neo4j"
     username: "neo4j"
     password: "datahub"
diff --git a/contrib/kubernetes/datahub/charts/datahub-mae-consumer/templates/deployment.yaml b/contrib/kubernetes/datahub/charts/datahub-mae-consumer/templates/deployment.yaml
index 94442b821b..cc80ae4eee 100644
--- a/contrib/kubernetes/datahub/charts/datahub-mae-consumer/templates/deployment.yaml
+++ b/contrib/kubernetes/datahub/charts/datahub-mae-consumer/templates/deployment.yaml
@@ -52,6 +52,11 @@ spec:
                 configMapKeyRef:
                   name: datahub-gms-deployment-configmap
                   key: elasticsearch.port
+            - name: NEO4J_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: datahub-gms-deployment-configmap
+                  key: neo4j.host
             - name: NEO4J_URI
               valueFrom:
                 configMapKeyRef: