policy K8S-Helm Parameterization

changed policy k8s deployment to support helm parameterization. updated images to 1.1
Issue-ID: OOM-52
Change-Id: I4eb0626c7c00ace2c266d6ddbb1313f3b654d69e
Signed-off-by: kerenj <keren.joseph@amdocs.com>

diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash
index dd6b22d..070dce9 100644 (file)
--- a/kubernetes/oneclick/setenv.bash
+++ b/kubernetes/oneclick/setenv.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal')
-ONAP_APPS=('sdc' 'aai' 'policy' 'appc')
+HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy')
+ONAP_APPS=('sdc' 'aai' 'appc')
 ONAP_DOCKER_REGISTRY_KEY=${ONAP_DOCKER_REGISTRY_KEY:-onap-docker-registry-key}
 ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001}
 ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker}

diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
new file mode 100644 (file)
index 0000000..0f877a0
--- /dev/null
+++ b/kubernetes/policy/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: policy
+version: 0.1.0

diff --git a/kubernetes/policy/all-services.yaml b/kubernetes/policy/templates/all-services.yaml
similarity index 86%
rename from kubernetes/policy/all-services.yaml
rename to kubernetes/policy/templates/all-services.yaml
index d8d2cfa..e15b129 100644 (file)
--- a/kubernetes/policy/all-services.yaml
+++ b/kubernetes/policy/templates/all-services.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: mariadb
+  namespace: {{ .Values.NS }}
   labels:
     app: mariadb
 spec:
@@ -18,6 +19,7 @@ metadata:
   labels:
     app: nexus
   name: nexus
+  namespace: {{ .Values.NS }}
 spec:
   ports:
   - name: nexus-port
@@ -32,6 +34,7 @@ metadata:
   labels:
     app: drools
   name: drools
+  namespace: {{ .Values.NS }}
 spec:
   ports:
   - name: "drools-port"
@@ -45,6 +48,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: pap
+  namespace: {{ .Values.NS }}
   labels:
     app: pap
 spec:
@@ -63,6 +67,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: pdp
+  namespace: {{ .Values.NS }}
   labels:
     app: pdp
 spec:
@@ -78,6 +83,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: pypdp
+  namespace: {{ .Values.NS }}
   labels:
     app: pypdp
 spec:
@@ -93,6 +99,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: brmsgw
+  namespace: {{ .Values.NS }}
   labels:
     app: brmsgw
 spec:

diff --git a/kubernetes/policy/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml
similarity index 82%
rename from kubernetes/policy/dep-brmsgw.yaml
rename to kubernetes/policy/templates/dep-brmsgw.yaml
index 6758abf..3f59d21 100644 (file)
--- a/kubernetes/policy/dep-brmsgw.yaml
+++ b/kubernetes/policy/templates/dep-brmsgw.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: brmsgw
+  namespace: {{ .Values.NS }}
 spec:
   replicas: 1
   selector:
@@ -41,8 +42,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "brmsgw-readiness"
           }
           ]'
@@ -52,7 +53,8 @@ spec:
         - /bin/bash
         - ./do-start.sh
         - brmsgw
-        image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest
+        image: {{ .Values.image.policyPe }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: brmsgw
         volumeMounts:
         - mountPath: /tmp/policy-install/config
@@ -60,6 +62,6 @@ spec:
       volumes:
         - name: pe
           hostPath:
-            path: /dockerdata-nfs/onapdemo/policy/opt/policy/config/pe/
+            path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/
       imagePullSecrets:
       - name: onap-docker-registry-key

diff --git a/kubernetes/policy/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml
similarity index 83%
rename from kubernetes/policy/dep-drools.yaml
rename to kubernetes/policy/templates/dep-drools.yaml
index fbc8e17..101066f 100644 (file)
--- a/kubernetes/policy/dep-drools.yaml
+++ b/kubernetes/policy/templates/dep-drools.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: drools
+  namespace: {{ .Values.NS }}
 spec:
   replicas: 1
   selector:
@@ -43,8 +44,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "drools-readiness"
           }
           ]'
@@ -54,7 +55,8 @@ spec:
         - /bin/bash
         - -c
         - ./do-start.sh
-        image: nexus3.onap.org:10001/openecomp/policy/policy-drools:1.0-STAGING-latest
+        image: {{ .Values.image.policyDrools }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: drools
         ports:
         - containerPort: 6969
@@ -71,9 +73,9 @@ spec:
       volumes:
         - name: drools-settingsxml
           hostPath:
-            path:  /dockerdata-nfs/onapdemo/policy/drools/settings.xml
+            path:  /dockerdata-nfs/onap/policy/drools/settings.xml
         - name: drools
           hostPath:
-            path:  /dockerdata-nfs/onapdemo/policy/opt/policy/config/drools/
+            path:  /dockerdata-nfs/onap/policy/opt/policy/config/drools/
       imagePullSecrets:
       - name: onap-docker-registry-key

diff --git a/kubernetes/policy/dep-maria.yaml b/kubernetes/policy/templates/dep-maria.yaml
similarity index 82%
rename from kubernetes/policy/dep-maria.yaml
rename to kubernetes/policy/templates/dep-maria.yaml
index 21914c8..63306d4 100644 (file)
--- a/kubernetes/policy/dep-maria.yaml
+++ b/kubernetes/policy/templates/dep-maria.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: mariadb
+  namespace: {{ .Values.NS }}
 spec:
   replicas: 1
   selector:
@@ -18,7 +19,8 @@ spec:
         - /bin/bash
         - -c
         - exec bash /tmp/do-start.sh
-        image: nexus3.onap.org:10001/openecomp/policy/policy-db:1.0-STAGING-latest
+        image: {{ .Values.image.policyDb }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: mariadb
         ports:
         - containerPort: 3306

diff --git a/kubernetes/policy/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml
similarity index 82%
rename from kubernetes/policy/dep-nexus.yaml
rename to kubernetes/policy/templates/dep-nexus.yaml
index 48c289e..d45d77d 100644 (file)
--- a/kubernetes/policy/dep-nexus.yaml
+++ b/kubernetes/policy/templates/dep-nexus.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: nexus
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -32,8 +33,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "nexus-readiness"
           }
           ]'
@@ -43,7 +44,8 @@ spec:
         - /bin/bash
         - -c
         - bash -c "/opt/nexus/nexus-2.14.2-01/bin/nexus start && sleep 1000d"
-        image: nexus3.onap.org:10001/openecomp/policy/policy-nexus:1.0-STAGING-latest
+        image: {{ .Values.image.policyNexus }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: nexus
       imagePullSecrets:
       - name: onap-docker-registry-key

diff --git a/kubernetes/policy/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml
similarity index 83%
rename from kubernetes/policy/dep-pap.yaml
rename to kubernetes/policy/templates/dep-pap.yaml
index 11420da..e7fe902 100644 (file)
--- a/kubernetes/policy/dep-pap.yaml
+++ b/kubernetes/policy/templates/dep-pap.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: pap
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -34,8 +35,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "pap-readiness"
           },
           {
@@ -57,8 +58,8 @@ spec:
                   "name": "pe"
                 }
               ],
-              "image": "ubuntu:16.04",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.ubuntu }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "generate-ip-addr-txt"
           }
           ]'
@@ -68,7 +69,8 @@ spec:
         - /bin/bash
         - ./do-start.sh
         - pap
-        image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest
+        image: {{ .Values.image.policyPe }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: pap
         ports:
         - containerPort: 8443
@@ -84,6 +86,6 @@ spec:
       volumes:
         - name: pe
           hostPath:
-            path: /dockerdata-nfs/onapdemo/policy/opt/policy/config/pe/
+            path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/
       imagePullSecrets:
       - name: onap-docker-registry-key

diff --git a/kubernetes/policy/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml
similarity index 83%
rename from kubernetes/policy/dep-pdp.yaml
rename to kubernetes/policy/templates/dep-pdp.yaml
index 0efe5c3..f7d9bf3 100644 (file)
--- a/kubernetes/policy/dep-pdp.yaml
+++ b/kubernetes/policy/templates/dep-pdp.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: pdp
+  namespace: {{ .Values.NS }}
 spec:
   replicas: 1
   selector:
@@ -37,8 +38,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "pdp-readiness"
           }
           ]'
@@ -48,7 +49,8 @@ spec:
         - /bin/bash
         - ./do-start.sh
         - pdp
-        image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest
+        image: {{ .Values.image.policyPe }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: pdp
         ports:
         - containerPort: 8081
@@ -63,6 +65,6 @@ spec:
       volumes:
         - name: pe
           hostPath:
-            path: /dockerdata-nfs/onapdemo/policy/opt/policy/config/pe/
+            path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/
       imagePullSecrets:
       - name: onap-docker-registry-key

diff --git a/kubernetes/policy/dep-pypdp.yaml b/kubernetes/policy/templates/dep-pypdp.yaml
similarity index 83%
rename from kubernetes/policy/dep-pypdp.yaml
rename to kubernetes/policy/templates/dep-pypdp.yaml
index 91d71d5..8514388 100644 (file)
--- a/kubernetes/policy/dep-pypdp.yaml
+++ b/kubernetes/policy/templates/dep-pypdp.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: pypdp
+  namespace: {{ .Values.NS }}
 spec:
   replicas: 1
   selector:
@@ -39,8 +40,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "pypdp-readiness"
           }
           ]'
@@ -50,7 +51,8 @@ spec:
         - /bin/bash
         - ./do-start.sh
         - pypdp
-        image: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest
+        image: {{ .Values.image.policyPe }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: pypdp
         ports:
         - containerPort: 8480
@@ -65,6 +67,6 @@ spec:
       volumes:
         - name: pe
           hostPath:
-            path: /dockerdata-nfs/onapdemo/policy/opt/policy/config/pe/
+            path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/
       imagePullSecrets:
       - name: onap-docker-registry-key

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
new file mode 100644 (file)
index 0000000..19ff66c
--- /dev/null
+++ b/kubernetes/policy/values.yaml
@@ -0,0 +1,9 @@
+NS: onap-policy
+pullPolicy: Always
+image:
+  readiness: oomk8s/readiness-check:1.0.0
+  policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.1-STAGING-latest
+  policyDrools: nexus3.onap.org:10001/openecomp/policy/policy-drools:1.1-STAGING-latest
+  policyDb: nexus3.onap.org:10001/openecomp/policy/policy-db:1.1-STAGING-latest
+  policyNexus: nexus3.onap.org:10001/openecomp/policy/policy-nexus:1.1-STAGING-latest
+  ubuntu: ubuntu:16.04