feat: add option to change consumer-group-id

alercebroker · Mar 14, 2023 · 4a7275e · 4a7275e
1 parent 965f1ac
commit 4a7275e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/charts/s3-step/Chart.yaml b/charts/s3-step/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 0.1.0
+appVersion: 1.3.0
 description: A Helm chart for Kubernetes
 name: s3-step
 type: application
-version: 0.3.0
+version: 0.4.0
diff --git a/charts/s3-step/templates/configmap.yaml b/charts/s3-step/templates/configmap.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Values.namespace }}
 data:
   consumer-topics: {{ .Values.configmap.atlas.consumerTopics }}
+  consumer-group-id: {{ .Values.configmap.atlas.consumerGroupId | default (printf "%s-atlas" (include "s3-step.fullname" .)) }}
   internal-server: {{ .Values.configmap.atlas.internalServer }}
   metrics-topic: {{ .Values.configmap.atlas.metricsTopic }}
   bucket-name: {{ .Values.configmap.atlas.bucketName }}
@@ -18,6 +19,7 @@ metadata:
   namespace: {{ .Values.namespace }}
 data:
   consumer-topics: {{ .Values.configmap.ztf.consumerTopics }}
+  consumer-group-id: {{ .Values.configmap.ztf.consumerGroupId | default (printf "%s-ztf" (include "s3-step.fullname" .)) }}
   internal-server: {{ .Values.configmap.ztf.internalServer }}
   metrics-topic: {{ .Values.configmap.ztf.metricsTopic }}
   bucket-name: {{ .Values.configmap.ztf.bucketName }}

diff --git a/charts/s3-step/templates/deployment_atlas.yaml b/charts/s3-step/templates/deployment_atlas.yaml
@@ -51,7 +51,10 @@ spec:
                   name: '{{ include "s3-step.fullname" . }}-atlas'
                   key: internal-server
             - name: CONSUMER_GROUP_ID
-              value: '{{ include "s3-step.fullname" . }}-atlas'
+              valueFrom:
+                configMapKeyRef:
+                  name: '{{ include "s3-step.fullname" . }}-atlas'
+                  key: consumer-group-id
             - name: METRICS_HOST
               valueFrom:
                 configMapKeyRef:

diff --git a/charts/s3-step/templates/deployment_ztf.yaml b/charts/s3-step/templates/deployment_ztf.yaml
@@ -51,7 +51,10 @@ spec:
                   name: '{{ include "s3-step.fullname" . }}-ztf'
                   key: internal-server
             - name: CONSUMER_GROUP_ID
-              value: '{{ include "s3-step.fullname" . }}-ztf'
+              valueFrom:
+                configMapKeyRef:
+                  name: '{{ include "s3-step.fullname" . }}-ztf'
+                  key: consumer-group-id
             - name: METRICS_HOST
               valueFrom:
                 configMapKeyRef:

diff --git a/charts/s3-step/values.yaml b/charts/s3-step/values.yaml
@@ -10,7 +10,7 @@ image:
   repository: ghcr.io/alercebroker/s3_step
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "rc"
+  tag: ""
 
 imagePullSecrets:
   - name: "image-pull-access"
@@ -57,12 +57,14 @@ affinity:
 configmap:
   ztf:
     consumerTopics: ""
+    consumerGroupId: ""
     internalServer: ""
     metricsTopic: ""
     bucketName: ""
     regionName: ""
   atlas:
     consumerTopics: ""
+    consumerGroupId: ""
     internalServer: ""
     metricsTopic: ""
     bucketName: ""