diff options
| author |   Brian Freeman <bf1936@att.com> | 2019-04-30 19:21:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-30 19:21:42 +0000 |
| commit | da0cdcaf4f6187f6cc89466e3124968104ddc48a (patch) | |
| tree | 93c435a6fab3205736ccba0a73c8dda1bf56dea0 /kubernetes/dmaap/components/message-router/charts/message-router-zookeeper | |
| parent | 354afbbf205d4c7e34337d7af184560882966d91 (diff) | |
| parent | 176d2780476fcb39565410a9f70467a175bc6688 (diff) | |
Merge "DMAAP MR changes"
Diffstat (limited to 'kubernetes/dmaap/components/message-router/charts/message-router-zookeeper')
2 files changed, 9 insertions, 15 deletions
diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml index 6c15783c3d..50b047a906 100644 --- a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml +++ b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml @@ -53,24 +53,16 @@ spec: {{ toYaml .Values.nodeAffinity | indent 10 }} {{- end }} initContainers: - - name: {{ include "common.name" . }}-seed-topics-apikeys + - name: {{ include "common.name" . }}-permission-fixer command: - - /bin/bash - - -c + - sh + - -exec - > - if [ -d /tmp/zookeeper/topics/version-2 ]; then - echo "nothing to do"; - else - git clone -b {{ .Values.config.gerritBranch }} --single-branch {{ .Values.config.gerritProject }} /tmp/zookeeper/gerrit; - echo "Clone complete. Copying from /tmp/zookeeper/gerrit/oom-projects/data-zookeeper/* to /tmp/zookeeper/topics"; - cp -var /tmp/zookeeper/gerrit/oom-topics/data-zookeeper/* /tmp/zookeeper/topics; - chown -R 1000:1000 /tmp/zookeeper/topics; - echo "Done."; - fi - image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.ubuntuInitImage }}" + chown -R 1000:1000 /tmp/zookeeper/apikeys; + image: "{{ .Values.busyBoxRepository }}/{{ .Values.busyBoxImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - - mountPath: /tmp/zookeeper/topics + - mountPath: /tmp/zookeeper/apikeys name: zookeeper-data containers: - name: {{ include "common.name" . }} diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml index 22daf946bb..9c737e5ac3 100644 --- a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml +++ b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml @@ -30,9 +30,11 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/dmaap/zookeeper:4.0.0 +image: onap/dmaap/zookeeper:5.0.0 pullPolicy: Always ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 +busyBoxImage: busybox:1.30 +busyBoxRepository: docker.io # flag to enable debugging - application support required debugEnabled: false |