From 3e026a0ee63327265359293e222c359f8cc13a53 Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Tue, 8 Oct 2024 10:13:24 +0100
Subject: [PATCH 01/12] Added new value for SQL db. Removed username and
 password from ConfigMap

---
 charts/console/templates/_helpers.tpl |  6 ++++++
 charts/console/values.yaml            | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/charts/console/templates/_helpers.tpl b/charts/console/templates/_helpers.tpl
index b8c5b9b..df0dcc9 100644
--- a/charts/console/templates/_helpers.tpl
+++ b/charts/console/templates/_helpers.tpl
@@ -45,6 +45,12 @@ Return the full configuration for the platform ConfigMap
 {{- $_ := unset $database "username" -}}
 {{- $_ := set $config "database" $database -}}
 
+{{/* Delete SQL database password/username from ConfigMap */}}
+{{- $sql_database := .Values.config.database | deepCopy -}}
+{{- $_ := unset $sql_database "password" -}}
+{{- $_ := unset $sql_database "username" -}}
+{{- $_ := set $config "sql_database" $sql_database -}}
+
 {{ include "common.tplvalues.render" (dict "value" $config "context" $) }}
 {{- end -}}
 
diff --git a/charts/console/values.yaml b/charts/console/values.yaml
index 6a4cdef..5eae7fd 100644
--- a/charts/console/values.yaml
+++ b/charts/console/values.yaml
@@ -90,6 +90,20 @@ config:
     password: ""
     username: ""
 
+  ## @param config.sql_database.enabled Enable SQL database for Conduktor Console
+  ## @param config.sql_database.host Your Conduktor Console SQL Database host
+  ## @param config.sql_database.port Your Conduktor Console SQL Database port
+  ## @param config.sql_database.name Your Conduktor Console SQL Database name
+  ## @param config.sql_database.username Your Conduktor Console SQL Database username
+  ## @param config.sql_database.password Your Conduktor Console SQL Database password
+  sql_database:
+    host: ""
+    port: 1234
+    name: "sql-postgres"
+    password: ""
+    username: ""
+    enabled: false
+
   ## @param config.license Conduktor Console Enterprise license, if none given, the product will run in free tier
   license: ""
 

From e242d5555d8f64fc5a2188bb1ae93a0811dc79f7 Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Wed, 9 Oct 2024 10:56:55 +0100
Subject: [PATCH 02/12] Updated Readme. Renamed the values to conduktor-sql.
 Added conditional checks so it would only ensure values are filled out if you
 have enabled conduktor-sql.

---
 charts/console/README.md                      |  4 ++++
 charts/console/templates/_helpers.tpl         | 22 ++++++++++++++----
 .../templates/console/secret-credentials.yaml |  4 ++++
 charts/console/values.yaml                    | 23 +++++++++++--------
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/charts/console/README.md b/charts/console/README.md
index 8176e8d..60e6606 100644
--- a/charts/console/README.md
+++ b/charts/console/README.md
@@ -78,6 +78,10 @@ A list of Kafka clusters can be configured by adding them under the `config.clus
 | `config.database.name`                 | Your Conduktor Console Database name                                                                                                                 | `postgres` |
 | `config.database.username`             | Your Conduktor Console Database username                                                                                                             | `""`       |
 | `config.database.password`             | Your Conduktor Console Database password                                                                                                             | `""`       |
+| `config.conduktor-sql.host`            | Your Conduktor Console Kafka SQL host                                                                                                                | `""`       |
+| `config.conduktor-sql.port`            | Your Conduktor Console Kafka SQL port                                                                                                                | `5432`     |
+| `config.conduktor-sql.username`        | Your Conduktor Console Kafka SQL username                                                                                                            | `""`       |
+| `config.conduktor-sql.password`        | Your Conduktor Console Kafka SQL password                                                                                                            | `""`       |
 | `config.license`                       | Conduktor Console Enterprise license, if none given, the product will run in free tier                                                               | `""`       |
 | `config.existingLicenseSecret`         | Name of an existing secret containing the license                                                                                                    | `""`       |
 | `config.existingSecret`                | Name of an existing secret containing sensitive configuration                                                                                        | `""`       |
diff --git a/charts/console/templates/_helpers.tpl b/charts/console/templates/_helpers.tpl
index df0dcc9..b58fdd1 100644
--- a/charts/console/templates/_helpers.tpl
+++ b/charts/console/templates/_helpers.tpl
@@ -46,10 +46,12 @@ Return the full configuration for the platform ConfigMap
 {{- $_ := set $config "database" $database -}}
 
 {{/* Delete SQL database password/username from ConfigMap */}}
-{{- $sql_database := .Values.config.database | deepCopy -}}
-{{- $_ := unset $sql_database "password" -}}
-{{- $_ := unset $sql_database "username" -}}
-{{- $_ := set $config "sql_database" $sql_database -}}
+{{- if .Values.config.conduktor-sql.enabled -}}
+  {{- $conduktor-sql := .Values.config.conduktor-sql | deepCopy -}}
+  {{- $_ := unset $conduktor-sql "password" -}}
+  {{- $_ := unset $conduktor-sql "username" -}}
+  {{- $_ := set $config "conduktor-sql" $conduktor-sql -}}
+{{- end -}}
 
 {{ include "common.tplvalues.render" (dict "value" $config "context" $) }}
 {{- end -}}
@@ -281,6 +283,18 @@ conduktor: invalid database configuration
 {{- end -}}
 {{- end -}}
 
+{{- define "conduktor.validateValues.conduktor-sql" -}}
+{{- if .Values.config.conduktor-sql.enabled -}}
+    {{- if not .Values.config.database.host -}}
+conduktor: invalid conduktor-sql configuration
+           config.conduktor-sql.host MUST be set in values
+    {{- else if not .Values.config.database.name -}}
+conduktor: invalid conduktor-sql configuration
+           config.conduktor-sql.name MUST be set in values
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "conduktor.validateValues.monitoring" -}}
 {{- if (.Values.config.monitoring).storage -}}
 conduktor: invalid monitoring storage configuration
diff --git a/charts/console/templates/console/secret-credentials.yaml b/charts/console/templates/console/secret-credentials.yaml
index b0e0f73..6d44327 100644
--- a/charts/console/templates/console/secret-credentials.yaml
+++ b/charts/console/templates/console/secret-credentials.yaml
@@ -23,4 +23,8 @@ data:
   CDK_ADMIN_PASSWORD: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "CDK_ADMIN_PASSWORD" "defaultValue" $adminPassword "context" $) }}
   CDK_DATABASE_PASSWORD: {{ required "config.database.password MUST be set in values" .Values.config.database.password | b64enc }}
   CDK_DATABASE_USERNAME: {{ required "config.database.username MUST be set in values" .Values.config.database.username | b64enc }}
+  {{- if .Values.config.conduktor-sql.enabled }}
+    CDK_SQL_DATABASE_PASSWORD: {{ required "config.conduktor-sql.password MUST be set in values" .Values.config.conduktor-sql.password | b64enc }}
+    CDK_SQL_DATABASE_USERNAME: {{ required "config.conduktor-sql.username MUST be set in values" .Values.config.conduktor-sql.username | b64enc }}
+  {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/console/values.yaml b/charts/console/values.yaml
index 5eae7fd..7cd3824 100644
--- a/charts/console/values.yaml
+++ b/charts/console/values.yaml
@@ -90,16 +90,17 @@ config:
     password: ""
     username: ""
 
-  ## @param config.sql_database.enabled Enable SQL database for Conduktor Console
-  ## @param config.sql_database.host Your Conduktor Console SQL Database host
-  ## @param config.sql_database.port Your Conduktor Console SQL Database port
-  ## @param config.sql_database.name Your Conduktor Console SQL Database name
-  ## @param config.sql_database.username Your Conduktor Console SQL Database username
-  ## @param config.sql_database.password Your Conduktor Console SQL Database password
-  sql_database:
+  ## @param config.conduktor-sql.enabled Enable SQL database for Conduktor Console
+  ## @param config.conduktor-sql.host Your Conduktor Console SQL Database host
+  ## @param config.conduktor-sql.port Your Conduktor Console SQL Database port
+  ## @param config.conduktor-sql.name Your Conduktor Console SQL Database name
+  ## @param config.conduktor-sql.username Your Conduktor Console SQL Database username
+  ## @param config.conduktor-sql.password Your Conduktor Console SQL Database password
+  ## NOTE: This is a Beta Feature still early in development 
+  conduktor-sql:
     host: ""
-    port: 1234
-    name: "sql-postgres"
+    port: 5432
+    name: "conduktor-sql"
     password: ""
     username: ""
     enabled: false
@@ -121,9 +122,11 @@ config:
   ## - "CDK_ADMIN_PASSWORD"   : password of the admin user
   ## - "CDK_DATABASE_PASSWORD": password of the database
   ## - "CDK_DATABASE_USERNAME": username of the database
+  ## - "CDK_SQL_DATABASE_PASSWORD": password of the SQL database
+  ## - "CDK_SQL_DATABASE_USERNAME": username of the SQL database
   ##
   ## NOTE: 'config.organization.name', 'config.admin.email', 'config.admin.password',
-  ## 'config.database.username', 'config.database.password' will be ignored
+  ## 'config.database.username', 'config.database.password', config.conduktor-sql.username, config.conduktor-sql.password will be ignored
   existingSecret: ""
 
   platform:

From 64c93475ec8c731d2bb21b23b449684aea6d2c23 Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Wed, 9 Oct 2024 11:02:15 +0100
Subject: [PATCH 03/12] Bumped console version to 1.28.0 (Current pre-release)

---
 charts/console/Chart.yaml  | 2 +-
 charts/console/README.md   | 4 ++--
 charts/console/values.yaml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/console/Chart.yaml b/charts/console/Chart.yaml
index 92df631..c1de314 100644
--- a/charts/console/Chart.yaml
+++ b/charts/console/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: console
-appVersion: 1.27.1
+appVersion: 1.28.0
 version: 1.12.1
 description: Helm chart to deploy Conduktor Console on Kubernetes
 icon: https://www.conduktor.io/svgs/logo/symbol.svg
diff --git a/charts/console/README.md b/charts/console/README.md
index 60e6606..ad29c49 100644
--- a/charts/console/README.md
+++ b/charts/console/README.md
@@ -134,7 +134,7 @@ Refer to our [documentation](https://docs.conduktor.io/platform/configuration/co
 | --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------- |
 | `platform.image.registry`                     | Conduktor Console image registry                                                                                                                             | `docker.io`                   |
 | `platform.image.repository`                   | Conduktor Console image repository                                                                                                                           | `conduktor/conduktor-console` |
-| `platform.image.tag`                          | Conduktor Console image tag (immutable tags are recommended)                                                                                                 | `1.27.1`                      |
+| `platform.image.tag`                          | Conduktor Console image tag (immutable tags are recommended)                                                                                                 | `1.28.0`                      |
 | `platform.image.digest`                       | Conduktor Console image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""`                          |
 | `platform.image.pullPolicy`                   | Conduktor Console image pull policy                                                                                                                          | `IfNotPresent`                |
 | `platform.image.pullSecrets`                  | Conduktor Console image pull secrets                                                                                                                         | `[]`                          |
@@ -270,7 +270,7 @@ Console expose metrics that could be collected and presented if your environment
 | `platformCortex.enabled`                            | Enable Conduktor Console Cortex                                                                                                                                     | `true`                               |
 | `platformCortex.image.registry`                     | Conduktor Console Cortex image registry                                                                                                                             | `docker.io`                          |
 | `platformCortex.image.repository`                   | Conduktor Console Cortex image repository                                                                                                                           | `conduktor/conduktor-console-cortex` |
-| `platformCortex.image.tag`                          | Conduktor Console Cortex image tag (immutable tags are recommended)                                                                                                 | `1.27.1`                             |
+| `platformCortex.image.tag`                          | Conduktor Console Cortex image tag (immutable tags are recommended)                                                                                                 | `1.28.0`                             |
 | `platformCortex.image.digest`                       | Conduktor Console Cortex image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""`                                 |
 | `platformCortex.image.pullPolicy`                   | Conduktor Console Cortex image pull policy                                                                                                                          | `IfNotPresent`                       |
 | `platformCortex.image.pullSecrets`                  | Conduktor Console Cortex image pull secrets                                                                                                                         | `[]`                                 |
diff --git a/charts/console/values.yaml b/charts/console/values.yaml
index 7cd3824..40877f7 100644
--- a/charts/console/values.yaml
+++ b/charts/console/values.yaml
@@ -251,7 +251,7 @@ platform:
   image:
     registry: docker.io
     repository: conduktor/conduktor-console
-    tag: 1.27.1
+    tag: 1.28.0
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -791,7 +791,7 @@ platformCortex:
   image:
     registry: docker.io
     repository: conduktor/conduktor-console-cortex
-    tag: 1.27.1
+    tag: 1.28.0
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

From 458b80d54bf3af8a93aed530bf05634c1032c926 Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Wed, 9 Oct 2024 11:22:03 +0100
Subject: [PATCH 04/12] Renamed conduktor-sql to conduktorSql

---
 charts/console/README.md                      |  8 +++----
 charts/console/templates/_helpers.tpl         | 22 +++++++++----------
 .../templates/console/secret-credentials.yaml |  6 ++---
 charts/console/values.yaml                    | 18 +++++++--------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/charts/console/README.md b/charts/console/README.md
index ad29c49..86e9740 100644
--- a/charts/console/README.md
+++ b/charts/console/README.md
@@ -78,10 +78,10 @@ A list of Kafka clusters can be configured by adding them under the `config.clus
 | `config.database.name`                 | Your Conduktor Console Database name                                                                                                                 | `postgres` |
 | `config.database.username`             | Your Conduktor Console Database username                                                                                                             | `""`       |
 | `config.database.password`             | Your Conduktor Console Database password                                                                                                             | `""`       |
-| `config.conduktor-sql.host`            | Your Conduktor Console Kafka SQL host                                                                                                                | `""`       |
-| `config.conduktor-sql.port`            | Your Conduktor Console Kafka SQL port                                                                                                                | `5432`     |
-| `config.conduktor-sql.username`        | Your Conduktor Console Kafka SQL username                                                                                                            | `""`       |
-| `config.conduktor-sql.password`        | Your Conduktor Console Kafka SQL password                                                                                                            | `""`       |
+| `config.conduktorSql.host`            | Your Conduktor Console Kafka SQL host                                                                                                                | `""`       |
+| `config.conduktorSql.port`            | Your Conduktor Console Kafka SQL port                                                                                                                | `5432`     |
+| `config.conduktorSql.username`        | Your Conduktor Console Kafka SQL username                                                                                                            | `""`       |
+| `config.conduktorSql.password`        | Your Conduktor Console Kafka SQL password                                                                                                            | `""`       |
 | `config.license`                       | Conduktor Console Enterprise license, if none given, the product will run in free tier                                                               | `""`       |
 | `config.existingLicenseSecret`         | Name of an existing secret containing the license                                                                                                    | `""`       |
 | `config.existingSecret`                | Name of an existing secret containing sensitive configuration                                                                                        | `""`       |
diff --git a/charts/console/templates/_helpers.tpl b/charts/console/templates/_helpers.tpl
index b58fdd1..fcde97c 100644
--- a/charts/console/templates/_helpers.tpl
+++ b/charts/console/templates/_helpers.tpl
@@ -46,11 +46,11 @@ Return the full configuration for the platform ConfigMap
 {{- $_ := set $config "database" $database -}}
 
 {{/* Delete SQL database password/username from ConfigMap */}}
-{{- if .Values.config.conduktor-sql.enabled -}}
-  {{- $conduktor-sql := .Values.config.conduktor-sql | deepCopy -}}
-  {{- $_ := unset $conduktor-sql "password" -}}
-  {{- $_ := unset $conduktor-sql "username" -}}
-  {{- $_ := set $config "conduktor-sql" $conduktor-sql -}}
+{{- if .Values.config.conduktorSql.enabled -}}
+  {{- $conduktorSql := .Values.config.conduktorSql | deepCopy -}}
+  {{- $_ := unset $conduktorSql "password" -}}
+  {{- $_ := unset $conduktorSql "username" -}}
+  {{- $_ := set $config "conduktorSql" $conduktorSql -}}
 {{- end -}}
 
 {{ include "common.tplvalues.render" (dict "value" $config "context" $) }}
@@ -283,14 +283,14 @@ conduktor: invalid database configuration
 {{- end -}}
 {{- end -}}
 
-{{- define "conduktor.validateValues.conduktor-sql" -}}
-{{- if .Values.config.conduktor-sql.enabled -}}
+{{- define "conduktor.validateValues.conduktorSql" -}}
+{{- if .Values.config.conduktorSql.enabled -}}
     {{- if not .Values.config.database.host -}}
-conduktor: invalid conduktor-sql configuration
-           config.conduktor-sql.host MUST be set in values
+conduktor: invalid conduktorSql configuration
+           config.conduktorSql.host MUST be set in values
     {{- else if not .Values.config.database.name -}}
-conduktor: invalid conduktor-sql configuration
-           config.conduktor-sql.name MUST be set in values
+conduktor: invalid conduktorSql configuration
+           config.conduktorSql.name MUST be set in values
     {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/charts/console/templates/console/secret-credentials.yaml b/charts/console/templates/console/secret-credentials.yaml
index 6d44327..348671b 100644
--- a/charts/console/templates/console/secret-credentials.yaml
+++ b/charts/console/templates/console/secret-credentials.yaml
@@ -23,8 +23,8 @@ data:
   CDK_ADMIN_PASSWORD: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "CDK_ADMIN_PASSWORD" "defaultValue" $adminPassword "context" $) }}
   CDK_DATABASE_PASSWORD: {{ required "config.database.password MUST be set in values" .Values.config.database.password | b64enc }}
   CDK_DATABASE_USERNAME: {{ required "config.database.username MUST be set in values" .Values.config.database.username | b64enc }}
-  {{- if .Values.config.conduktor-sql.enabled }}
-    CDK_SQL_DATABASE_PASSWORD: {{ required "config.conduktor-sql.password MUST be set in values" .Values.config.conduktor-sql.password | b64enc }}
-    CDK_SQL_DATABASE_USERNAME: {{ required "config.conduktor-sql.username MUST be set in values" .Values.config.conduktor-sql.username | b64enc }}
+  {{- if .Values.config.conduktorSql.enabled }}
+    CDK_SQL_DATABASE_PASSWORD: {{ required "config.conduktorSql.password MUST be set in values" .Values.config.conduktorSql.password | b64enc }}
+    CDK_SQL_DATABASE_USERNAME: {{ required "config.conduktorSql.username MUST be set in values" .Values.config.conduktorSql.username | b64enc }}
   {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/console/values.yaml b/charts/console/values.yaml
index 40877f7..81a1ac3 100644
--- a/charts/console/values.yaml
+++ b/charts/console/values.yaml
@@ -90,14 +90,14 @@ config:
     password: ""
     username: ""
 
-  ## @param config.conduktor-sql.enabled Enable SQL database for Conduktor Console
-  ## @param config.conduktor-sql.host Your Conduktor Console SQL Database host
-  ## @param config.conduktor-sql.port Your Conduktor Console SQL Database port
-  ## @param config.conduktor-sql.name Your Conduktor Console SQL Database name
-  ## @param config.conduktor-sql.username Your Conduktor Console SQL Database username
-  ## @param config.conduktor-sql.password Your Conduktor Console SQL Database password
-  ## NOTE: This is a Beta Feature still early in development 
-  conduktor-sql:
+  ## @param config.conduktorSql.enabled Enable SQL database for Conduktor Console
+  ## @param config.conduktorSql.host Your Conduktor Console SQL Database host
+  ## @param config.conduktorSql.port Your Conduktor Console SQL Database port
+  ## @param config.conduktorSql.name Your Conduktor Console SQL Database name
+  ## @param config.conduktorSql.username Your Conduktor Console SQL Database username
+  ## @param config.conduktorSql.password Your Conduktor Console SQL Database password
+  ## NOTE: This is a Beta Feature still early in development
+  conduktorSql:
     host: ""
     port: 5432
     name: "conduktor-sql"
@@ -126,7 +126,7 @@ config:
   ## - "CDK_SQL_DATABASE_USERNAME": username of the SQL database
   ##
   ## NOTE: 'config.organization.name', 'config.admin.email', 'config.admin.password',
-  ## 'config.database.username', 'config.database.password', config.conduktor-sql.username, config.conduktor-sql.password will be ignored
+  ## 'config.database.username', 'config.database.password', config.conduktorSql.username, config.conduktorSql.password will be ignored
   existingSecret: ""
 
   platform:

From 91b565fa65c834c4e6555edcd94b46718621be1d Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Wed, 9 Oct 2024 12:25:18 +0100
Subject: [PATCH 05/12] Renamed vars from conduktorSql to kafkasql and
 CDK_SQL_DATABASE_PASSWORD to CDK_KAFKASQL_DATABASE_USERNAME

---
 charts/console/README.md                      |  8 +++----
 charts/console/templates/_helpers.tpl         | 22 +++++++++----------
 .../templates/console/secret-credentials.yaml |  6 ++---
 charts/console/values.yaml                    | 16 +++++++-------
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/charts/console/README.md b/charts/console/README.md
index 86e9740..ef5267f 100644
--- a/charts/console/README.md
+++ b/charts/console/README.md
@@ -78,10 +78,10 @@ A list of Kafka clusters can be configured by adding them under the `config.clus
 | `config.database.name`                 | Your Conduktor Console Database name                                                                                                                 | `postgres` |
 | `config.database.username`             | Your Conduktor Console Database username                                                                                                             | `""`       |
 | `config.database.password`             | Your Conduktor Console Database password                                                                                                             | `""`       |
-| `config.conduktorSql.host`            | Your Conduktor Console Kafka SQL host                                                                                                                | `""`       |
-| `config.conduktorSql.port`            | Your Conduktor Console Kafka SQL port                                                                                                                | `5432`     |
-| `config.conduktorSql.username`        | Your Conduktor Console Kafka SQL username                                                                                                            | `""`       |
-| `config.conduktorSql.password`        | Your Conduktor Console Kafka SQL password                                                                                                            | `""`       |
+| `config.kafkasql.host`            | Your Conduktor Console Kafka SQL host                                                                                                                | `""`       |
+| `config.kafkasql.port`            | Your Conduktor Console Kafka SQL port                                                                                                                | `5432`     |
+| `config.kafkasql.username`        | Your Conduktor Console Kafka SQL username                                                                                                            | `""`       |
+| `config.kafkasql.password`        | Your Conduktor Console Kafka SQL password                                                                                                            | `""`       |
 | `config.license`                       | Conduktor Console Enterprise license, if none given, the product will run in free tier                                                               | `""`       |
 | `config.existingLicenseSecret`         | Name of an existing secret containing the license                                                                                                    | `""`       |
 | `config.existingSecret`                | Name of an existing secret containing sensitive configuration                                                                                        | `""`       |
diff --git a/charts/console/templates/_helpers.tpl b/charts/console/templates/_helpers.tpl
index fcde97c..4f220e9 100644
--- a/charts/console/templates/_helpers.tpl
+++ b/charts/console/templates/_helpers.tpl
@@ -46,11 +46,11 @@ Return the full configuration for the platform ConfigMap
 {{- $_ := set $config "database" $database -}}
 
 {{/* Delete SQL database password/username from ConfigMap */}}
-{{- if .Values.config.conduktorSql.enabled -}}
-  {{- $conduktorSql := .Values.config.conduktorSql | deepCopy -}}
-  {{- $_ := unset $conduktorSql "password" -}}
-  {{- $_ := unset $conduktorSql "username" -}}
-  {{- $_ := set $config "conduktorSql" $conduktorSql -}}
+{{- if .Values.config.kafkasql.enabled -}}
+  {{- $kafkasql := .Values.config.kafkasql | deepCopy -}}
+  {{- $_ := unset $kafkasql "password" -}}
+  {{- $_ := unset $kafkasql "username" -}}
+  {{- $_ := set $config "kafkasql" $kafkasql -}}
 {{- end -}}
 
 {{ include "common.tplvalues.render" (dict "value" $config "context" $) }}
@@ -283,14 +283,14 @@ conduktor: invalid database configuration
 {{- end -}}
 {{- end -}}
 
-{{- define "conduktor.validateValues.conduktorSql" -}}
-{{- if .Values.config.conduktorSql.enabled -}}
+{{- define "conduktor.validateValues.kafkasql" -}}
+{{- if .Values.config.kafkasql.enabled -}}
     {{- if not .Values.config.database.host -}}
-conduktor: invalid conduktorSql configuration
-           config.conduktorSql.host MUST be set in values
+conduktor: invalid kafkasql configuration
+           config.kafkasql.host MUST be set in values
     {{- else if not .Values.config.database.name -}}
-conduktor: invalid conduktorSql configuration
-           config.conduktorSql.name MUST be set in values
+conduktor: invalid kafkasql configuration
+           config.kafkasql.name MUST be set in values
     {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/charts/console/templates/console/secret-credentials.yaml b/charts/console/templates/console/secret-credentials.yaml
index 348671b..deb36c3 100644
--- a/charts/console/templates/console/secret-credentials.yaml
+++ b/charts/console/templates/console/secret-credentials.yaml
@@ -23,8 +23,8 @@ data:
   CDK_ADMIN_PASSWORD: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "CDK_ADMIN_PASSWORD" "defaultValue" $adminPassword "context" $) }}
   CDK_DATABASE_PASSWORD: {{ required "config.database.password MUST be set in values" .Values.config.database.password | b64enc }}
   CDK_DATABASE_USERNAME: {{ required "config.database.username MUST be set in values" .Values.config.database.username | b64enc }}
-  {{- if .Values.config.conduktorSql.enabled }}
-    CDK_SQL_DATABASE_PASSWORD: {{ required "config.conduktorSql.password MUST be set in values" .Values.config.conduktorSql.password | b64enc }}
-    CDK_SQL_DATABASE_USERNAME: {{ required "config.conduktorSql.username MUST be set in values" .Values.config.conduktorSql.username | b64enc }}
+  {{- if .Values.config.kafkasql.enabled }}
+    CDK_KAFKASQL_DATABASE_PASSWORD: {{ required "config.kafkasql.password MUST be set in values" .Values.config.kafkasql.password | b64enc }}
+    CDK_KAFKASQL_DATABASE_USERNAME: {{ required "config.kafkasql.username MUST be set in values" .Values.config.kafkasql.username | b64enc }}
   {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/console/values.yaml b/charts/console/values.yaml
index 81a1ac3..540445e 100644
--- a/charts/console/values.yaml
+++ b/charts/console/values.yaml
@@ -90,14 +90,14 @@ config:
     password: ""
     username: ""
 
-  ## @param config.conduktorSql.enabled Enable SQL database for Conduktor Console
-  ## @param config.conduktorSql.host Your Conduktor Console SQL Database host
-  ## @param config.conduktorSql.port Your Conduktor Console SQL Database port
-  ## @param config.conduktorSql.name Your Conduktor Console SQL Database name
-  ## @param config.conduktorSql.username Your Conduktor Console SQL Database username
-  ## @param config.conduktorSql.password Your Conduktor Console SQL Database password
+  ## @param config.kafkasql.enabled Enable SQL database for Conduktor Console
+  ## @param config.kafkasql.host Your Conduktor Console SQL Database host
+  ## @param config.kafkasql.port Your Conduktor Console SQL Database port
+  ## @param config.kafkasql.name Your Conduktor Console SQL Database name
+  ## @param config.kafkasql.username Your Conduktor Console SQL Database username
+  ## @param config.kafkasql.password Your Conduktor Console SQL Database password
   ## NOTE: This is a Beta Feature still early in development
-  conduktorSql:
+  kafkasql:
     host: ""
     port: 5432
     name: "conduktor-sql"
@@ -126,7 +126,7 @@ config:
   ## - "CDK_SQL_DATABASE_USERNAME": username of the SQL database
   ##
   ## NOTE: 'config.organization.name', 'config.admin.email', 'config.admin.password',
-  ## 'config.database.username', 'config.database.password', config.conduktorSql.username, config.conduktorSql.password will be ignored
+  ## 'config.database.username', 'config.database.password', config.kafkasql.username, config.kafkasql.password will be ignored
   existingSecret: ""
 
   platform:

From 012b8cf37243e6b39cb66fb01b32803f7177c282 Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Wed, 9 Oct 2024 12:31:57 +0100
Subject: [PATCH 06/12] Moved all the database details into a key database
 under kafkasql

---
 charts/console/README.md                      |  8 +++---
 charts/console/templates/_helpers.tpl         | 12 ++++-----
 .../templates/console/secret-credentials.yaml |  6 ++---
 charts/console/values.yaml                    | 27 ++++++++++---------
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/charts/console/README.md b/charts/console/README.md
index ef5267f..60bf1f7 100644
--- a/charts/console/README.md
+++ b/charts/console/README.md
@@ -78,10 +78,10 @@ A list of Kafka clusters can be configured by adding them under the `config.clus
 | `config.database.name`                 | Your Conduktor Console Database name                                                                                                                 | `postgres` |
 | `config.database.username`             | Your Conduktor Console Database username                                                                                                             | `""`       |
 | `config.database.password`             | Your Conduktor Console Database password                                                                                                             | `""`       |
-| `config.kafkasql.host`            | Your Conduktor Console Kafka SQL host                                                                                                                | `""`       |
-| `config.kafkasql.port`            | Your Conduktor Console Kafka SQL port                                                                                                                | `5432`     |
-| `config.kafkasql.username`        | Your Conduktor Console Kafka SQL username                                                                                                            | `""`       |
-| `config.kafkasql.password`        | Your Conduktor Console Kafka SQL password                                                                                                            | `""`       |
+| `config.kafkasql.database.host`            | Your Conduktor Console Kafka SQL host                                                                                                                | `""`       |
+| `config.kafkasql.database.port`            | Your Conduktor Console Kafka SQL port                                                                                                                | `5432`     |
+| `config.kafkasql.database.username`        | Your Conduktor Console Kafka SQL username                                                                                                            | `""`       |
+| `config.kafkasql.database.password`        | Your Conduktor Console Kafka SQL password                                                                                                            | `""`       |
 | `config.license`                       | Conduktor Console Enterprise license, if none given, the product will run in free tier                                                               | `""`       |
 | `config.existingLicenseSecret`         | Name of an existing secret containing the license                                                                                                    | `""`       |
 | `config.existingSecret`                | Name of an existing secret containing sensitive configuration                                                                                        | `""`       |
diff --git a/charts/console/templates/_helpers.tpl b/charts/console/templates/_helpers.tpl
index 4f220e9..f3c6caa 100644
--- a/charts/console/templates/_helpers.tpl
+++ b/charts/console/templates/_helpers.tpl
@@ -46,7 +46,7 @@ Return the full configuration for the platform ConfigMap
 {{- $_ := set $config "database" $database -}}
 
 {{/* Delete SQL database password/username from ConfigMap */}}
-{{- if .Values.config.kafkasql.enabled -}}
+{{- if .Values.config.kafkasql.database.enabled -}}
   {{- $kafkasql := .Values.config.kafkasql | deepCopy -}}
   {{- $_ := unset $kafkasql "password" -}}
   {{- $_ := unset $kafkasql "username" -}}
@@ -284,13 +284,13 @@ conduktor: invalid database configuration
 {{- end -}}
 
 {{- define "conduktor.validateValues.kafkasql" -}}
-{{- if .Values.config.kafkasql.enabled -}}
-    {{- if not .Values.config.database.host -}}
+{{- if .Values.config.kafkasql.database.enabled -}}
+    {{- if not .Values.config.kafkasql.database.host -}}
 conduktor: invalid kafkasql configuration
-           config.kafkasql.host MUST be set in values
-    {{- else if not .Values.config.database.name -}}
+           config.kafkasql.database.host MUST be set in values
+    {{- else if not .Values.config.kafkasql.database.name -}}
 conduktor: invalid kafkasql configuration
-           config.kafkasql.name MUST be set in values
+           config.kafkasql.database.name MUST be set in values
     {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/charts/console/templates/console/secret-credentials.yaml b/charts/console/templates/console/secret-credentials.yaml
index deb36c3..f499a3f 100644
--- a/charts/console/templates/console/secret-credentials.yaml
+++ b/charts/console/templates/console/secret-credentials.yaml
@@ -23,8 +23,8 @@ data:
   CDK_ADMIN_PASSWORD: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "CDK_ADMIN_PASSWORD" "defaultValue" $adminPassword "context" $) }}
   CDK_DATABASE_PASSWORD: {{ required "config.database.password MUST be set in values" .Values.config.database.password | b64enc }}
   CDK_DATABASE_USERNAME: {{ required "config.database.username MUST be set in values" .Values.config.database.username | b64enc }}
-  {{- if .Values.config.kafkasql.enabled }}
-    CDK_KAFKASQL_DATABASE_PASSWORD: {{ required "config.kafkasql.password MUST be set in values" .Values.config.kafkasql.password | b64enc }}
-    CDK_KAFKASQL_DATABASE_USERNAME: {{ required "config.kafkasql.username MUST be set in values" .Values.config.kafkasql.username | b64enc }}
+  {{- if .Values.config.kafkasql.database.enabled }}
+    CDK_KAFKASQL_DATABASE_PASSWORD: {{ required "config.kafkasql.database.password MUST be set in values" .Values.config.kafkasql.database.password | b64enc }}
+    CDK_KAFKASQL_DATABASE_USERNAME: {{ required "config.kafkasql.database.username MUST be set in values" .Values.config.kafkasql.database.username | b64enc }}
   {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/console/values.yaml b/charts/console/values.yaml
index 540445e..4c033a6 100644
--- a/charts/console/values.yaml
+++ b/charts/console/values.yaml
@@ -90,20 +90,21 @@ config:
     password: ""
     username: ""
 
-  ## @param config.kafkasql.enabled Enable SQL database for Conduktor Console
-  ## @param config.kafkasql.host Your Conduktor Console SQL Database host
-  ## @param config.kafkasql.port Your Conduktor Console SQL Database port
-  ## @param config.kafkasql.name Your Conduktor Console SQL Database name
-  ## @param config.kafkasql.username Your Conduktor Console SQL Database username
-  ## @param config.kafkasql.password Your Conduktor Console SQL Database password
+  ## @param config.kafkasql.database.enabled Enable SQL database for Conduktor Console
+  ## @param config.kafkasql.database.host Your Conduktor Console SQL Database host
+  ## @param config.kafkasql.database.port Your Conduktor Console SQL Database port
+  ## @param config.kafkasql.database.name Your Conduktor Console SQL Database name
+  ## @param config.kafkasql.database.username Your Conduktor Console SQL Database username
+  ## @param config.kafkasql.database.password Your Conduktor Console SQL Database password
   ## NOTE: This is a Beta Feature still early in development
   kafkasql:
-    host: ""
-    port: 5432
-    name: "conduktor-sql"
-    password: ""
-    username: ""
-    enabled: false
+    database:
+      host: ""
+      port: 5432
+      name: "conduktor-sql"
+      password: ""
+      username: ""
+      enabled: false
 
   ## @param config.license Conduktor Console Enterprise license, if none given, the product will run in free tier
   license: ""
@@ -126,7 +127,7 @@ config:
   ## - "CDK_SQL_DATABASE_USERNAME": username of the SQL database
   ##
   ## NOTE: 'config.organization.name', 'config.admin.email', 'config.admin.password',
-  ## 'config.database.username', 'config.database.password', config.kafkasql.username, config.kafkasql.password will be ignored
+  ## 'config.database.username', 'config.database.password', config.kafkasql.database.username, config.kafkasql.database.password will be ignored
   existingSecret: ""
 
   platform:

From 04750e6d7caff83e8c8ea15ff012a0af85ef28d9 Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Wed, 9 Oct 2024 12:32:43 +0100
Subject: [PATCH 07/12] Fixed readme

---
 charts/console/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/console/README.md b/charts/console/README.md
index 60bf1f7..11c40d3 100644
--- a/charts/console/README.md
+++ b/charts/console/README.md
@@ -78,10 +78,10 @@ A list of Kafka clusters can be configured by adding them under the `config.clus
 | `config.database.name`                 | Your Conduktor Console Database name                                                                                                                 | `postgres` |
 | `config.database.username`             | Your Conduktor Console Database username                                                                                                             | `""`       |
 | `config.database.password`             | Your Conduktor Console Database password                                                                                                             | `""`       |
-| `config.kafkasql.database.host`            | Your Conduktor Console Kafka SQL host                                                                                                                | `""`       |
-| `config.kafkasql.database.port`            | Your Conduktor Console Kafka SQL port                                                                                                                | `5432`     |
-| `config.kafkasql.database.username`        | Your Conduktor Console Kafka SQL username                                                                                                            | `""`       |
-| `config.kafkasql.database.password`        | Your Conduktor Console Kafka SQL password                                                                                                            | `""`       |
+| `config.kafkasql.database.host`        | Your Conduktor Console Kafka SQL host                                                                                                                | `""`       |
+| `config.kafkasql.database.port`        | Your Conduktor Console Kafka SQL port                                                                                                                | `5432`     |
+| `config.kafkasql.database.username`    | Your Conduktor Console Kafka SQL username                                                                                                            | `""`       |
+| `config.kafkasql.database.password`    | Your Conduktor Console Kafka SQL password                                                                                                            | `""`       |
 | `config.license`                       | Conduktor Console Enterprise license, if none given, the product will run in free tier                                                               | `""`       |
 | `config.existingLicenseSecret`         | Name of an existing secret containing the license                                                                                                    | `""`       |
 | `config.existingSecret`                | Name of an existing secret containing sensitive configuration                                                                                        | `""`       |

From 1c4ae8ac3722213a4947520d54de2b70eb63e69d Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Wed, 9 Oct 2024 16:43:04 +0100
Subject: [PATCH 08/12] Removed enabled from kafkasql.database, instead check
 for the existance of kafkasql and kafkasql.database instead.

---
 charts/console/templates/_helpers.tpl         | 24 ++++++-------------
 .../templates/console/secret-credentials.yaml | 12 +++++++---
 charts/console/values.yaml                    |  2 --
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/charts/console/templates/_helpers.tpl b/charts/console/templates/_helpers.tpl
index f3c6caa..807f53c 100644
--- a/charts/console/templates/_helpers.tpl
+++ b/charts/console/templates/_helpers.tpl
@@ -46,11 +46,13 @@ Return the full configuration for the platform ConfigMap
 {{- $_ := set $config "database" $database -}}
 
 {{/* Delete SQL database password/username from ConfigMap */}}
-{{- if .Values.config.kafkasql.database.enabled -}}
-  {{- $kafkasql := .Values.config.kafkasql | deepCopy -}}
-  {{- $_ := unset $kafkasql "password" -}}
-  {{- $_ := unset $kafkasql "username" -}}
-  {{- $_ := set $config "kafkasql" $kafkasql -}}
+{{- if (hasKey .Values.config "kafkasql" ) }}
+  {{- if (hasKey .Values.config.kafkasql "database") }}
+    {{- $kafkasql := .Values.config.kafkasql.database | deepCopy -}}
+    {{- $_ := unset $kafkasql "password" -}}
+    {{- $_ := unset $kafkasql "username" -}}
+    {{- $_ := set $config "kafkasql" $kafkasql -}}
+  {{- end -}}
 {{- end -}}
 
 {{ include "common.tplvalues.render" (dict "value" $config "context" $) }}
@@ -283,18 +285,6 @@ conduktor: invalid database configuration
 {{- end -}}
 {{- end -}}
 
-{{- define "conduktor.validateValues.kafkasql" -}}
-{{- if .Values.config.kafkasql.database.enabled -}}
-    {{- if not .Values.config.kafkasql.database.host -}}
-conduktor: invalid kafkasql configuration
-           config.kafkasql.database.host MUST be set in values
-    {{- else if not .Values.config.kafkasql.database.name -}}
-conduktor: invalid kafkasql configuration
-           config.kafkasql.database.name MUST be set in values
-    {{- end -}}
-{{- end -}}
-{{- end -}}
-
 {{- define "conduktor.validateValues.monitoring" -}}
 {{- if (.Values.config.monitoring).storage -}}
 conduktor: invalid monitoring storage configuration
diff --git a/charts/console/templates/console/secret-credentials.yaml b/charts/console/templates/console/secret-credentials.yaml
index f499a3f..9a98dc6 100644
--- a/charts/console/templates/console/secret-credentials.yaml
+++ b/charts/console/templates/console/secret-credentials.yaml
@@ -23,8 +23,14 @@ data:
   CDK_ADMIN_PASSWORD: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "CDK_ADMIN_PASSWORD" "defaultValue" $adminPassword "context" $) }}
   CDK_DATABASE_PASSWORD: {{ required "config.database.password MUST be set in values" .Values.config.database.password | b64enc }}
   CDK_DATABASE_USERNAME: {{ required "config.database.username MUST be set in values" .Values.config.database.username | b64enc }}
-  {{- if .Values.config.kafkasql.database.enabled }}
-    CDK_KAFKASQL_DATABASE_PASSWORD: {{ required "config.kafkasql.database.password MUST be set in values" .Values.config.kafkasql.database.password | b64enc }}
-    CDK_KAFKASQL_DATABASE_USERNAME: {{ required "config.kafkasql.database.username MUST be set in values" .Values.config.kafkasql.database.username | b64enc }}
+  {{- if (hasKey .Values.config "kafkasql" ) }}
+    {{- if (hasKey .Values.config.kafkasql "database") }}
+      {{- if .Values.config.kafkasql.database.password }}
+      CDK_KAFKASQL_DATABASE_PASSWORD: {{.Values.config.kafkasql.database.password | b64enc }}
+      {{- end }}
+      {{- if .Values.config.kafkasql.database.username }}
+      CDK_KAFKASQL_DATABASE_USERNAME: {{ .Values.config.kafkasql.database.username | b64enc }}
+      {{- end }}
+    {{- end }}
   {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/console/values.yaml b/charts/console/values.yaml
index 4c033a6..7e80f80 100644
--- a/charts/console/values.yaml
+++ b/charts/console/values.yaml
@@ -90,7 +90,6 @@ config:
     password: ""
     username: ""
 
-  ## @param config.kafkasql.database.enabled Enable SQL database for Conduktor Console
   ## @param config.kafkasql.database.host Your Conduktor Console SQL Database host
   ## @param config.kafkasql.database.port Your Conduktor Console SQL Database port
   ## @param config.kafkasql.database.name Your Conduktor Console SQL Database name
@@ -104,7 +103,6 @@ config:
       name: "conduktor-sql"
       password: ""
       username: ""
-      enabled: false
 
   ## @param config.license Conduktor Console Enterprise license, if none given, the product will run in free tier
   license: ""

From 8eed3cd74706765e6be7ca0e3005fe3c1449fb6c Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Fri, 11 Oct 2024 12:39:15 +0100
Subject: [PATCH 09/12] Added a missing space in secret-credentials.yaml.
 Addded new make section for making kafkasql-postgres. Fixed makefile bug

---
 charts/console/templates/console/secret-credentials.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/console/templates/console/secret-credentials.yaml b/charts/console/templates/console/secret-credentials.yaml
index 9a98dc6..4009672 100644
--- a/charts/console/templates/console/secret-credentials.yaml
+++ b/charts/console/templates/console/secret-credentials.yaml
@@ -26,7 +26,7 @@ data:
   {{- if (hasKey .Values.config "kafkasql" ) }}
     {{- if (hasKey .Values.config.kafkasql "database") }}
       {{- if .Values.config.kafkasql.database.password }}
-      CDK_KAFKASQL_DATABASE_PASSWORD: {{.Values.config.kafkasql.database.password | b64enc }}
+      CDK_KAFKASQL_DATABASE_PASSWORD: {{ .Values.config.kafkasql.database.password | b64enc }}
       {{- end }}
       {{- if .Values.config.kafkasql.database.username }}
       CDK_KAFKASQL_DATABASE_USERNAME: {{ .Values.config.kafkasql.database.username | b64enc }}

From f1695d9520d5dff4caf4ca1bdb3abd96a313a058 Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Fri, 11 Oct 2024 12:39:24 +0100
Subject: [PATCH 10/12] Added a missing space in secret-credentials.yaml.
 Addded new make section for making kafkasql-postgres. Fixed makefile bug

---
 Makefile | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 54ec57d..bb3131c 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ K3D_CONTEXT_NAME = k3d-conduktor-platform
 
 postgresql_password := conduktor
 postgresql_default_database := conduktor
+kafka_postgresql_default_database := conduktor
 minio_password := conduktor
 minio_default_bucket := conduktor
 
@@ -121,9 +122,9 @@ create-k3d-cluster: ## Create k3d cluster
 
 .PHONY: check-kube-context
 check-kube-context: ## Validate that current kube context used is K3D to prevent installing chart on another cluster
-	@if [ "$(shell kubectl config current-context)" != "$(K3D_CONTEXT_NAME)" ]; then
-		@echo -e "Current context is not K3D cluster ! ($(shell kubectl config current-context))"
-		exit 1
+	@if [ "$(shell kubectl config current-context)" != "$(K3D_CONTEXT_NAME)" ]; then \
+		printf "Current context is not K3D cluster ! (%s)\n" "$(shell kubectl config current-context)"; \
+		exit 1; \
 	fi
 
 .PHONY: delete-k3d-cluster
@@ -160,6 +161,21 @@ helm-postgresql: ## Install postgresql helm chart from bitnami
 	kubectl rollout status --watch --timeout=300s statefulset/postgresql -n ${NAMESPACE}
 
 
+.PHONY: kafka-postgresql
+kafka-postgresql: ## Install postgresql helm chart from bitnami
+	make check-kube-context
+	kubectl create namespace ${NAMESPACE} || true
+	@echo "Installing postgresql"
+	helm upgrade --install kafka-postgresql bitnami/postgresql \
+		--namespace ${NAMESPACE} --create-namespace \
+		--version 12.5.8 \
+		--set global.postgresql.auth.database=${postgresql_default_database} \
+		--set global.postgresql.auth.postgresPassword=${postgresql_password} \
+		--set auth.postgresPassword=${postgresql_password} \
+		--set primary.service.type=LoadBalancer
+	@echo "Waiting for postgresql to be ready..."
+	kubectl rollout status --watch --timeout=300s statefulset/postgresql -n ${NAMESPACE}
+
 .PHONY: helm-minio
 helm-minio: ## Install minio helm chart from bitnami
 	make check-kube-context

From dea0718e9a1bdc6a6ae6e1d6abd6ffef7b479174 Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Fri, 11 Oct 2024 13:13:02 +0100
Subject: [PATCH 11/12] Fixed issue where it wouldn't read the
 secret-credential file correctly.

---
 .../templates/console/secret-credentials.yaml    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/console/templates/console/secret-credentials.yaml b/charts/console/templates/console/secret-credentials.yaml
index 4009672..024299b 100644
--- a/charts/console/templates/console/secret-credentials.yaml
+++ b/charts/console/templates/console/secret-credentials.yaml
@@ -24,13 +24,13 @@ data:
   CDK_DATABASE_PASSWORD: {{ required "config.database.password MUST be set in values" .Values.config.database.password | b64enc }}
   CDK_DATABASE_USERNAME: {{ required "config.database.username MUST be set in values" .Values.config.database.username | b64enc }}
   {{- if (hasKey .Values.config "kafkasql" ) }}
-    {{- if (hasKey .Values.config.kafkasql "database") }}
-      {{- if .Values.config.kafkasql.database.password }}
-      CDK_KAFKASQL_DATABASE_PASSWORD: {{ .Values.config.kafkasql.database.password | b64enc }}
-      {{- end }}
-      {{- if .Values.config.kafkasql.database.username }}
-      CDK_KAFKASQL_DATABASE_USERNAME: {{ .Values.config.kafkasql.database.username | b64enc }}
-      {{- end }}
-    {{- end }}
+  {{- if (hasKey .Values.config.kafkasql "database") }}
+  {{- if .Values.config.kafkasql.database.password }}
+  CDK_KAFKASQL_DATABASE_PASSWORD: {{ .Values.config.kafkasql.database.password | b64enc }}
+  {{- end }}
+  {{- if .Values.config.kafkasql.database.username }}
+  CDK_KAFKASQL_DATABASE_USERNAME: {{ .Values.config.kafkasql.database.username | b64enc }}
+  {{- end }}
+  {{- end }}
   {{- end }}
 {{- end }}
\ No newline at end of file

From f841754f6cf256f0090c6002daebd47f89e2a2b8 Mon Sep 17 00:00:00 2001
From: Ben Starmer-Smith <bstarmersmith@conduktor.io>
Date: Mon, 14 Oct 2024 11:05:46 +0100
Subject: [PATCH 12/12] Now set kafasql_database in helper. Changed the
 makefile kafkasql port to 5433 as you cant have two in on node.

---
 Makefile                              | 10 +++++++---
 charts/console/templates/_helpers.tpl |  8 +++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index bb3131c..6bcc69e 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,8 @@ K3D_CONTEXT_NAME = k3d-conduktor-platform
 postgresql_password := conduktor
 postgresql_default_database := conduktor
 kafka_postgresql_default_database := conduktor
+kafka_postgresql_password := conduktor
+kafka_postgresql_port := 5433 # Port can't be same as default since we are running 2 postgresql instances
 minio_password := conduktor
 minio_default_bucket := conduktor
 
@@ -68,6 +70,8 @@ k3d-up: ## Setup k3d cluster
 	make helm-nginx
 	@echo "Installing postgresql"
 	make helm-postgresql
+	@echo "Installing kafka postgresql"
+	make kafka-postgresql
 	@echo "Installing Minio"
 	make helm-minio
 	@echo "Create Test namespace"
@@ -160,7 +164,6 @@ helm-postgresql: ## Install postgresql helm chart from bitnami
 	@echo "Waiting for postgresql to be ready..."
 	kubectl rollout status --watch --timeout=300s statefulset/postgresql -n ${NAMESPACE}
 
-
 .PHONY: kafka-postgresql
 kafka-postgresql: ## Install postgresql helm chart from bitnami
 	make check-kube-context
@@ -170,8 +173,9 @@ kafka-postgresql: ## Install postgresql helm chart from bitnami
 		--namespace ${NAMESPACE} --create-namespace \
 		--version 12.5.8 \
 		--set global.postgresql.auth.database=${postgresql_default_database} \
-		--set global.postgresql.auth.postgresPassword=${postgresql_password} \
-		--set auth.postgresPassword=${postgresql_password} \
+		--set global.postgresql.auth.postgresPassword=${kafka_postgresql_password} \
+		--set global.postgresql.service.ports.postgresql=${kafka_postgresql_port} \
+		--set auth.postgresPassword=${kafka_postgresql_password} \
 		--set primary.service.type=LoadBalancer
 	@echo "Waiting for postgresql to be ready..."
 	kubectl rollout status --watch --timeout=300s statefulset/postgresql -n ${NAMESPACE}
diff --git a/charts/console/templates/_helpers.tpl b/charts/console/templates/_helpers.tpl
index 807f53c..222edb7 100644
--- a/charts/console/templates/_helpers.tpl
+++ b/charts/console/templates/_helpers.tpl
@@ -48,10 +48,12 @@ Return the full configuration for the platform ConfigMap
 {{/* Delete SQL database password/username from ConfigMap */}}
 {{- if (hasKey .Values.config "kafkasql" ) }}
   {{- if (hasKey .Values.config.kafkasql "database") }}
-    {{- $kafkasql := .Values.config.kafkasql.database | deepCopy -}}
-    {{- $_ := unset $kafkasql "password" -}}
-    {{- $_ := unset $kafkasql "username" -}}
+    {{- $kafkasql := .Values.config.kafkasql | deepCopy -}}
+    {{- $kafkasql_database := .Values.config.kafkasql.database -}}
+    {{- $_ := unset $kafkasql_database "password" -}}
+    {{- $_ := unset $kafkasql_database "username" -}}
     {{- $_ := set $config "kafkasql" $kafkasql -}}
+    {{- $_ := set $config "kafkasql.database" $kafkasql_database -}}
   {{- end -}}
 {{- end -}}