Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[STRIMZI] Make Strimzi ServiceMesh compatible"
[oom.git]
/
kubernetes
/
strimzi
/
templates
/
strimzi-kafka.yaml
diff --git
a/kubernetes/strimzi/templates/strimzi-kafka.yaml
b/kubernetes/strimzi/templates/strimzi-kafka.yaml
index
4ca53a2
..
06802da
100644
(file)
--- a/
kubernetes/strimzi/templates/strimzi-kafka.yaml
+++ b/
kubernetes/strimzi/templates/strimzi-kafka.yaml
@@
-46,19
+46,29
@@
spec:
tls: true
authentication:
type: tls
tls: true
authentication:
type: tls
+ configuration:
+ bootstrap:
+ nodePort: {{ .Values.global.nodePortPrefixExt }}91
+ brokers:
+ - broker: 0
+ nodePort: {{ .Values.global.nodePortPrefixExt }}92
+ - broker: 1
+ nodePort: {{ .Values.global.nodePortPrefixExt }}93
authorization:
type: simple
superUsers:
authorization:
type: simple
superUsers:
- - {{
include "common.release" . }}-{{
.Values.kafkaStrimziAdminUser }}
+ - {{ .Values.kafkaStrimziAdminUser }}
template:
pod:
securityContext:
runAsUser: 0
fsGroup: 0
config:
template:
pod:
securityContext:
runAsUser: 0
fsGroup: 0
config:
+ default.replication.factor: {{ .Values.replicaCount }}
+ min.insync.replicas: {{ .Values.replicaCount }}
offsets.topic.replication.factor: {{ .Values.replicaCount }}
transaction.state.log.replication.factor: {{ .Values.replicaCount }}
offsets.topic.replication.factor: {{ .Values.replicaCount }}
transaction.state.log.replication.factor: {{ .Values.replicaCount }}
- transaction.state.log.min.isr:
2
+ transaction.state.log.min.isr:
{{ .Values.replicaCount }}
log.message.format.version: "3.0"
inter.broker.protocol.version: "3.0"
storage:
log.message.format.version: "3.0"
inter.broker.protocol.version: "3.0"
storage:
@@
-68,7
+78,7
@@
spec:
- id: 0
type: persistent-claim
size: {{ .Values.persistenceKafka.size }}
- id: 0
type: persistent-claim
size: {{ .Values.persistenceKafka.size }}
- deleteClaim:
fals
e
+ deleteClaim:
tru
e
class: {{ include "common.storageClass" (dict "dot" . "suffix" "kafka" "persistenceInfos" .Values.persistenceKafka) }}
zookeeper:
template:
class: {{ include "common.storageClass" (dict "dot" . "suffix" "kafka" "persistenceInfos" .Values.persistenceKafka) }}
zookeeper:
template:
@@
-79,10
+89,13
@@
spec:
replicas: {{ .Values.replicaCount }}
config:
ssl.hostnameVerification: false
replicas: {{ .Values.replicaCount }}
config:
ssl.hostnameVerification: false
+ {{- if (include "common.onServiceMesh" .) }}
+ sslQuorum: false
+ {{- end }}
storage:
type: persistent-claim
size: {{ .Values.persistenceZk.size }}
storage:
type: persistent-claim
size: {{ .Values.persistenceZk.size }}
- deleteClaim:
fals
e
+ deleteClaim:
tru
e
class: {{ include "common.storageClass" (dict "dot" . "suffix" "zk" "persistenceInfos" .Values.persistenceZk) }}
entityOperator:
topicOperator: {}
class: {{ include "common.storageClass" (dict "dot" . "suffix" "zk" "persistenceInfos" .Values.persistenceZk) }}
entityOperator:
topicOperator: {}