From 583b43ee1ede792028ad394d2a07c7dab563ea43 Mon Sep 17 00:00:00 2001
From: mayankg2703 <mayank.gupta@amdocs.com>
Date: Tue, 17 Apr 2018 05:10:56 +0000
Subject: [PATCH] incorrect config map mounting

Change-Id: I54dbc1ceaf46ddc54a9aeb8504f9dee30f042872
Issue-ID: OOM-918
Signed-off-by: mayankg2703 <mayank.gupta@amdocs.com>
---
 .../policy/charts/brmsgw/templates/deployment.yaml |  6 +++-
 .../policy/charts/pdp/templates/statefulset.yaml   |  9 +++++-
 kubernetes/policy/templates/deployment.yaml        | 36 +++++++++++++---------
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/kubernetes/policy/charts/brmsgw/templates/deployment.yaml b/kubernetes/policy/charts/brmsgw/templates/deployment.yaml
index cd715e4606..e0969022f6 100644
--- a/kubernetes/policy/charts/brmsgw/templates/deployment.yaml
+++ b/kubernetes/policy/charts/brmsgw/templates/deployment.yaml
@@ -71,8 +71,12 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /tmp/policy-install/config
+        - mountPath: /tmp/policy-install/config/brmsgw-tweaks.sh
           name: pe-brmsgw
+          subPath: brmsgw-tweaks.sh
+        - mountPath: /tmp/policy-install/config/brmsgw.conf
+          name: pe-brmsgw
+          subPath: brmsgw.conf
         - mountPath: /tmp/policy-install/config/base.conf
           name: pe
           subPath: base.conf
diff --git a/kubernetes/policy/charts/pdp/templates/statefulset.yaml b/kubernetes/policy/charts/pdp/templates/statefulset.yaml
index 367cde49bd..d09c446381 100644
--- a/kubernetes/policy/charts/pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/charts/pdp/templates/statefulset.yaml
@@ -78,8 +78,15 @@ spec:
         - mountPath: /tmp/policy-install/config/base.conf
           name: pe
           subPath: base.conf
-        - mountPath: /tmp/policy-install/config/
+        - mountPath: /tmp/policy-install/config/pdp-tweaks.sh
           name: pe-pdp
+          subPath: pdp-tweaks.sh
+        - mountPath: /tmp/policy-install/config/pdplp.conf
+          name: pe-pdp
+          subPath: pdplp.conf
+        - mountPath: /tmp/policy-install/config/pdp.conf
+          name: pe-pdp
+          subPath: pdp.conf
         - mountPath: /tmp/policy-install/do-start.sh
           name: pe-scripts
           subPath: do-start.sh
diff --git a/kubernetes/policy/templates/deployment.yaml b/kubernetes/policy/templates/deployment.yaml
index 88b3de35c0..8dca8ab34f 100644
--- a/kubernetes/policy/templates/deployment.yaml
+++ b/kubernetes/policy/templates/deployment.yaml
@@ -45,19 +45,6 @@ spec:
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
-      - command: ["/bin/bash", "-c", "echo $POD_IP > /config/ip_addr.txt"]
-        env:
-        - name: POD_IP
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: status.podIP
-        volumeMounts:
-        - mountPath: /config/
-          name: pe
-        image: {{ .Values.global.ubuntuImage }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: generate-ip-addr-txt
       containers:
         - command:
           - /bin/bash
@@ -88,11 +75,30 @@ spec:
           - mountPath: /etc/localtime
             name: localtime
             readOnly: true
+          - mountPath: /tmp/policy-install/config/push-policies.sh
+            name: pe-pap
+            subPath: push-policies.sh
+          - mountPath: /tmp/policy-install/config/pap-tweaks.sh
+            name: pe-pap
+            subPath: pap-tweaks.sh
+          - mountPath: /tmp/policy-install/config/paplp.conf
+            name: pe-pap
+            subPath: paplp.conf
+          - mountPath: /tmp/policy-install/config/pap.conf
+            name: pe-pap
+            subPath: pap.conf
+          - mountPath: /tmp/policy-install/config/mysql.conf
+            name: pe-pap
+            subPath: mysql.conf
+          - mountPath: /tmp/policy-install/config/elk.conf
+            name: pe-pap
+            subPath: elk.conf
+          - mountPath: /tmp/policy-install/config/console.conf
+            name: pe-pap
+            subPath: console.conf
           - mountPath: /tmp/policy-install/config/base.conf
             name: pe
             subPath: base.conf
-          - mountPath: /tmp/policy-install/config/
-            name: pe-pap
           - mountPath: /tmp/policy-install/do-start.sh
             name: pe-scripts
             subPath: do-start.sh
-- 
2.16.6