try reverting the chart changes to see if it impacts perf tests

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
dapr · Apr 5, 2024 · 2632510 · 2632510
1 parent 207e9bd
commit 2632510
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/charts/dapr/charts/dapr_operator/templates/dapr_operator_deployment.yaml b/charts/dapr/charts/dapr_operator/templates/dapr_operator_deployment.yaml
@@ -223,7 +223,7 @@ spec:
 {{- end }}
 {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets:
-        {{- include "dapr.imagePullSecrets" (dict "imagePullSecrets" .Values.global.imagePullSecrets) | nindent 8 -}}
+        {{- include "dapr.imagePullSecrets" (dict "imagePullSecrets" .Values.global.imagePullSecrets) | nindent 8 }}
 {{- end }}
 {{- if .Values.global.nodeSelector }}
       nodeSelector:

diff --git a/charts/dapr/charts/dapr_placement/templates/dapr_placement_statefulset.yaml b/charts/dapr/charts/dapr_placement/templates/dapr_placement_statefulset.yaml
@@ -243,7 +243,7 @@ spec:
 {{- end }}
 {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets:
-        {{- include "dapr.imagePullSecrets" (dict "imagePullSecrets" .Values.global.imagePullSecrets) | nindent 8 -}}
+        {{- include "dapr.imagePullSecrets" (dict "imagePullSecrets" .Values.global.imagePullSecrets) | nindent 8 }}
 {{- end }}
 {{- if .Values.global.nodeSelector }}
       nodeSelector:

diff --git a/charts/dapr/charts/dapr_sentry/templates/dapr_sentry_deployment.yaml b/charts/dapr/charts/dapr_sentry/templates/dapr_sentry_deployment.yaml
@@ -223,7 +223,7 @@ spec:
 {{- end }}
 {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets:
-        {{- include "dapr.imagePullSecrets" (dict "imagePullSecrets" .Values.global.imagePullSecrets) | nindent 8 -}}
+        {{- include "dapr.imagePullSecrets" (dict "imagePullSecrets" .Values.global.imagePullSecrets) | nindent 8 }}
 {{- end }}
 {{- if .Values.global.nodeSelector }}
       nodeSelector:

diff --git a/charts/dapr/charts/dapr_sidecar_injector/templates/dapr_sidecar_injector_deployment.yaml b/charts/dapr/charts/dapr_sidecar_injector/templates/dapr_sidecar_injector_deployment.yaml
@@ -263,7 +263,7 @@ spec:
 {{- end }}
 {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets:
-{{- include "dapr.imagePullSecrets" (dict "imagePullSecrets" .Values.global.imagePullSecrets) | nindent 8 -}}
+{{ include "dapr.imagePullSecrets" (dict "imagePullSecrets" .Values.global.imagePullSecrets) | nindent 8 }}
 {{- end }}
 {{- if .Values.global.nodeSelector }}
       nodeSelector:

diff --git a/charts/dapr/templates/_helpers.tpl b/charts/dapr/templates/_helpers.tpl
@@ -35,15 +35,15 @@ Create chart name and version as used by the chart label.
 Formats imagePullSecrets. Input is dict( "imagePullSecrets" .{specific imagePullSecrets}).
 */}}
 {{- define "dapr.imagePullSecrets" -}}
-{{- if eq (typeOf .imagePullSecrets) "string" -}} {{- /* Single string value */ -}}
+{{- if eq (typeOf .imagePullSecrets) "string" }}
 - name: {{ .imagePullSecrets }}
-{{- else -}} {{- /* Not a string value, iterate */ -}}
-{{- range .imagePullSecrets -}}
-{{- if eq (typeOf .) "map[string]interface {}" -}} {{- /* k8s style */ -}}
+{{- else }}
+{{- range .imagePullSecrets }}
+{{- if eq (typeOf .) "map[string]interface {}" }}
 - {{ toYaml (dict "name" .name) | trim }}
-{{ else }} {{- /* helm style */ -}}
+{{- else }}
 - name: {{ . }}
-{{ end }} {{- /* End of inner if */ -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}