aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorAlexis de Talhouët <adetalhouet89@gmail.com>2017-11-28 11:29:50 -0500
committerAlexis de Talhouët <alexis.de_talhouet@bell.ca>2017-11-28 16:36:43 +0000
commit41aa98e6a9df43d2e8e793e0b7ce0df69d22f126 (patch)
tree0db4880d8c4b506eb08974bfc5ed96361848608f /kubernetes
parentc00c687517d3d764378f54775f0b6a664c1ca221 (diff)
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>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/clamp/templates/clamp-deployment.yaml7
-rw-r--r--kubernetes/clamp/values.yaml2
2 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/clamp/templates/clamp-deployment.yaml b/kubernetes/clamp/templates/clamp-deployment.yaml
index 493bb49b9e..61091a87f3 100644
--- a/kubernetes/clamp/templates/clamp-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-deployment.yaml
@@ -45,9 +45,10 @@ spec:
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
diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index c0362dd405..c522be071e 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -5,6 +5,6 @@ mysqlPassword: strong_pitchou
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