fix issue when installing pro version with external clickhouse and ka…

…fka (#9)
featbit · Aug 23, 2023 · abb3405 · abb3405
1 parent d770fdb
commit abb3405
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/charts/featbit/templates/_helpers.tpl b/charts/featbit/templates/_helpers.tpl
@@ -398,7 +398,7 @@ Return the ClickHouse secret key
 {{- define "featbit.clickhouse.secretPasswordKey" -}}
 {{- if and .Values.clickhouse.enabled .Values.clickhouse.auth.existingSecret -}}
     {{- required "You need to provide existingSecretPasswordKey when an existingSecret is specified in Clickhouse" .Values.clickhouse.auth.existingSecretKey | printf "%s" -}}
-{{- else if and (not .Values.redis.enabled) .Values.externalRedis.existingSecret -}}
+{{- else if and (not .Values.clickhouse.enabled) .Values.externalClickhouse.existingSecret -}}
     {{- required "You need to provide existingSecretPasswordKey when an existingSecret is specified in external Clickhouse" .Values.externalClickhouse.existingSecretKey | printf "%s" -}}
 {{- else -}}
     {{- printf "admin-password" -}}

diff --git a/charts/featbit/templates/_pro-env.tpl b/charts/featbit/templates/_pro-env.tpl
@@ -17,20 +17,20 @@
       key: {{ include "featbit.clickhouse.secretPasswordKey" . }}
 - name: CLICKHOUSE_DATABASE
   value: {{ include "featbit.clickhouse.database" . }}
-{{- if (not .Values.clickhouse.enabled) -}}
+{{- if (not .Values.clickhouse.enabled) }}
 - name: CLICKHOUSE_SECURE
   value: {{ .Values.externalClickhouse.secure | quote }}
 - name: CLICKHOUSE_VERIFY
   value: {{ .Values.externalClickhouse.verify | quote }}
-{{- if .Values.externalClickhouse.cluster -}}
+{{- if .Values.externalClickhouse.cluster }}
 - name: CLICKHOUSE_CLUSTER
   value: {{ .Values.externalClickhouse.cluster | quote }}
-{{- else -}}
+{{- else }}
 - name: CLICKHOUSE_REPLICATION
   value: "false"
-{{- end -}}
-{{- end -}}
-{{- end -}}
+{{- end }}
+{{- end }}
+{{- end }}
 {{- end -}}
 
 {{- define "kafka-bootstrapservers" -}}
@@ -39,7 +39,7 @@
   value: "true"
 - name: Kafka__BootstrapServers
   value: {{ include "featbit.kafka.brokers" . }}
-{{- end -}}
+{{- end }}
 {{- end -}}
 
 {{- define "clickhouse-usr-pass" -}}
@@ -51,5 +51,5 @@
     secretKeyRef:
       name: {{ include "featbit.clickhouse.secretName" . }}
       key: {{ include "featbit.clickhouse.secretPasswordKey" . }}
-{{- end -}}
+{{- end }}
 {{- end -}}