Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Console release 1.28 *DRAFT* #117

Closed
wants to merge 12 commits into from
Closed

Console release 1.28 *DRAFT* #117

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3e026a0
Added new value for SQL db. Removed username and password from ConfigMap
BStarmerSmith Oct 8, 2024
e242d55
Updated Readme. Renamed the values to conduktor-sql. Added conditiona…
BStarmerSmith Oct 9, 2024
64c9347
Bumped console version to 1.28.0 (Current pre-release)
BStarmerSmith Oct 9, 2024
458b80d
Renamed conduktor-sql to conduktorSql
BStarmerSmith Oct 9, 2024
91b565f
Renamed vars from conduktorSql to kafkasql and CDK_SQL_DATABASE_PASSW…
BStarmerSmith Oct 9, 2024
012b8cf
Moved all the database details into a key database under kafkasql
BStarmerSmith Oct 9, 2024
04750e6
Fixed readme
BStarmerSmith Oct 9, 2024
1c4ae8a
Removed enabled from kafkasql.database, instead check for the existan…
BStarmerSmith Oct 9, 2024
8eed3cd
Added a missing space in secret-credentials.yaml. Addded new make sec…
BStarmerSmith Oct 11, 2024
f1695d9
Added a missing space in secret-credentials.yaml. Addded new make sec…
BStarmerSmith Oct 11, 2024
dea0718
Fixed issue where it wouldn't read the secret-credential file correctly.
BStarmerSmith Oct 11, 2024
f841754
Now set kafasql_database in helper. Changed the makefile kafkasql por…
BStarmerSmith Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/console/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 6 additions & 2 deletions charts/console/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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 | `""` |
Expand Down Expand Up @@ -130,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 | `[]` |
Expand Down Expand Up @@ -266,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 | `[]` |
Expand Down
20 changes: 20 additions & 0 deletions charts/console/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ Return the full configuration for the platform ConfigMap
{{- $_ := unset $database "username" -}}
{{- $_ := 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 -}}
{{- end -}}

{{ include "common.tplvalues.render" (dict "value" $config "context" $) }}
{{- end -}}

Expand Down Expand Up @@ -275,6 +283,18 @@ conduktor: invalid database configuration
{{- end -}}
{{- end -}}

{{- define "conduktor.validateValues.conduktorSql" -}}
{{- if .Values.config.conduktorSql.enabled -}}
{{- if not .Values.config.database.host -}}
conduktor: invalid conduktorSql configuration
config.conduktorSql.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
{{- end -}}
{{- end -}}
{{- end -}}

{{- define "conduktor.validateValues.monitoring" -}}
{{- if (.Values.config.monitoring).storage -}}
conduktor: invalid monitoring storage configuration
Expand Down
4 changes: 4 additions & 0 deletions charts/console/templates/console/secret-credentials.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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 }}
23 changes: 20 additions & 3 deletions charts/console/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,21 @@ 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
## NOTE: This is a Beta Feature still early in development
conduktorSql:
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: ""

Expand All @@ -107,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.conduktorSql.username, config.conduktorSql.password will be ignored
existingSecret: ""

platform:
Expand Down Expand Up @@ -234,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'
Expand Down Expand Up @@ -774,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'
Expand Down
Loading