pullPolicy: Always
# application images
-image: onap/dmaap/dmaap-bc:2.0.6
+image: onap/dmaap/dmaap-bc:2.0.8
# application configuration
# 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
# 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
# Application configuration defaults.
#################################################################
# application image
-image: onap/dmaap/kafka111:1.0.5
+image: onap/dmaap/kafka111:1.1.1
pullPolicy: Always
"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"
# probe configuration parameters
liveness:
- initialDelaySeconds: 70
+ initialDelaySeconds: 90
periodSeconds: 20
timeoutSeconds: 10
# necessary to disable liveness probe when setting breakpoints
--- /dev/null
+{{/*
+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
{{ 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 }}
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:
# 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
# default number of instances
replicaCount: 3
+zookeeperServers: 3
+
nodeSelector: {}
nodeAffinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 40
+ initialDelaySeconds: 60
periodSeconds: 20
timeoutSeconds: 10
# necessary to disable liveness probe when setting breakpoints
enabled: true
readiness:
- initialDelaySeconds: 40
+ initialDelaySeconds: 60
periodSeconds: 20
timeoutSeconds: 10
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:
# Application configuration defaults.
#################################################################
# application image
-image: onap/dmaap/dmaap-mr:1.1.20
+image: onap/dmaap/dmaap-mr:1.3.0
pullPolicy: Always
kafka: