Merge pull request #2358 from consideRatio/pr/remove-trimsuffix-no-lo…

…nger-needed refactor: remove redundant trimSuffix of new lines after toYaml
jupyterhub · Aug 24, 2021 · 6ec062d · 6ec062d
2 parents 6258e16 + 490dcc6
commit 6ec062d
Show file tree

Hide file tree

Showing 19 changed files with 77 additions and 77 deletions.
diff --git a/jupyterhub/templates/_helpers.tpl b/jupyterhub/templates/_helpers.tpl
@@ -322,9 +322,9 @@ limits:
         {{- if $file_details.data }}
             {{- $file_key | quote }}: |
               {{- if or (eq (ext $file_name) ".yaml") (eq (ext $file_name) ".yml") }}
-              {{- $file_details.data | toYaml | trimSuffix "\n" | nindent 2 }}{{ println }}
+              {{- $file_details.data | toYaml | nindent 2 }}{{ println }}
               {{- else if eq (ext $file_name) ".json" }}
-              {{- $file_details.data | toJson | trimSuffix "\n" | nindent 2 }}{{ println }}
+              {{- $file_details.data | toJson | nindent 2 }}{{ println }}
               {{- else if eq (ext $file_name) ".toml" }}
               {{- $file_details.data | toToml | trimSuffix "\n" | nindent 2 }}{{ println }}
               {{- else }}

diff --git a/jupyterhub/templates/hub/deployment.yaml b/jupyterhub/templates/hub/deployment.yaml
@@ -10,7 +10,7 @@ spec:
     matchLabels:
       {{- include "jupyterhub.matchLabels" . | nindent 6 }}
   strategy:
-    {{- .Values.hub.deploymentStrategy | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- .Values.hub.deploymentStrategy | toYaml | nindent 4 }}
   template:
     metadata:
       labels:
@@ -20,14 +20,14 @@ spec:
         hub.jupyter.org/network-access-proxy-http: "true"
         hub.jupyter.org/network-access-singleuser: "true"
         {{- with .Values.hub.labels }}
-        {{- . | toYaml | trimSuffix "\n" | nindent 8 }}
+        {{- . | toYaml | nindent 8 }}
         {{- end }}
       annotations:
         {{- /* This lets us autorestart when the secret changes! */}}
         checksum/config-map: {{ include (print .Template.BasePath "/hub/configmap.yaml") . | sha256sum }}
         checksum/secret: {{ include (print .Template.BasePath "/hub/secret.yaml") . | sha256sum }}
         {{- with .Values.hub.annotations }}
-        {{- . | toYaml | trimSuffix "\n" | nindent 8 }}
+        {{- . | toYaml | nindent 8 }}
         {{- end }}
     spec:
       {{- if .Values.scheduling.podPriority.enabled }}
@@ -65,7 +65,7 @@ spec:
               {{- end }}
         {{- end }}
         {{- with .Values.hub.extraVolumes }}
-        {{- . | toYaml | trimSuffix "\n" | nindent 8 }}
+        {{- . | toYaml | nindent 8 }}
         {{- end }}
         {{- if eq .Values.hub.db.type "sqlite-pvc" }}
         - name: pvc
@@ -82,11 +82,11 @@ spec:
       {{- end }}
       {{- with .Values.hub.initContainers }}
       initContainers:
-        {{- . | toYaml | trimSuffix "\n" | nindent 8 }}
+        {{- . | toYaml | nindent 8 }}
       {{- end }}
       containers:
         {{- with .Values.hub.extraContainers }}
-        {{- . | toYaml | trimSuffix "\n" | nindent 8 }}
+        {{- . | toYaml | nindent 8 }}
         {{- end }}
         - name: hub
           image: {{ .Values.hub.image.name }}:{{ .Values.hub.image.tag }}
@@ -153,7 +153,7 @@ spec:
               name: files
             {{- end }}
             {{- with .Values.hub.extraVolumeMounts }}
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
             {{- end }}
             {{- if eq .Values.hub.db.type "sqlite-pvc" }}
             - mountPath: /srv/jupyterhub
@@ -164,18 +164,18 @@ spec:
             {{- end }}
           {{- with .Values.hub.resources }}
           resources:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
           {{- with .Values.hub.image.pullPolicy }}
           imagePullPolicy: {{ . }}
           {{- end }}
           {{- with .Values.hub.containerSecurityContext }}
           securityContext:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
           {{- with .Values.hub.lifecycle }}
           lifecycle:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
           env:
             - name: PYTHONUNBUFFERED
@@ -231,5 +231,5 @@ spec:
               port: http
           {{- end }}
       {{- with .Values.hub.extraPodSpec }}
-      {{- . | toYaml | trimSuffix "\n" | nindent 6 }}
+      {{- . | toYaml | nindent 6 }}
       {{- end }}
diff --git a/jupyterhub/templates/hub/netpol.yaml b/jupyterhub/templates/hub/netpol.yaml
@@ -56,7 +56,7 @@ spec:
 
     {{- with .Values.hub.networkPolicy.ingress }}
     # depends, but default is nothing --> hub
-    {{- . | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
     {{- end }}
 
   egress:
@@ -86,6 +86,6 @@ spec:
 
     {{- with .Values.hub.networkPolicy.egress }}
     # hub --> depends, but the default is everything
-    {{- . | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
     {{- end }}
 {{- end }}
diff --git a/jupyterhub/templates/hub/pvc.yaml b/jupyterhub/templates/hub/pvc.yaml
@@ -7,18 +7,18 @@ metadata:
     {{- include "jupyterhub.labels" . | nindent 4 }}
   {{- with .Values.hub.db.pvc.annotations }}
   annotations:
-    {{- . | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
   {{- end }}
 spec:
   {{- with .Values.hub.db.pvc.selector }}
   selector:
-    {{- . | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
   {{- end }}
   {{- if typeIs "string" .Values.hub.db.pvc.storageClassName }}
   storageClassName: {{ .Values.hub.db.pvc.storageClassName | quote }}
   {{- end }}
   accessModes:
-    {{- .Values.hub.db.pvc.accessModes | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- .Values.hub.db.pvc.accessModes | toYaml | nindent 4 }}
   resources:
     requests:
       storage: {{ .Values.hub.db.pvc.storage | quote }}

diff --git a/jupyterhub/templates/image-puller/_helpers-daemonset.tpl b/jupyterhub/templates/image-puller/_helpers-daemonset.tpl
@@ -40,7 +40,7 @@ spec:
         {{- include "jupyterhub.matchLabels" . | nindent 8 }}
       {{- with .Values.prePuller.annotations }}
       annotations:
-        {{- . | toYaml | trimSuffix "\n" | nindent 8 }}
+        {{- . | toYaml | nindent 8 }}
       {{- end }}
     spec:
       {{- /*
@@ -82,11 +82,11 @@ spec:
             - echo "Pulling complete"
           {{- with .Values.prePuller.resources }}
           resources:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
           {{- with .Values.prePuller.containerSecurityContext }}
           securityContext:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
         {{- end }}
 
@@ -99,11 +99,11 @@ spec:
             - echo "Pulling complete"
           {{- with .Values.prePuller.resources }}
           resources:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
           {{- with .Values.prePuller.containerSecurityContext }}
           securityContext:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
 
         {{- /* --- Pull extra containers' images --- */}}
@@ -116,11 +116,11 @@ spec:
             - echo "Pulling complete"
           {{- with $.Values.prePuller.resources }}
           resources:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
           {{- with $.Values.prePuller.containerSecurityContext }}
           securityContext:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
         {{- end }}
 
@@ -137,11 +137,11 @@ spec:
             - echo "Pulling complete"
           {{- with $.Values.prePuller.resources }}
           resources:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
           {{- with $.Values.prePuller.containerSecurityContext }}
           securityContext:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
         {{- end }}
         {{- end }}
@@ -158,23 +158,23 @@ spec:
             - echo "Pulling complete"
           {{- with $.Values.prePuller.resources }}
           resources:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
           {{- with $.Values.prePuller.containerSecurityContext }}
           securityContext:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
         {{- end }}
       containers:
         - name: pause
           image: {{ .Values.prePuller.pause.image.name }}:{{ .Values.prePuller.pause.image.tag }}
           {{- with .Values.prePuller.resources }}
           resources:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
           {{- with .Values.prePuller.pause.containerSecurityContext }}
           securityContext:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
 {{- end }}
 

diff --git a/jupyterhub/templates/image-puller/job.yaml b/jupyterhub/templates/image-puller/job.yaml
@@ -30,7 +30,7 @@ spec:
         {{- include "jupyterhub.matchLabels" . | nindent 8 }}
       {{- with .Values.prePuller.annotations }}
       annotations:
-        {{- . | toYaml | trimSuffix "\n" | nindent 8 }}
+        {{- . | toYaml | nindent 8 }}
       {{- end }}
     spec:
       restartPolicy: Never
@@ -61,10 +61,10 @@ spec:
             - -pod-scheduling-wait-duration={{ .Values.prePuller.hook.podSchedulingWaitDuration }}
           {{- with .Values.prePuller.hook.containerSecurityContext }}
           securityContext:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
           {{- with .Values.prePuller.hook.resources }}
           resources:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
 {{- end }}
diff --git a/jupyterhub/templates/ingress.yaml b/jupyterhub/templates/ingress.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- include "jupyterhub.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
-    {{- . | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
   {{- end }}
 spec:
   rules:
@@ -37,6 +37,6 @@ spec:
     {{- end }}
   {{- with .Values.ingress.tls }}
   tls:
-    {{- . | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
   {{- end }}
 {{- end }}
diff --git a/jupyterhub/templates/proxy/autohttps/deployment.yaml b/jupyterhub/templates/proxy/autohttps/deployment.yaml
@@ -18,7 +18,7 @@ spec:
         {{- include "jupyterhub.matchLabels" . | nindent 8 }}
         hub.jupyter.org/network-access-proxy-http: "true"
         {{- with .Values.proxy.traefik.labels }}
-        {{- . | toYaml | trimSuffix "\n" | nindent 8 }}
+        {{- . | toYaml | nindent 8 }}
         {{- end }}
       annotations:
         # Only force a restart through a change to this checksum when the static
@@ -46,7 +46,7 @@ spec:
           configMap:
             name: {{ include "jupyterhub.autohttps.fullname" . }}
         {{- with .Values.proxy.traefik.extraVolumes }}
-        {{- . | toYaml | trimSuffix "\n" | nindent 8 }}
+        {{- . | toYaml | nindent 8 }}
         {{- end }}
       {{- with include "jupyterhub.imagePullSecrets" (dict "root" . "image" .Values.proxy.traefik.image) }}
       imagePullSecrets: {{ . }}
@@ -74,7 +74,7 @@ spec:
               mountPath: /etc/acme
           {{- with .Values.proxy.secretSync.containerSecurityContext }}
           securityContext:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
       containers:
         - name: traefik
@@ -84,31 +84,31 @@ spec:
           {{- end }}
           {{- with .Values.proxy.traefik.resources }}
           resources:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
           ports:
             - name: http
               containerPort: 8080
             - name: https
               containerPort: 8443
             {{- with .Values.proxy.traefik.extraPorts }}
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
             {{- end }}
           volumeMounts:
             - name: traefik-config
               mountPath: /etc/traefik
             - name: certificates
               mountPath: /etc/acme
             {{- with .Values.proxy.traefik.extraVolumeMounts }}
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
             {{- end }}
           {{- with .Values.proxy.traefik.extraEnv }}
           env:
             {{- include "jupyterhub.extraEnv" . | nindent 12 }}
           {{- end }}
           {{- with .Values.proxy.traefik.containerSecurityContext }}
           securityContext:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
         - name: secret-sync
           image: "{{ .Values.proxy.secretSync.image.name }}:{{ .Values.proxy.secretSync.image.tag }}"
@@ -133,9 +133,9 @@ spec:
               mountPath: /etc/acme
           {{- with .Values.proxy.secretSync.containerSecurityContext }}
           securityContext:
-            {{- . | toYaml | trimSuffix "\n" | nindent 12 }}
+            {{- . | toYaml | nindent 12 }}
           {{- end }}
       {{- with .Values.proxy.traefik.extraPodSpec }}
-      {{- . | toYaml | trimSuffix "\n" | nindent 6 }}
+      {{- . | toYaml | nindent 6 }}
       {{- end }}
 {{- end }}
diff --git a/jupyterhub/templates/proxy/autohttps/netpol.yaml b/jupyterhub/templates/proxy/autohttps/netpol.yaml
@@ -59,7 +59,7 @@ spec:
 
     {{- with .Values.proxy.traefik.networkPolicy.ingress}}
     # depends, but default is nothing --> proxy
-    {{- . | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
     {{- end }}
 
   egress:
@@ -81,6 +81,6 @@ spec:
 
     {{- with .Values.proxy.traefik.networkPolicy.egress }}
     # autohttps --> depends, but the default is everything
-    {{- . | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
     {{- end }}
 {{- end }}
diff --git a/jupyterhub/templates/proxy/autohttps/service.yaml b/jupyterhub/templates/proxy/autohttps/service.yaml
@@ -8,11 +8,11 @@ metadata:
   labels:
     {{- include "jupyterhub.labels" . | nindent 4 }}
     {{- with .Values.proxy.service.labels }}
-    {{- . | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
     {{- end }}
   {{- with .Values.proxy.service.annotations }}
   annotations:
-    {{- . | toYaml | trimSuffix "\n" | nindent 4 }}
+    {{- . | toYaml | nindent 4 }}
   {{- end }}
 spec:
   type: ClusterIP