add parameters for external clickhouse (#387)

sentry-kubernetes · May 18, 2021 · 6faf90c · 6faf90c
1 parent c120034
commit 6faf90c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/sentry/templates/_helper.tpl b/sentry/templates/_helper.tpl
@@ -264,6 +264,17 @@ Set ClickHouse port
 {{- end -}}
 {{- end -}}
 
+{{/*
+Set ClickHouse HTTP port
+*/}}
+{{- define "sentry.clickhouse.http_port" -}}
+{{- if .Values.clickhouse.enabled -}}
+{{- default 8123 .Values.clickhouse.clickhouse.http_port }}
+{{- else -}}
+{{ required "A valid .Values.externalClickhouse.httpPort is required" .Values.externalClickhouse.httpPort }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Set ClickHouse Database
 */}}
@@ -288,7 +299,7 @@ Set ClickHouse User
 {{- define "sentry.clickhouse.username" -}}
 {{- if .Values.clickhouse.enabled -}}
   {{- if .Values.clickhouse.clickhouse.configmap.users.enabled -}}
-{{ (index .Values.clickhouse.clickhouse.configmap.users.user 0).name }} 
+{{ (index .Values.clickhouse.clickhouse.configmap.users.user 0).name }}
   {{- else -}}
 default
   {{- end -}}
@@ -303,7 +314,7 @@ Set ClickHouse Password
 {{- define "sentry.clickhouse.password" -}}
 {{- if .Values.clickhouse.enabled -}}
   {{- if .Values.clickhouse.clickhouse.configmap.users.enabled -}}
-{{ (index .Values.clickhouse.clickhouse.configmap.users.user 0).config.password }} 
+{{ (index .Values.clickhouse.clickhouse.configmap.users.user 0).config.password }}
   {{- else -}}
   {{- end -}}
 {{- else -}}

diff --git a/sentry/templates/configmap-snuba.yaml b/sentry/templates/configmap-snuba.yaml
@@ -21,6 +21,7 @@ data:
     # Clickhouse Options
     CLUSTERS[0]["host"] = env("CLICKHOUSE_HOST", {{ include "sentry.clickhouse.host" . | quote }})
     CLUSTERS[0]["port"] = int({{ include "sentry.clickhouse.port" . }})
+    CLUSTERS[0]["http_port"] = int({{ include "sentry.clickhouse.http_port" . }})
     CLUSTERS[0]["database"] = env("CLICKHOUSE_DATABASE", "default")
     CLUSTERS[0]["user"] = env("CLICKHOUSE_USER", "default")
     CLUSTERS[0]["password"] = env("CLICKHOUSE_PASSWORD", "")

diff --git a/sentry/values.yaml b/sentry/values.yaml
@@ -507,6 +507,7 @@ externalClickhouse:
   ##
   host: "clickhouse"
   tcpPort: 9000
+  httpPort: 8123
   username: default
   password: ""
   database: default