Policy 1.1 in Kubernetes

- up verion containers to use 1.1
- pap and brmsgw report it is waiting for pap 9091 port to be open but pdp and pypdp reports pap 9091 port is open
- removed push-policies.sh from 1.1 due to comment in CR
- removed pypdp container from 1.1 due to comment in CR
- removed pypdp.conf from 1.1 due to comment in CR
- removed ip_addr.txt from 1.1 due to comment in CR

Change-Id: Ibb685ec603a59dba56aa9673044ae1923d993191
Issue-Id: OOM-249
Signed-off-by: Eric Au <kachun.au@amdocs.com>

8 files changed, 22 insertions, 93 deletions

diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml
index e535cf2306..17e4896e79 100644
--- a/kubernetes/policy/templates/dep-brmsgw.yaml
+++ b/kubernetes/policy/templates/dep-brmsgw.yaml
@@ -24,9 +24,7 @@ spec:
                   "--container-name",
                   "pap",
                   "--container-name",
-                  "pdp",
-                  "--container-name",
-                  "pypdp"
+                  "pdp"
               ],
               "command": [
                   "/root/ready.py"
@@ -42,7 +40,7 @@ spec:
                       }
                   }
               ],
-              "image": "{{ .Values.image.readiness }}",
+              "image": "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}",
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "brmsgw-readiness"
           }
@@ -53,7 +51,7 @@ spec:
         - /bin/bash
         - ./do-start.sh
         - brmsgw
-        image: {{ .Values.image.policyPe }}
+        image: "{{ .Values.image.policyPe }}:{{ .Values.image.policyPeVersion}}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: brmsgw
         volumeMounts:
diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml
index 96eb5f08e7..75055c10d8 100644
--- a/kubernetes/policy/templates/dep-drools.yaml
+++ b/kubernetes/policy/templates/dep-drools.yaml
@@ -26,8 +26,6 @@ spec:
                   "--container-name",
                   "pdp",
                   "--container-name",
-                  "pypdp",
-                  "--container-name",
                   "brmsgw"
               ],
               "command": [
@@ -44,7 +42,7 @@ spec:
                       }
                   }
               ],
-              "image": "{{ .Values.image.readiness }}",
+              "image": "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}",
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "drools-readiness"
           }
@@ -55,7 +53,7 @@ spec:
         - /bin/bash
         - -c
         - ./do-start.sh
-        image: {{ .Values.image.policyDrools }}
+        image: "{{ .Values.image.policyDrools }}:{{ .Values.image.policyDroolsVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: drools
         ports:
diff --git a/kubernetes/policy/templates/dep-maria.yaml b/kubernetes/policy/templates/dep-maria.yaml
index abbfdd8f4b..511405b7ac 100644
--- a/kubernetes/policy/templates/dep-maria.yaml
+++ b/kubernetes/policy/templates/dep-maria.yaml
@@ -19,7 +19,7 @@ spec:
         - /bin/bash
         - -c
         - exec bash /tmp/do-start.sh
-        image: {{ .Values.image.policyDb }}
+        image: "{{ .Values.image.policyDb }}:{{ .Values.image.policyDbVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: mariadb
         ports:
diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml
index 4507508935..de067b162f 100644
--- a/kubernetes/policy/templates/dep-nexus.yaml
+++ b/kubernetes/policy/templates/dep-nexus.yaml
@@ -33,7 +33,7 @@ spec:
                       }
                   }
               ],
-              "image": "{{ .Values.image.readiness }}",
+              "image": "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}",
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "nexus-readiness"
           }
@@ -44,7 +44,7 @@ spec:
         - /bin/bash
         - -c
         - bash -c "/opt/nexus/nexus-2.14.2-01/bin/nexus start && sleep 1000d"
-        image: {{ .Values.image.policyNexus }}
+        image: "{{ .Values.image.policyNexus }}:{{ .Values.image.policyNexusVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: nexus
       imagePullSecrets:
diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml
index 8ee2370c4a..fcb590bdb2 100644
--- a/kubernetes/policy/templates/dep-pap.yaml
+++ b/kubernetes/policy/templates/dep-pap.yaml
@@ -35,7 +35,7 @@ spec:
                       }
                   }
               ],
-              "image": "{{ .Values.image.readiness }}",
+              "image": "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}",
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "pap-readiness"
           },
@@ -69,7 +69,7 @@ spec:
         - /bin/bash
         - ./do-start.sh
         - pap
-        image: {{ .Values.image.policyPe }}
+        image: "{{ .Values.image.policyPe }}:{{ .Values.image.policyPeVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: pap
         ports:
diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml
index c5ea267ba5..c8a4f7108a 100644
--- a/kubernetes/policy/templates/dep-pdp.yaml
+++ b/kubernetes/policy/templates/dep-pdp.yaml
@@ -38,7 +38,7 @@ spec:
                       }
                   }
               ],
-              "image": "{{ .Values.image.readiness }}",
+              "image": "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}",
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "pdp-readiness"
           }
@@ -49,7 +49,7 @@ spec:
         - /bin/bash
         - ./do-start.sh
         - pdp
-        image: {{ .Values.image.policyPe }}
+        image: "{{ .Values.image.policyPe }}:{{ .Values.image.policyPeVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: pdp
         ports:
diff --git a/kubernetes/policy/templates/dep-pypdp.yaml b/kubernetes/policy/templates/dep-pypdp.yaml
deleted file mode 100644
index 4e2c9b62a1..0000000000
--- a/kubernetes/policy/templates/dep-pypdp.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: pypdp
-  namespace: "{{ .Values.nsPrefix }}-policy"
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: pypdp
-  template:
-    metadata:
-      labels:
-        app: pypdp
-      name: pypdp
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "mariadb",
-                  "--container-name",
-                  "nexus",
-                  "--container-name",
-                  "pap",
-                  "--container-name",
-                  "pdp"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "pypdp-readiness"
-          }
-          ]'
-    spec:
-      containers:
-      - command:
-        - /bin/bash
-        - ./do-start.sh
-        - pypdp
-        image: {{ .Values.image.policyPe }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: pypdp
-        ports:
-        - containerPort: 8480
-        readinessProbe:
-          tcpSocket:
-            port: 8480
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        volumeMounts:
-        - mountPath: /tmp/policy-install/config
-          name: pe
-      volumes:
-        - name: pe
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 0f990c94ff..e11ad74294 100644
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -1,9 +1,14 @@
 nsPrefix: onap
 pullPolicy: Always
 image:
-  readiness: oomk8s/readiness-check:1.0.0
-  policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest
-  policyDrools: nexus3.onap.org:10001/openecomp/policy/policy-drools:1.0-STAGING-latest
-  policyDb: nexus3.onap.org:10001/openecomp/policy/policy-db:1.0-STAGING-latest
-  policyNexus: nexus3.onap.org:10001/openecomp/policy/policy-nexus:1.0-STAGING-latest
+  readiness: oomk8s/readiness-check
+  readinessVersion: 1.0.0
+  policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe
+  policyPeVersion: 1.1-STAGING-latest
+  policyDrools: nexus3.onap.org:10001/openecomp/policy/policy-drools
+  policyDroolsVersion: 1.1-STAGING-latest
+  policyDb: nexus3.onap.org:10001/openecomp/policy/policy-db
+  policyDbVersion: 1.1-STAGING-latest
+  policyNexus: nexus3.onap.org:10001/openecomp/policy/policy-nexus
+  policyNexusVersion: 1.1-STAGING-latest
   ubuntu: ubuntu:16.04