diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2017-11-30 03:10:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-30 03:10:35 +0000 |
| commit | 52c3636eca08e5846a64119ff44e690767182fb7 (patch) | |
| tree | c7f675c5b73141c5d2bf4964d39a2864f3f90e23 /kubernetes | |
| parent | d8048af2bf14137ab0d83960aa781840d83ba439 (diff) | |
| parent | b7e1449878e096e81445aaff7dc4317fc6af1246 (diff) | |
Merge "Adjust clamp to latest (Amsterdam)" into release-1.1.0
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/clamp/templates/clamp-deployment.yaml | 7 | ||||
| -rw-r--r-- | kubernetes/clamp/values.yaml | 2 |
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 |