summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsunil.unnava <sunil.unnava@att.com>2019-04-15 16:01:38 -0400
committerDominic Lunanuova <dgl@research.att.com>2019-04-30 16:57:00 +0000
commit176d2780476fcb39565410a9f70467a175bc6688 (patch)
tree2a1b140007cd197e19d439c4a7b01556eb1fb77b
parent70b07469dada287b97c41c4eda6c18f514a3f5a6 (diff)
DMAAP MR changes
Mandatory authz check for MR topic subscribe call move ZooKeeper APIKey data directory creation to docker image set mmagent home for logs in mirrormaker agent Issue-ID: DMAAP-1160 Change-Id: I04cebaf8009bd1bc5e4271a3b0286d4e9aaa3eaa Signed-off-by: sunil.unnava <sunil.unnava@att.com>
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/values.yaml2
-rw-r--r--kubernetes/dmaap/components/message-router/charts/message-router-kafka/values.yaml2
-rw-r--r--kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/values.yaml2
-rw-r--r--kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml20
-rw-r--r--kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml4
-rw-r--r--kubernetes/dmaap/components/message-router/values.yaml2
-rw-r--r--kubernetes/dmaap/values.yaml2
7 files changed, 14 insertions, 20 deletions
diff --git a/kubernetes/dmaap/components/dmaap-bc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml
index e59c4d657f..5406ade930 100644
--- a/kubernetes/dmaap/components/dmaap-bc/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/values.yaml
@@ -30,7 +30,7 @@ pullPolicy: Always
# application images
repository: nexus3.onap.org:10001
-image: onap/dmaap/dmaap-bc:1.1.2
+image: onap/dmaap/dmaap-bc:1.1.4-STAGING-latest
# application configuration
diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-kafka/values.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-kafka/values.yaml
index 9f92610502..6d789500d8 100644
--- a/kubernetes/dmaap/components/message-router/charts/message-router-kafka/values.yaml
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-kafka/values.yaml
@@ -30,7 +30,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/dmaap/kafka111:0.0.6
+image: onap/dmaap/kafka111:1.0.0
pullPolicy: Always
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
busyBoxImage: busybox:1.30
diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/values.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/values.yaml
index f630e9489b..6d62edd96d 100644
--- a/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/values.yaml
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-mirrormaker/values.yaml
@@ -30,7 +30,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/dmaap/kafka111:0.0.6
+image: onap/dmaap/kafka111:1.0.0
pullPolicy: Always
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
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
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index b141207a03..cfd7127666 100644
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -28,7 +28,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/dmaap/dmaap-mr:1.1.12
+image: onap/dmaap/dmaap-mr:1.1.13
pullPolicy: Always
kafka:
diff --git a/kubernetes/dmaap/values.yaml b/kubernetes/dmaap/values.yaml
index e7b39af1ad..1c18bb2673 100644
--- a/kubernetes/dmaap/values.yaml
+++ b/kubernetes/dmaap/values.yaml
@@ -22,7 +22,7 @@ global:
readinessImage: readiness-check:2.0.0
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
- clientImage: onap/dmaap/dbc-client:1.0.5
+ clientImage: onap/dmaap/dbc-client:1.0.8-STAGING-latest
# application configuration
config:
logstashServiceName: log-ls