[DMAAP] Bump image versions

Bump DMaaP. kafka and zookeeper versions for I release

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Ie8b11626b868c2e74dc2a2c29de635d46b2f7d6c
Issue-ID: OOM-2795

8 files changed, 33 insertions, 15 deletions

diff --git a/kubernetes/dmaap/components/dmaap-bc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml
index a3d42d2130..a8e7cf91c7 100644
--- a/kubernetes/dmaap/components/dmaap-bc/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/values.yaml
@@ -40,7 +40,7 @@ secrets:
 pullPolicy: Always
 
 # application images
-image: onap/dmaap/dmaap-bc:2.0.6
+image: onap/dmaap/dmaap-bc:2.0.8
 
 
 # application configuration
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
index ced70050a3..eb6a48802e 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
@@ -43,7 +43,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/dmaap/datarouter-node:2.1.8
+image: onap/dmaap/datarouter-node:2.1.9
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index cf25468fe1..c7ac9ad600 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -41,7 +41,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/dmaap/datarouter-prov:2.1.8
+image: onap/dmaap/datarouter-prov:2.1.9
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
index 5732c5de0e..16a4c0fccb 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml
@@ -53,7 +53,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/dmaap/kafka111:1.0.5
+image: onap/dmaap/kafka111:1.1.1
 pullPolicy: Always
 
 
@@ -83,11 +83,9 @@ configurationOverrides:
   "log.dirs": "/var/lib/kafka/data"
   "log.retention.hours": "168"
   "num.partitions": "3"
-  "offsets.topic.replication.factor": "3"
   "transaction.state.log.replication.factor": "1"
   "transaction.state.log.min.isr": "1"
   "num.recovery.threads.per.data.dir": "5"
-  "log.retention.hours": "168"
   "zookeeper.connection.timeout.ms": "6000"
   "default.replication.factor": "3"
   "zookeeper.set.acl": "true"
@@ -151,7 +149,7 @@ tolerations: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 70
+  initialDelaySeconds: 90
   periodSeconds: 20
   timeoutSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/_zkservers.tpl b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/_zkservers.tpl
new file mode 100644
index 0000000000..8b88d7bb36
--- /dev/null
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/_zkservers.tpl
@@ -0,0 +1,16 @@
+{{/*
+Create a server list string based on fullname, namespace, # of zookeeperServers
+in a format like "zkhost1:port:port;zkhost2:port:port"
+*/}}
+{{- define "zookeeper.serverlist" -}}
+{{- $namespace := include "common.namespace" . }}
+{{- $fullname := include "common.fullname" . -}}
+{{- $name := include "common.name" . -}}
+{{- $serverPort := .Values.service.serverPort -}}
+{{- $leaderElectionPort := .Values.service.leaderElectionPort -}}
+{{- $zk := dict "zookeeperServers" (list) -}}
+{{- range $idx, $v := until (int .Values.zookeeperServers) }}
+{{- $noop := printf "%s-%d.%s.%s.svc.cluster.local:%d:%d" $fullname $idx $name $namespace (int $serverPort) (int $leaderElectionPort) | append $zk.zookeeperServers | set $zk "zookeeperServers" -}}
+{{- end }}
+{{- printf "%s" (join ";" $zk.zookeeperServers) | quote -}}
+{{- end -}}
\ No newline at end of file
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml
index f5473ec589..cac75b1565 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/templates/statefulset.yaml
@@ -125,14 +125,14 @@ spec:
         {{ if eq .Values.liveness.enabled true }}
         livenessProbe:
           exec:
-            command:  ['/bin/bash', '-c', 'echo "ruok" | nc -w 2 -q 2 localhost 2181 | grep imok']
+            command:  ['/bin/bash', '-c', 'echo "ruok" | nc -w 2 localhost 2181 | grep imok']
           initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
           timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
         {{ end }}
         readinessProbe:
           exec:
-            command: ['/bin/bash', '-c', 'echo "ruok" | nc -w 2 -q 2 localhost 2181 | grep imok']
+            command: ['/bin/bash', '-c', 'echo "ruok" | nc -w 2 localhost 2181 | grep imok']
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
           timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
@@ -165,6 +165,8 @@ spec:
           value: "{{ .Values.zkConfig.kafkaOpts }}"
         - name: ZOOKEEPER_QUORUM_LISTEN_ON_ALL_IPS
           value: "true"
+        - name: ZOOKEEPER_SERVERS
+          value: {{ template "zookeeper.serverlist" . }}
         - name: ZOOKEEPER_SERVER_ID
           valueFrom:
             fieldRef:
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml
index 6863acc7a2..fae361a4c8 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/values.yaml
@@ -24,7 +24,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/dmaap/zookeeper:6.0.3
+image: onap/dmaap/zookeeper:6.1.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -34,6 +34,8 @@ debugEnabled: false
 # default number of instances
 replicaCount: 3
 
+zookeeperServers: 3
+
 nodeSelector: {}
 
 nodeAffinity: {}
@@ -44,7 +46,7 @@ tolerations: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 40
+  initialDelaySeconds: 60
   periodSeconds: 20
   timeoutSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
@@ -52,7 +54,7 @@ liveness:
   enabled: true
 
 readiness:
-  initialDelaySeconds: 40
+  initialDelaySeconds: 60
   periodSeconds: 20
   timeoutSeconds: 10
 
@@ -60,12 +62,12 @@ readiness:
 zkConfig:
   tickTime: 2000
   syncLimit: 5
-  initLimit: 10
+  initLimit: 20
   maxClientCnxns: 200
   autoPurgeSnapRetainCount: 3
   autoPurgePurgeInterval: 24
   heapOptions: -Xmx2G -Xms2G
-  kafkaOpts: -Djava.security.auth.login.config=/etc/zookeeper/secrets/jaas/zk_server_jaas.conf -Dzookeeper.kerberos.removeHostFromPrincipal=true -Dzookeeper.kerberos.removeRealmFromPrincipal=true -Dzookeeper.authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider -Dzookeeper.requireClientAuthScheme=sasl
+  kafkaOpts: -Djava.security.auth.login.config=/etc/zookeeper/secrets/jaas/zk_server_jaas.conf -Dzookeeper.kerberos.removeHostFromPrincipal=true -Dzookeeper.kerberos.removeRealmFromPrincipal=true -Dzookeeper.authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider -Dzookeeper.requireClientAuthScheme=sasl -Dzookeeper.4lw.commands.whitelist=*
   clientPort: 2181
 
 jmx:
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 7028bb1263..44697d7c92 100644
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -60,7 +60,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/dmaap/dmaap-mr:1.1.20
+image: onap/dmaap/dmaap-mr:1.3.0
 pullPolicy: Always
 
 kafka: