From a32fce1c0def0945f23c79a686015e575370cc57 Mon Sep 17 00:00:00 2001 From: mpw Date: Thu, 23 Feb 2023 19:17:18 -0300 Subject: [PATCH 1/2] add kafka auth to helm chart --- charts/hub-orgs/Chart.yaml | 2 +- charts/hub-orgs/templates/environment.yaml | 1 + charts/hub-orgs/templates/secrets.yaml | 3 ++- charts/hub-orgs/values.yaml | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/hub-orgs/Chart.yaml b/charts/hub-orgs/Chart.yaml index d05140c..07b864d 100644 --- a/charts/hub-orgs/Chart.yaml +++ b/charts/hub-orgs/Chart.yaml @@ -18,7 +18,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.1 +version: 0.3.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/hub-orgs/templates/environment.yaml b/charts/hub-orgs/templates/environment.yaml index 2a54637..f79f04e 100644 --- a/charts/hub-orgs/templates/environment.yaml +++ b/charts/hub-orgs/templates/environment.yaml @@ -7,6 +7,7 @@ data: ORY_BASE_URL: {{ .oryBaseUrl }} PORT: {{ .port | quote }} KAFKA_BROKERS: {{ required "must set kafka brokers" .kafkaBrokers | quote }} + KAFKA_USERNAME: {{ .entries.kafkaUsername | quote }} KAFKA_SSL: {{ required "must set kafka ssl" .kafkaSsl | quote }} SVIX_BASE_URL: {{ required "must set svix base url" .svixBaseUrl | quote }} {{- end }} diff --git a/charts/hub-orgs/templates/secrets.yaml b/charts/hub-orgs/templates/secrets.yaml index fb50540..9d2a5f2 100644 --- a/charts/hub-orgs/templates/secrets.yaml +++ b/charts/hub-orgs/templates/secrets.yaml @@ -11,5 +11,6 @@ data: SVIX_AUTH_TOKEN: {{ .entries.svixAuthToken | b64enc }} DATABASE_URL: {{ .entries.databaseUrl | b64enc }} ORY_AUTH_TOKEN: {{ .entries.oryAuthToken | b64enc }} + KAFKA_PASSWORD: {{ .entries.kafkaPassword | b64enc }} +{{- end }} {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/hub-orgs/values.yaml b/charts/hub-orgs/values.yaml index 82043fa..e2a8347 100644 --- a/charts/hub-orgs/values.yaml +++ b/charts/hub-orgs/values.yaml @@ -78,10 +78,12 @@ secrets: oryAuthToken: "" databaseUrl: "" svixAuthToken: "" + kafkaPassword: "" environment: port: "80" oryBaseUrl: "http://hydra-admin" kafkaBrokers: + kafkaUsername: "" kafkaSsl: false svixBaseUrl: From 868c3ecac60a3aab5d36b39b44904b276c3d71f5 Mon Sep 17 00:00:00 2001 From: mpw Date: Thu, 23 Feb 2023 19:18:51 -0300 Subject: [PATCH 2/2] wops, fix pointer --- charts/hub-orgs/templates/environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hub-orgs/templates/environment.yaml b/charts/hub-orgs/templates/environment.yaml index f79f04e..a7dc36e 100644 --- a/charts/hub-orgs/templates/environment.yaml +++ b/charts/hub-orgs/templates/environment.yaml @@ -7,7 +7,7 @@ data: ORY_BASE_URL: {{ .oryBaseUrl }} PORT: {{ .port | quote }} KAFKA_BROKERS: {{ required "must set kafka brokers" .kafkaBrokers | quote }} - KAFKA_USERNAME: {{ .entries.kafkaUsername | quote }} + KAFKA_USERNAME: {{ .kafkaUsername | quote }} KAFKA_SSL: {{ required "must set kafka ssl" .kafkaSsl | quote }} SVIX_BASE_URL: {{ required "must set svix base url" .svixBaseUrl | quote }} {{- end }}