commit 8bfc6cf8c3d338c84c48201f7a4f274958e721a9
author BorislavG <Borislav.Glozman@amdocs.com> Tue Feb 27 15:04:26 2018 +0000
committer Alexis de Talhouët <alexis.de_talhouet@bell.ca> Thu Mar 01 18:10:31 2018 +0000
tree 2e0e1a969afc6ae38f0a2f62cc1a36e184cb48e1
parent f0a34e22011b4323bbd6a51ad313d6e547808101

Run all components in one namespace

Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>

kubernetes/policy/templates/dep-drools.yaml

diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml
index 1dc16cf..ef9636c 100644
--- a/kubernetes/policy/templates/dep-drools.yaml
+++ b/kubernetes/policy/templates/dep-drools.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: drools
-  namespace: "{{ .Values.nsPrefix }}-policy"
+  name: policy-drools
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: {{ .Values.droolsReplicas }}
   selector:
@@ -13,7 +13,7 @@
     metadata:
       labels:
         app: drools
-      name: drools
+      name: policy-drools
     spec:
       initContainers:
       - command:
@@ -55,8 +55,21 @@
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /tmp/policy-install/config
-          name: drools
+        - mountPath: /tmp/policy-install/config/policy-keystore
+          name: drools-secret
+          subPath: policy-keystore
+        - mountPath: /tmp/policy-install/config/feature-healthcheck.conf
+          name: drools-secret
+          subPath: feature-healthcheck.conf
+        - mountPath: /tmp/policy-install/config/base.conf
+          name: drools-config
+          subPath: base.conf
+        - mountPath: /tmp/policy-install/config/policy-management.conf
+          name: drools-config
+          subPath: policy-management.conf
+        - mountPath: /tmp/policy-install/config/drools-tweaks.sh
+          name: drools-config
+          subPath: drools-tweaks.sh
         - mountPath: /usr/share/maven/conf/settings.xml
           name: drools-settingsxml
           subPath: settings.xml
@@ -97,16 +110,10 @@
         - name: drools-settingsxml
           configMap:
             name: policy-dep-drools-settings-configmap
-        - name: drools
-          secret:
-            secretName: policy-dep-drools-secret
+        - name: drools-config
+          configMap:
+            name: policy-dep-drools-configmap
             items:
-            - key: policy-keystore
-              path: policy-keystore
-              mode: 0644
-            - key: feature-healthcheck.conf
-              path: feature-healthcheck.conf
-              mode: 0644
             - key: base.conf
               path: base.conf
               mode: 0755
@@ -116,6 +123,16 @@
             - key: drools-tweaks.sh
               path: drools-tweaks.sh
               mode: 0755
+        - name: drools-secret
+          secret:
+            secretName: policy-dep-drools-secret
+            items:
+            - key: policy-keystore
+              path: policy-keystore
+              mode: 0644
+            - key: feature-healthcheck.conf
+              path: feature-healthcheck.conf
+              mode: 0644
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}