Merge pull request #84 from alercebroker/prv-candidates/separated-kaf…

…ka-clients Prv Candidates: separated kafka clients
alercebroker · Apr 13, 2023 · 68f4a23 · 68f4a23
2 parents 4f7ee61 + 0ac07ab
commit 68f4a23
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 19 deletions.
diff --git a/charts/prv_candidates/Chart.yaml b/charts/prv_candidates/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: "rc-9442894"
+appVersion: "rc-97da10d"
 description: Previous candidates processor step
 name: prv-candidates
 type: application
-version: 0.4.0
+version: 0.5.0
diff --git a/charts/prv_candidates/templates/configmap.yaml b/charts/prv_candidates/templates/configmap.yaml
@@ -6,7 +6,10 @@ metadata:
 data:
   consumer-topics: {{ .Values.configmap.consumerTopics }}
   consume-messages: "{{ .Values.configmap.consumeMessages }}"
-  internal-server: {{ .Values.configmap.internalServer }}
+  consumer-server: {{ .Values.configmap.consumerServer }}
+  scribe-server: {{ .Values.configmap.scribeServer }}
   scribe-topic: {{ .Values.configmap.scribeTopic }}
+  producer-server: {{ .Values.configmap.producerServer }}
   producer-topic: {{ .Values.configmap.producerTopic }}
+  metrics-server: {{ .Values.configmap.metricsServer }}
   metrics-topic: {{ .Values.configmap.metricsTopic }}
diff --git a/charts/prv_candidates/templates/deployment.yaml b/charts/prv_candidates/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: {{ include "prv-candidates.fullname" . }}
-                  key: internal-server
+                  key: consumer-server
             - name: CONSUMER_GROUP_ID
               value: {{ include "prv-candidates.fullname" . }}
             - name: CONSUME_MESSAGES
@@ -57,17 +57,17 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: {{ include "prv-candidates.fullname" . }}
-                  key: internal-server
+                  key: producer-server
             - name: PRODUCER_TOPIC
               valueFrom:
                 configMapKeyRef:
                   name: {{ include "prv-candidates.fullname" . }}
                   key: producer-topic
-            - name: SCRIBE_SERVER
+            - name: SCRIBE_PRODUCER_SERVER
               valueFrom:
                 configMapKeyRef:
                   name: {{ include "prv-candidates.fullname" . }}
-                  key: internal-server
+                  key: scribe-server
             - name: SCRIBE_PRODUCER_TOPIC
               valueFrom:
                 configMapKeyRef:
@@ -77,23 +77,59 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: {{ include "prv-candidates.fullname" . }}
-                  key: internal-server
+                  key: metrics-server
             - name: METRICS_TOPIC
               valueFrom:
                 configMapKeyRef:
                   name: {{ include "prv-candidates.fullname" . }}
                   key: metrics-topic
-            {{- if .Values.secrets.kafkaAuth.enabled }}
-            - name: KAFKA_USERNAME
+            {{- if .Values.secrets.kafkaAuth.consumer.enabled }}
+            - name: CONSUMER_KAFKA_USERNAME
               valueFrom:
                 secretKeyRef:
                   name: kafka-auth
-                  key: username
-            - name: KAFKA_PASSWORD
+                  key: consumer-username
+            - name: CONSUMER_KAFKA_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: kafka-auth
-                  key: password
+                  key: consumer-password
+            {{- end}}
+            {{- if .Values.secrets.kafkaAuth.producer.enabled }}
+            - name: PRODUCER_KAFKA_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: kafka-auth
+                  key: producer-username
+            - name: PRODUCER_KAFKA_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: kafka-auth
+                  key: producer-password
+            {{- end}}
+            {{- if .Values.secrets.kafkaAuth.scribe.enabled }}
+            - name: SCRIBE_KAFKA_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: kafka-auth
+                  key: scribe-username
+            - name: SCRIBE_KAFKA_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: kafka-auth
+                  key: scribe-password
+            {{- end}}
+            {{- if .Values.secrets.kafkaAuth.metrics.enabled }}
+            - name: METRICS_KAFKA_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: kafka-auth
+                  key: metrics-username
+            - name: METRICS_KAFKA_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: kafka-auth
+                  key: metrics-password
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/prv_candidates/templates/secret.yaml b/charts/prv_candidates/templates/secret.yaml
@@ -14,5 +14,11 @@ metadata:
   name: kafka-auth
   namespace: {{ .Values.namespace }}
 stringData:
-  username: "{{ .Values.secrets.kafkaAuth.username }}"
-  password: "{{ .Values.secrets.kafkaAuth.password }}"
+  consumer-username: "{{ .Values.secrets.kafkaAuth.consumer.username }}"
+  consumer-password: "{{ .Values.secrets.kafkaAuth.consumer.password }}"
+  producer-username: "{{ .Values.secrets.kafkaAuth.producer.username }}"
+  producer-password: "{{ .Values.secrets.kafkaAuth.producer.password }}"
+  scribe-username: "{{ .Values.secrets.kafkaAuth.scribe.username }}"
+  scribe-password: "{{ .Values.secrets.kafkaAuth.scribe.password }}"
+  metrics-username: "{{ .Values.secrets.kafkaAuth.metrics.username }}"
+  metrics-password: "{{ .Values.secrets.kafkaAuth.metrics.password }}"
diff --git a/charts/prv_candidates/values.yaml b/charts/prv_candidates/values.yaml
@@ -44,9 +44,12 @@ affinity:
 configmap:
   consumerTopics: ""
   consumeMessages: ""
-  internalServer: ""
+  consumerServer: ""
+  scribeServer: ""
   scribeTopic: ""
+  metricsServer: ""
   metricsTopic: ""
+  producerServer: ""
   producerTopic: ""
 
 imageCredentials:
@@ -57,6 +60,19 @@ imageCredentials:
 
 secrets:
   kafkaAuth:
-    enabled: false
-    username: ""
-    password: ""
+    consumer:
+      enabled: false
+      username: ""
+      password: ""
+    producer:
+      enabled: false
+      username: ""
+      password: ""
+    scribe:
+      enabled: false
+      username: ""
+      password: ""
+    metrics:
+      enabled: false
+      username: ""
+      password: ""