fixed logic issue with apiKey and readOnlyApiKey primitive values int…

…roduced in last commit
qdrant · Aug 30, 2024 · c833a4c · c833a4c
1 parent c223819
commit c833a4c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/charts/qdrant/templates/_helpers.tpl b/charts/qdrant/templates/_helpers.tpl
@@ -68,13 +68,15 @@ Create secret
 {{- define "qdrant.secret" -}}
 {{- $readOnlyApiKey := false }}
 {{- $apiKey := false }}
+{{- if eq (typeOf .Values.apiKey) "dict" -}}
 {{- if .Values.apiKey.valueFrom -}}
 {{- /* Retrieve the value from the secret as specified in valueFrom */ -}}
 {{- $secretName := .Values.apiKey.valueFrom.secretKeyRef.name -}}
 {{- $secretKey := .Values.apiKey.valueFrom.secretKeyRef.key -}}
 {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace $secretName) | default dict -}}
 {{- $secretData := (get $secretObj "data") | default dict -}}
 {{- $apiKey = (get $secretData $secretKey | b64dec) -}}
+{{- end -}}
 {{- else if .Values.apiKey | toJson | eq "true" -}}
 {{- /* Retrieve existing randomly generated api key or create a new one */ -}}
 {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace (printf "%s-apikey" (include "qdrant.fullname" . ))) | default dict -}}
@@ -83,13 +85,15 @@ Create secret
 {{- else if .Values.apiKey -}}
 {{- $apiKey = .Values.apiKey -}}
 {{- end -}}
+{{- if eq (typeOf .Values.apiKey) "dict" -}}
 {{- if .Values.readOnlyApiKey.valueFrom -}}
 {{- /* Retrieve the value from the secret as specified in valueFrom */ -}}
 {{- $secretName := .Values.readOnlyApiKey.valueFrom.secretKeyRef.name -}}
 {{- $secretKey := .Values.readOnlyApiKey.valueFrom.secretKeyRef.key -}}
 {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace $secretName) | default dict -}}
 {{- $secretData := (get $secretObj "data") | default dict -}}
 {{- $readOnlyApiKey = (get $secretData $secretKey | b64dec) -}}
+{{- end -}}
 {{- else if eq (.Values.readOnlyApiKey | toJson) "true" -}}
 {{- /* retrieve existing randomly generated api key or create new one */ -}}
 {{- $secretObj := (lookup "v1" "Secret" .Release.Namespace (printf "%s-apikey" (include "qdrant.fullname" . ))) | default dict -}}