feat: Testing pipeline with multiple module instances

kindredgroup · Jun 28, 2024 · 5c8f998 · 5c8f998
1 parent 4d6adee
commit 5c8f998
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/brownie/deployment/helm/templates/dev-secretstore.yaml b/brownie/deployment/helm/templates/dev-secretstore.yaml
@@ -39,8 +39,7 @@ spec:
               "hostnames": {{ .Values.KAFKA_BROKERS | quote }},
               "port": {{ .Values.KAFKA_PORT | quote }},
               "username": {{ .Values.KAFKA_USERNAME | quote }},
-              "password": {{ .Values.KAFKA_PASSWORD | quote }},
-              "saslMechanism": {{ .Values.SASL_MECHANISM | quote }}
+              "password": {{ .Values.KAFKA_PASSWORD | quote }}
             }
       {{- end }}
       {{- if .Values.KAFKA_CONFIG_NAMES }}
@@ -51,8 +50,7 @@ spec:
               "hostnames": {{ (index $.Values (printf "%s_KAFKA_BROKERS" ($cfgName | upper))) | quote }},
               "port": {{ (index $.Values (printf "%s_KAFKA_PORT" ($cfgName | upper))) | quote }},
               "username": {{ (index $.Values (printf "%s_KAFKA_USERNAME" ($cfgName | upper))) | quote }},
-              "password": {{ (index $.Values (printf "%s_KAFKA_PASSWORD" ($cfgName | upper))) | quote }},
-              "saslMechanism": {{ (index $.Values (printf "%s_SASL_MECHANISM" ($cfgName | upper))) | quote }}
+              "password": {{ (index $.Values (printf "%s_KAFKA_PASSWORD" ($cfgName | upper))) | quote }}
             }
       {{- end }}
       {{- end }}

diff --git a/brownie/deployment/helm/templates/external-secrets.yaml b/brownie/deployment/helm/templates/external-secrets.yaml
@@ -72,6 +72,10 @@ spec:
       remoteRef:
         key: {{ $.Values.EXTERNAL_SECRET_KAFKA_PATH }}
         property: username
+    - secretKey: KAFKA_CLIENT_ID
+      remoteRef:
+        key: {{ $.Values.EXTERNAL_SECRET_KAFKA_PATH }}
+        property: username # intentionally use username  
     - secretKey: KAFKA_PASSWORD
       remoteRef:
         key: {{ $.Values.EXTERNAL_SECRET_KAFKA_PATH }}
@@ -91,6 +95,10 @@ spec:
       remoteRef:
         key: {{ $.Values.EXTERNAL_SECRET_KAFKA_PATH }}-{{ $cfgName | lower }}
         property: username
+    - secretKey: {{ $cfgName | upper }}_KAFKA_CLIENT_ID
+      remoteRef:
+        key: {{ $.Values.EXTERNAL_SECRET_KAFKA_PATH }}-{{ $cfgName | lower }}
+        property: username        
     - secretKey: {{ $cfgName | upper }}_KAFKA_PASSWORD
       remoteRef:
         key: {{ $.Values.EXTERNAL_SECRET_KAFKA_PATH }}-{{ $cfgName | lower }}

diff --git a/brownie/scripts/deploy.sh b/brownie/scripts/deploy.sh
@@ -87,7 +87,7 @@ getModuleOverwrites() {
 POSTGRESQL_CONFIGS=$(getModuleOverwrites "${POSTGRESQL_CONFIG_NAMES}" "PGHOST PGPORT PGUSER PGPASSWORD PGDATABASE" "POSTGRESQL_CONFIG_NAMES")
 HELM_OVERWRITES="${HELM_OVERWRITES} ${POSTGRESQL_CONFIGS}"
 
-KAFKA_CONFIGS=$(getModuleOverwrites "${KAFKA_CONFIG_NAMES}" "KAFKA_BROKERS KAFKA_PORT KAFKA_USERNAME KAFKA_PASSWORD")
+KAFKA_CONFIGS=$(getModuleOverwrites "${KAFKA_CONFIG_NAMES}" "KAFKA_BROKERS KAFKA_PORT KAFKA_USERNAME KAFKA_PASSWORD KAFKA_CLIENT_ID")
 HELM_OVERWRITES="${HELM_OVERWRITES} ${KAFKA_CONFIGS}"
 
 HELM_ARGS="upgrade --install --atomic --timeout 120s --namespace ${K8S_NAMESPACE}"