diff options
author | Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-09-04 16:34:04 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-09-04 16:34:04 +0000 |
commit | df232875fb10b77e74ef00df5d248a9628577979 (patch) | |
tree | 73ddf167e3e2bed6411cd103c689eaec6de051ab /kubernetes/common/music/charts/music-cassandra-job | |
parent | df63472f4a01598dc71b7e8a458726c8590d8b41 (diff) | |
parent | 1694e1d1f6ea1af001ed651609cc66b35a0ac4e4 (diff) |
Merge "[GENERAL] Use readiness container v3.0.1"
Diffstat (limited to 'kubernetes/common/music/charts/music-cassandra-job')
-rw-r--r-- | kubernetes/common/music/charts/music-cassandra-job/templates/job.yaml | 4 | ||||
-rw-r--r-- | kubernetes/common/music/charts/music-cassandra-job/values.yaml | 15 |
2 files changed, 9 insertions, 10 deletions
diff --git a/kubernetes/common/music/charts/music-cassandra-job/templates/job.yaml b/kubernetes/common/music/charts/music-cassandra-job/templates/job.yaml index 46310fb0fb..2c6c3379c2 100644 --- a/kubernetes/common/music/charts/music-cassandra-job/templates/job.yaml +++ b/kubernetes/common/music/charts/music-cassandra-job/templates/job.yaml @@ -34,10 +34,10 @@ spec: restartPolicy: Never initContainers: - name: {{ include "common.name" . }}-readiness - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: - - /root/ready.py + - /app/ready.py args: - --timeout - "{{ .Values.global.readinessTimeout }}" diff --git a/kubernetes/common/music/charts/music-cassandra-job/values.yaml b/kubernetes/common/music/charts/music-cassandra-job/values.yaml index ac18195939..eee1a3a522 100644 --- a/kubernetes/common/music/charts/music-cassandra-job/values.yaml +++ b/kubernetes/common/music/charts/music-cassandra-job/values.yaml @@ -20,9 +20,8 @@ global: repository: nexus3.onap.org:10001 # readiness check - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 - # Set default to 4 hrs. + readinessImage: onap/oom/readiness:3.0.1 + # Set default to 4 hrs. # On slow environments dealys this long have been seen. readinessTimeout: 240 # logging agent @@ -34,9 +33,9 @@ global: job: host: music-cassandra port: 9042 - busybox: + busybox: image: library/busybox:latest - cassandra: + cassandra: image: onap/music/cassandra_job:3.0.24 timeout: 30 delay: 120 @@ -45,10 +44,10 @@ cql: replicationClass: "SimpleStrategy" replicationFactor: 3 adminUser: - username: nelson24 - password: nelson24 + username: nelson24 + password: nelson24 passwordReplace: A2C4E6G8I0J2L4O6Q8S0U2W4Y6 - + podManagementPolicy: OrderedReady updateStrategy: type: OnDelete |