improve deployment

spoud · Feb 5, 2024 · 5a3f3ad · 5a3f3ad
1 parent dc14cd0
commit 5a3f3ad
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/deployment/kafka-cost-control/base/aggregator.yaml b/deployment/kafka-cost-control/base/aggregator.yaml
@@ -30,6 +30,8 @@ spec:
           env:
             - name: QUARKUS_KAFKA_STREAMS_STATE_DIR
               value: /home/jboss/kafka-stream/data/
+            - name: QUARKUS_PROFILE
+              value: "ccloud"
           envFrom:
             - secretRef:
                 name: kafka-cost-control-secret

diff --git a/deployment/kafka-cost-control/base/kafka-connect.yaml b/deployment/kafka-cost-control/base/kafka-connect.yaml
@@ -57,49 +57,46 @@ spec:
             - name: CONNECT_VALUE_CONVERTER
               value: org.apache.kafka.connect.json.JsonConverter
 
+            # Connect username and password
+            - name: CLUSTER_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: kafka-cost-control-secret
+                  key: CLUSTER_API_KEY
+            - name: CLUSTER_API_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: kafka-cost-control-secret
+                  key: CLUSTER_API_KEY
+
             # Connect main connection
             - name: CONNECT_BOOTSTRAP_SERVERS
               valueFrom:
                 secretKeyRef:
                   name: kafka-cost-control-secret
                   key: KAFKA_BOOTSTRAP_SERVERS
             - name: CONNECT_SASL_JAAS_CONFIG
-              valueFrom:
-                secretKeyRef:
-                  name: kafka-cost-control-secret
-                  key: KAFKA_SASL_JAAS_CONFIG
+              value: org.apache.kafka.common.security.plain.PlainLoginModule required username='${CLUSTER_API_KEY}' password='${CLUSTER_API_SECRET}';
             - name: CONNECT_SECURITY_PROTOCOL
               value: SASL_SSL
             - name: CONNECT_SASL_MECHANISM
               value: PLAIN
 
             # Connect consumer connection
             - name: CONNECT_CONSUMER_BOOTSTRAP_SERVERS
-              valueFrom:
-                secretKeyRef:
-                  name: kafka-cost-control-secret
-                  key: KAFKA_BOOTSTRAP_SERVERS
+              value: ${CONNECT_BOOTSTRAP_SERVERS}
             - name: CONNECT_CONSUMER_SASL_JAAS_CONFIG
-              valueFrom:
-                secretKeyRef:
-                  name: kafka-cost-control-secret
-                  key: KAFKA_SASL_JAAS_CONFIG
+              value: ${CONNECT_SASL_JAAS_CONFIG}
             - name: CONNECT_CONSUMER_SECURITY_PROTOCOL
               value: SASL_SSL
             - name: CONNECT_CONSUMER_SASL_MECHANISM
               value: PLAIN
 
             # Connect producer connection
             - name: CONNECT_PRODUCER_BOOTSTRAP_SERVERS
-              valueFrom:
-                secretKeyRef:
-                  name: kafka-cost-control-secret
-                  key: KAFKA_BOOTSTRAP_SERVERS
+              value: ${CONNECT_BOOTSTRAP_SERVERS}
             - name: CONNECT_PRODUCER_SASL_JAAS_CONFIG
-              valueFrom:
-                secretKeyRef:
-                  name: kafka-cost-control-secret
-                  key: KAFKA_SASL_JAAS_CONFIG
+              value: ${CONNECT_SASL_JAAS_CONFIG}
             - name: CONNECT_PRODUCER_SECURITY_PROTOCOL
               value: SASL_SSL
             - name: CONNECT_PRODUCER_SASL_MECHANISM

diff --git a/deployment/kafka-cost-control/dev/kustomization.yaml b/deployment/kafka-cost-control/dev/kustomization.yaml
@@ -2,7 +2,7 @@ kind: Kustomization
 resources:
   - ../base
 
-namespace: kafka-cost-control
+namespace: kafka-cost-control-dev
 
 patches:
   - path: aggregator.yaml