X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=kubernetes%2Fstrimzi%2Fcomponents%2Fstrimzi-kafka-bridge%2Ftemplates%2Fstrimzi-kb.yaml;fp=kubernetes%2Fdmaap%2Fcomponents%2Fdmaap-strimzi%2Ftemplates%2Fdmaap-strimzi-kb.yaml;h=3abb04af10043f00f010fd7ce57d3305b52d959f;hb=d9203f1ab25792030931f373a7ee184ebfa7cd8d;hp=8dd7eb97cb725ef89b1e52bc6b2390284a72f327;hpb=22a994c04d3322212906011e5982956b2d8e59b4;p=oom.git

diff --git a/kubernetes/dmaap/components/dmaap-strimzi/templates/dmaap-strimzi-kb.yaml b/kubernetes/strimzi/components/strimzi-kafka-bridge/templates/strimzi-kb.yaml
similarity index 50%
rename from kubernetes/dmaap/components/dmaap-strimzi/templates/dmaap-strimzi-kb.yaml
rename to kubernetes/strimzi/components/strimzi-kafka-bridge/templates/strimzi-kb.yaml
index 8dd7eb97cb..3abb04af10 100644
--- a/kubernetes/dmaap/components/dmaap-strimzi/templates/dmaap-strimzi-kb.yaml
+++ b/kubernetes/strimzi/components/strimzi-kafka-bridge/templates/strimzi-kb.yaml
@@ -15,23 +15,16 @@
 */}}
 apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaBridge
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
 spec:
-  replicas: {{ .Values.kafkaBridgeReplicaCount }}
-  enableMetrics: false
-  bootstrapServers: {{ include "common.release" . }}-{{ .Values.global.kafkaBootstrap }}:{{ .Values.global.kafkaInternalPort }}
+  replicas: {{ .Values.replicaCount }}
+  bootstrapServers: {{ include "common.release" . }}-strimzi-kafka-bootstrap:{{ .Values.config.kafkaInternalPort }}
   authentication:
-    type: {{ .Values.global.saslMechanism }}
-    username: {{ .Values.global.kafkaStrimziAdminUser }}
+    type: {{ .Values.config.saslMechanism }}
+    username: {{ .Values.config.strimziKafkaAdminUser }}
     passwordSecret:
-      secretName: {{ .Values.global.kafkaStrimziAdminUser }}
+      secretName: {{ .Values.config.strimziKafkaAdminUser }}
       password: password
+  enableMetrics: {{ .Values.config.enableMetrics }}
   http:
-    port: {{ .Values.kafkaBridgePort }}
+    port: {{ .Values.config.port }}