fix: bug in internal infra (#28)

featbit · Nov 29, 2023 · c77fa80 · c77fa80
1 parent 71607fe
commit c77fa80
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/charts/featbit/Chart.yaml b/charts/featbit/Chart.yaml
@@ -15,7 +15,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.0.8
+version: 0.0.9
 
 # 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/featbit/templates/_helpers.tpl b/charts/featbit/templates/_helpers.tpl
@@ -142,15 +142,15 @@ Return the Mongodb host
 {{- end -}}
 
 {{- define "featbit.mongodb.createSecret" -}}
-{{- if and (not .Values.mongodb.enabled) (not .Values.externalMongodb.existingSecret) -}}
+{{- if (not .Values.externalMongodb.existingSecret) -}}
     {{- true -}}
 {{- end -}}
 {{- end -}}
 
 {{- define "featbit.mongodb.connStr" -}}
 {{- if .Values.mongodb.enabled -}}
     {{- printf "mongodb://%s:%s@%s:%s" .Values.mongodb.auth.rootUser .Values.mongodb.auth.rootPassword (include "featbit.mongodb.host" .) (include "featbit.mongodb.port" .) -}}
-{{- else -}}
+{{- else if (not .Values.externalMongodb.existingSecret) -}}
     {{- required "You need to provide a full connection string when using external mongodb" .Values.externalMongodb.fullConnectionString | printf "%s" -}}
 {{- end -}}
 {{- end -}}
@@ -459,15 +459,15 @@ Return the Redis host
 
 {{- define "featbit.clickhouse.port" -}}
 {{- if .Values.clickhouse.enabled -}}
-    {{- printf "%d" .Values.clickhouse.containerPorts.tcp -}}
+    {{- printf "%d" (.Values.clickhouse.containerPorts.tcp | int) -}}
 {{- else if .Values.isPro -}}
     {{- required "You need to provide a host port when using external Clickhouse" (.Values.externalClickhouse.tcpPort | int) | printf "%d" -}}
 {{- end -}}
 {{- end -}}
 
 {{- define "featbit.clickhouse.httpPort" -}}
 {{- if .Values.clickhouse.enabled -}}
-    {{- printf "%d" .Values.clickhouse.containerPorts.http -}}
+    {{- printf "%d" (.Values.clickhouse.containerPorts.http | int) -}}
 {{- else if .Values.isPro -}}
     {{- required "You need to provide a host http port when using external Clickhouse" (.Values.externalClickhouse.httpPort | int) | printf "%d" -}}
 {{- end -}}