From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Fri, 8 Sep 2017 15:33:28 +0000 (+0000)
Subject: Merge "Policy 1.1 in Kubernetes"
X-Git-Tag: 2.0.0-ONAP~680
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f6a39a8d6b2d2ee44d157c71a396e4de32ccba69;hp=-c;p=oom.git

Merge "Policy 1.1 in Kubernetes"
---

f6a39a8d6b2d2ee44d157c71a396e4de32ccba69
diff --combined kubernetes/policy/templates/dep-maria.yaml
index 2b0e40eb4e,511405b7ac..30d0db3af5
--- a/kubernetes/policy/templates/dep-maria.yaml
+++ b/kubernetes/policy/templates/dep-maria.yaml
@@@ -19,22 -19,15 +19,22 @@@ 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:
          - containerPort: 3306
 +        volumeMounts:
 +        - mountPath: /var/lib/mysql
 +          name: policy-mariadb-data
          readinessProbe:
            tcpSocket:
              port: 3306
            initialDelaySeconds: 5
            periodSeconds: 10
 +      volumes:
 +      - name: policy-mariadb-data
 +        persistentVolumeClaim:
 +          claimName: policy-db
        imagePullSecrets:
        - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --combined kubernetes/policy/values.yaml
index 25823b0969,e11ad74294..1b2ed0f880
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@@ -1,10 -1,14 +1,15 @@@
  nsPrefix: onap
  pullPolicy: Always
 +nodePortPrefix: 302
  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