commit 41aa98e6a9df43d2e8e793e0b7ce0df69d22f126
author Alexis de Talhouët <adetalhouet89@gmail.com> Tue Nov 28 11:29:50 2017 -0500
committer Alexis de Talhouët <alexis.de_talhouet@bell.ca> Tue Nov 28 16:36:43 2017 +0000
tree 0db4880d8c4b506eb08974bfc5ed96361848608f
parent c00c687517d3d764378f54775f0b6a664c1ca221

Adjust clamp to latest

Fixes:
- use proper docker version
- use proper environment variable

Change-Id: I1fba341a9d708c3f11304410f6b0339aa1b22283
Issue-ID: OOM-472
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

kubernetes/clamp/templates/clamp-deployment.yaml

diff --git a/kubernetes/clamp/templates/clamp-deployment.yaml b/kubernetes/clamp/templates/clamp-deployment.yaml
index 493bb49..61091a8 100644
--- a/kubernetes/clamp/templates/clamp-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-deployment.yaml
@@ -45,9 +45,10 @@
       containers:
       - env:
         - name: SPRING_APPLICATION_JSON
-          value: '{"spring.datasource.camunda.url":"jdbc:mysql://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&maxReconnects=100","spring.datasource.camunda.username":
-            "root","spring.datasource.camunda.password": "{{ .Values.mysqlPassword }}", "spring.datasource.cldsdb.url":"jdbc:mysql://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&maxReconnects=100","spring.datasource.cldsdb.username":
-            "root", "spring.datasource.cldsdb.password": "{{ .Values.mysqlPassword }}"}'
+          value: '{
+  "spring.datasource.camunda.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647",
+  "spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647"
+  }'
         image: {{ .Values.image.clampImage }}:{{ .Values.image.clampVersion }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: clamp

kubernetes/clamp/values.yaml

diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index c0362dd..c522be0 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -5,6 +5,6 @@
 image:
   readiness: oomk8s/readiness-check:1.0.0
   clampImage: nexus3.onap.org:10001/onap/clamp
-  clampVersion: 1.1-STAGING-latest
+  clampVersion: v1.1.0
   mariadbImage: nexus3.onap.org:10001/mariadb
   mariadbVersion: 10.1.11