Merge "[DCAEMOD] Helm-gen support for log.path setting"

diff --git a/kubernetes/common/mariadb-galera/templates/service.yaml b/kubernetes/common/mariadb-galera/templates/service.yaml
index 880bc55..9b4c05e 100644 (file)
--- a/kubernetes/common/mariadb-galera/templates/service.yaml
+++ b/kubernetes/common/mariadb-galera/templates/service.yaml
@@ -29,7 +29,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: {{ include "common.servicename" . }}
+      app.kubernetes.io/name: {{ include "common.servicename" . }}
   portLevelMtls:
     {{ .Values.service.internalPort }}:
       mode: DISABLE

diff --git a/kubernetes/strimzi/templates/strimzi-kafka.yaml b/kubernetes/strimzi/templates/strimzi-kafka.yaml
index 58193e3..4e8779d 100644 (file)
--- a/kubernetes/strimzi/templates/strimzi-kafka.yaml
+++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml
@@ -88,6 +88,7 @@ spec:
     replicas: {{ .Values.replicaCount }}
     config:
       ssl.hostnameVerification: false
+      ssl.quorum.hostnameVerification: false
       {{- if (include "common.onServiceMesh" .) }}
       sslQuorum: false
       {{- end }}

diff --git a/kubernetes/strimzi/values.yaml b/kubernetes/strimzi/values.yaml
index 9e63c2c..26b714a 100644 (file)
--- a/kubernetes/strimzi/values.yaml
+++ b/kubernetes/strimzi/values.yaml
@@ -23,7 +23,7 @@ global:
 #################################################################
 # Application configuration defaults.
 #################################################################
-replicaCount: 2
+replicaCount: 3
 kafkaInternalPort: 9092
 saslMechanism: scram-sha-512
 version: 3.0.0