From 1a62b66badfe2fe081020443dc1805ce89e0e547 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Wed, 30 May 2018 10:56:46 -0700
Subject: [PATCH] Add port variable for appc cdt

Adding a environment variable into the CDT container.
This variable will set the port that CDT uses to connect
to the APPC backend.

Also changing the entry point of the CDT container to run
the script that will set the port in the CDT javascript files.

Change-Id: I0cba860d95a567e0cc4dd1eee322565c9d3b7d1c
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-924
---
 kubernetes/appc/charts/appc-cdt/templates/deployment.yaml | 7 +++++++
 kubernetes/appc/templates/service.yaml                    | 1 +
 kubernetes/appc/values.yaml                               | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml b/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml
index 2226b75bbf..a2cb9fc83a 100644
--- a/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml
+++ b/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml
@@ -21,6 +21,8 @@ spec:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          command:
+          - /opt/startCdt.sh
           ports:
           - containerPort: {{ .Values.service.internalPort }}
             name: {{ .Values.service.name }}
@@ -39,6 +41,11 @@ spec:
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           env:
+          # This sets the port that CDT will use to connect to the main appc container.
+          # The 32 is the node port suffix that is used in the main appc oom templates
+          # for nodePort3.
+          - name: CDT_PORT
+            value: "{{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.nodePort3 }}"
           volumeMounts:
           - mountPath: /etc/localtime
             name: localtime
diff --git a/kubernetes/appc/templates/service.yaml b/kubernetes/appc/templates/service.yaml
index 0ba73e3984..733c4ca3be 100644
--- a/kubernetes/appc/templates/service.yaml
+++ b/kubernetes/appc/templates/service.yaml
@@ -32,6 +32,7 @@ spec:
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
       name: "{{ .Values.service.portName }}-1830"
     - port: {{ .Values.service.externalPort3 }}
+      targetPort: {{ .Values.service.internalPort3 }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
       name: "{{ .Values.service.portName }}-9090"
     {{- else -}}
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 0d6dffd38c..333f6dc235 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -69,7 +69,8 @@ dgbuilder:
     dbServiceName: appc-dbhost
   service:
     name: appc-dgbuilder
-
+appc-cdt:
+  nodePort3: 32
 # default number of instances
 replicaCount: 1
 
-- 
2.16.6