From fdc32949ecb3297ae110d233b797c2653eb4881e Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Mon, 11 Dec 2017 08:36:25 -0500
Subject: Fix policy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- remove useless init-check in deployment to match requirement
from policy team: https://gerrit.onap.org/r/gitweb?p=policy/docker.git;a=blob;f=docker-compose.yml;h=96fd5073e9d51908dabd04643aa96b42820ac681;hb=HEAD
- add missing drools port (9696)
- update configuration files to reflect latest

Change-Id: I3399c21a3357b649fdc078a0bd4ba4af1f751a9b
Issue-ID: OOM-490
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 kubernetes/policy/templates/all-services.yaml |  3 +++
 kubernetes/policy/templates/dep-brmsgw.yaml   |  8 +-------
 kubernetes/policy/templates/dep-drools.yaml   | 15 +++------------
 kubernetes/policy/templates/dep-nexus.yaml    | 26 --------------------------
 kubernetes/policy/templates/dep-pap.yaml      |  5 +++--
 kubernetes/policy/templates/dep-pdp.yaml      |  4 ----
 6 files changed, 10 insertions(+), 51 deletions(-)

(limited to 'kubernetes/policy')

diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
index a1c480458d..5c5f683e88 100644
--- a/kubernetes/policy/templates/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -45,6 +45,9 @@ spec:
   - name: "drools-port"
     port: 6969
     nodePort: {{ .Values.nodePortPrefix }}17
+  - name: "drools-port2"
+    port: 9696
+    nodePort: {{ .Values.nodePortPrefix }}21
   selector:
     app: drools
   type: NodePort
diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml
index df5d888165..0e0ef17c93 100644
--- a/kubernetes/policy/templates/dep-brmsgw.yaml
+++ b/kubernetes/policy/templates/dep-brmsgw.yaml
@@ -19,13 +19,7 @@ spec:
           {
               "args": [
                   "--container-name",
-                  "mariadb",
-                  "--container-name",
-                  "nexus",
-                  "--container-name",
-                  "pap",
-                  "--container-name",
-                  "pdp"
+                  "pap"
               ],
               "command": [
                   "/root/ready.py"
diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml
index 3e9fa014fb..fe52f25708 100644
--- a/kubernetes/policy/templates/dep-drools.yaml
+++ b/kubernetes/policy/templates/dep-drools.yaml
@@ -21,13 +21,7 @@ spec:
                   "--container-name",
                   "mariadb",
                   "--container-name",
-                  "nexus",
-                  "--container-name",
-                  "pap",
-                  "--container-name",
-                  "pdp",
-                  "--container-name",
-                  "brmsgw"
+                  "nexus"
               ],
               "command": [
                   "/root/ready.py"
@@ -50,15 +44,12 @@ spec:
           ]'
     spec:
       containers:
-      - command:
-        - /bin/bash
-        - -c
-        - ./do-start.sh
-        image: "{{ .Values.image.policyDrools }}:{{ .Values.image.policyDroolsVersion }}"
+      - image: "{{ .Values.image.policyDrools }}:{{ .Values.image.policyDroolsVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: drools
         ports:
         - containerPort: 6969
+        - containerPort: 9696
         readinessProbe:
           tcpSocket:
             port: 6969
diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml
index 07cd334879..2cc20390fe 100644
--- a/kubernetes/policy/templates/dep-nexus.yaml
+++ b/kubernetes/policy/templates/dep-nexus.yaml
@@ -13,32 +13,6 @@ spec:
       labels:
         app: nexus
       name: nexus
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "mariadb"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "nexus-readiness"
-          }
-          ]'
     spec:
       containers:
       - image: "{{ .Values.image.policyNexus }}:{{ .Values.image.policyNexusVersion }}"
diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml
index 0816aa5291..838396f975 100644
--- a/kubernetes/policy/templates/dep-pap.yaml
+++ b/kubernetes/policy/templates/dep-pap.yaml
@@ -17,8 +17,6 @@ spec:
         pod.beta.kubernetes.io/init-containers: '[
           {
               "args": [
-                  "--container-name",
-                  "nexus",
                   "--container-name",
                   "mariadb"
               ],
@@ -73,6 +71,9 @@ spec:
         image: "{{ .Values.image.policyPe }}:{{ .Values.image.policyPeVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: pap
+        env:
+        - name: PRELOAD_POLICIES
+          value: "true"
         ports:
         - containerPort: 8443
         - containerPort: 9091
diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml
index 6cc442b417..1fda0b6d1a 100644
--- a/kubernetes/policy/templates/dep-pdp.yaml
+++ b/kubernetes/policy/templates/dep-pdp.yaml
@@ -18,10 +18,6 @@ spec:
         pod.beta.kubernetes.io/init-containers: '[
           {
               "args": [
-                  "--container-name",
-                  "mariadb",
-                  "--container-name",
-                  "nexus",
                   "--container-name",
                   "pap"
               ],
-- 
cgit 1.2.3-korg