From 3d410523e82887e9b63b5e93815bd5f2738effb3 Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Mon, 1 Jun 2026 14:56:01 +0200
Subject: [PATCH 1/2] chore: bump kafka version to 4.2.1

---
 stacks/airflow/kafka.yaml                            | 2 +-
 stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml | 2 +-
 stacks/nifi-kafka-druid-superset-s3/kafka.yaml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stacks/airflow/kafka.yaml b/stacks/airflow/kafka.yaml
index 43ffd09e..e4cd614f 100644
--- a/stacks/airflow/kafka.yaml
+++ b/stacks/airflow/kafka.yaml
@@ -14,7 +14,7 @@ metadata:
   name: kafka
 spec:
   image:
-    productVersion: 4.1.1
+    productVersion: 4.2.1
   clusterConfig:
     tls:
       serverSecretClass: tls
diff --git a/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml b/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml
index a763b42f..e2751668 100644
--- a/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml
+++ b/stacks/data-lakehouse-iceberg-trino-spark/kafka.yaml
@@ -5,7 +5,7 @@ metadata:
   name: kafka
 spec:
   image:
-    productVersion: 4.1.1
+    productVersion: 4.2.1
   clusterConfig:
     authentication:
       - authenticationClass: kafka-client-tls
diff --git a/stacks/nifi-kafka-druid-superset-s3/kafka.yaml b/stacks/nifi-kafka-druid-superset-s3/kafka.yaml
index f0a255ad..f713b5a6 100644
--- a/stacks/nifi-kafka-druid-superset-s3/kafka.yaml
+++ b/stacks/nifi-kafka-druid-superset-s3/kafka.yaml
@@ -5,7 +5,7 @@ metadata:
   name: kafka
 spec:
   image:
-    productVersion: 4.1.1
+    productVersion: 4.2.1
   clusterConfig:
     authentication:
       - authenticationClass: kafka-client-tls

From 9fc4e3e3badcadcbb861521f402ab0b8fa6b293e Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Tue, 2 Jun 2026 12:30:34 +0200
Subject: [PATCH 2/2] fix druid postgres connection

---
 stacks/nifi-kafka-druid-superset-s3/druid.yaml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/stacks/nifi-kafka-druid-superset-s3/druid.yaml b/stacks/nifi-kafka-druid-superset-s3/druid.yaml
index f079bba1..c631a11c 100644
--- a/stacks/nifi-kafka-druid-superset-s3/druid.yaml
+++ b/stacks/nifi-kafka-druid-superset-s3/druid.yaml
@@ -8,12 +8,11 @@ spec:
     productVersion: 35.0.1
   clusterConfig:
     zookeeperConfigMapName: druid-znode
-    metadataStorageDatabase:
-      dbType: postgresql
-      connString: jdbc:postgresql://postgresql-druid/druid
-      host: postgresql-druid
-      port: 5432
-      credentialsSecret: druid-db-credentials
+    metadataDatabase:
+      postgresql:
+        host: postgresql-druid
+        database: druid
+        credentialsSecretName: druid-db-credentials
     deepStorage:
       s3:
         bucket: