Remove extra blank lines, witout overchomping

Author: marcleblanc2

charts/sourcegraph/templates/_helpers.tpl

@@ -278,7 +278,9 @@ and defining the REDIS_CACHE_ENDPOINT and REDIS_STORE_ENDPOINT env vars on front
 {{- if .Values.redisCache.connection.endpoint -}}
 - name: REDIS_CACHE_ENDPOINT
   value: {{ .Values.redisCache.connection.endpoint }}
+{{- if .Values.redisStore.connection.endpoint }} {{/*Add whitespace only if both are defined*/}}
 {{ end -}}
+{{- end -}}
 {{- if .Values.redisStore.connection.endpoint -}}
 - name: REDIS_STORE_ENDPOINT
   value: {{ .Values.redisStore.connection.endpoint }}

charts/sourcegraph/templates/_worker.tpl

@@ -66,7 +66,7 @@ spec:
       containers:
       - name: worker
         env:
-        {{- include "sourcegraph.redisConnection" $top | nindent 8 }}
+        {{- with include "sourcegraph.redisConnection" $top | trim }}{{ . | nindent 8 }}{{- end }}
         {{- if $allowlist }}
         - name: WORKER_JOB_ALLOWLIST
           value: {{ $allowlist }}

charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml

@@ -65,7 +65,7 @@ spec:
         {{- range $name, $item := .Values.migrator.env }}
         - name: {{ $name }}
           {{- $item | toYaml | nindent 10 }}
-        {{- end }} 
+        {{- end }}
         {{- if not .Values.sourcegraph.localDevMode}}
         resources:
           {{- toYaml .Values.migrator.resources | nindent 10 }}
@@ -95,7 +95,7 @@ spec:
         - name: {{ $name }}
           {{- $item | toYaml | nindent 10 }}
         {{- end }}
-        {{- include "sourcegraph.redisConnection" .| nindent 8 }}
+        {{- with include "sourcegraph.redisConnection" . | trim }}{{ . | nindent 8 }}{{- end }}
         {{- include "sourcegraph.openTelemetryEnv" . | nindent 8 }}
         {{- if .Values.blobstore.enabled }}
         - name: PRECISE_CODE_INTEL_UPLOAD_BACKEND

charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml

@@ -49,7 +49,7 @@ spec:
         image: {{ include "sourcegraph.image" (list . "gitserver") }}
         imagePullPolicy: {{ .Values.sourcegraph.image.pullPolicy }}
         env:
-        {{- include "sourcegraph.redisConnection" .| nindent 8 }}
+        {{- with include "sourcegraph.redisConnection" . | trim }}{{ . | nindent 8 }}{{- end }}
         {{- range $name, $item := .Values.gitserver.env}}
         - name: {{ $name }}
           {{- $item | toYaml | nindent 10 }}

charts/sourcegraph/templates/searcher/searcher.StatefulSet.yaml

@@ -50,7 +50,7 @@ spec:
           {{- toYaml . | nindent 8 }}
         {{- end }}
         env:
-        {{- include "sourcegraph.redisConnection" . | nindent 8 }}
+        {{- with include "sourcegraph.redisConnection" . | trim }}{{ . | nindent 8 }}{{- end }}
         {{- range $name, $item := .Values.searcher.env }}
         - name: {{ $name }}
           {{- $item | toYaml | nindent 10 }}