From 0bf7c83b86eebc774a3cbe04b074a935a63ca017 Mon Sep 17 00:00:00 2001
From: "M. Mert Yildiran" <me@mertyildiran.com>
Date: Tue, 27 Jun 2023 02:45:55 +0300
Subject: [PATCH] :zap: Use `toYaml` and `nindent` instead of `range` in the
 Helm templates

---
 helm-chart/templates/00-namespace.yaml             |  4 ++--
 helm-chart/templates/01-service-account.yaml       |  4 ++--
 helm-chart/templates/02-cluster-role.yaml          |  4 ++--
 helm-chart/templates/03-cluster-role-binding.yaml  |  4 ++--
 helm-chart/templates/04-hub-pod.yaml               |  6 +++---
 helm-chart/templates/05-hub-service.yaml           |  4 ++--
 helm-chart/templates/06-front-pod.yaml             |  6 +++---
 helm-chart/templates/07-front-service.yaml         |  4 ++--
 .../templates/08-persistent-volume-claim.yaml      |  4 ++--
 helm-chart/templates/09-worker-daemon-set.yaml     | 14 +++++++-------
 helm-chart/templates/10-ingress-class.yaml         |  4 ++--
 helm-chart/templates/11-ingress.yaml               | 12 +++---------
 12 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/helm-chart/templates/00-namespace.yaml b/helm-chart/templates/00-namespace.yaml
index a4e3917b4..540062c51 100644
--- a/helm-chart/templates/00-namespace.yaml
+++ b/helm-chart/templates/00-namespace.yaml
@@ -7,8 +7,8 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: '{{ .Values.tap.selfnamespace }}'
 spec: {}
diff --git a/helm-chart/templates/01-service-account.yaml b/helm-chart/templates/01-service-account.yaml
index 35166bae9..0940ffc01 100644
--- a/helm-chart/templates/01-service-account.yaml
+++ b/helm-chart/templates/01-service-account.yaml
@@ -7,8 +7,8 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: kubeshark-service-account
   namespace: '{{ .Values.tap.selfnamespace }}'
diff --git a/helm-chart/templates/02-cluster-role.yaml b/helm-chart/templates/02-cluster-role.yaml
index 8de5b935a..32c62ff09 100644
--- a/helm-chart/templates/02-cluster-role.yaml
+++ b/helm-chart/templates/02-cluster-role.yaml
@@ -7,8 +7,8 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: kubeshark-cluster-role
   namespace: '{{ .Values.tap.selfnamespace }}'
diff --git a/helm-chart/templates/03-cluster-role-binding.yaml b/helm-chart/templates/03-cluster-role-binding.yaml
index 14559ba65..b7860fd7e 100644
--- a/helm-chart/templates/03-cluster-role-binding.yaml
+++ b/helm-chart/templates/03-cluster-role-binding.yaml
@@ -7,8 +7,8 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: kubeshark-cluster-role-binding
   namespace: '{{ .Values.tap.selfnamespace }}'
diff --git a/helm-chart/templates/04-hub-pod.yaml b/helm-chart/templates/04-hub-pod.yaml
index 1ed6bc123..45d78c3f3 100644
--- a/helm-chart/templates/04-hub-pod.yaml
+++ b/helm-chart/templates/04-hub-pod.yaml
@@ -7,8 +7,8 @@ metadata:
     app: kubeshark-hub
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: kubeshark-hub
   namespace: '{{ .Values.tap.selfnamespace }}'
@@ -57,6 +57,6 @@ spec:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
         nodeSelectorTerms:
-          {{ .Values.tap.nodeselectorterms | toJson }}
+          {{- toYaml .Values.tap.nodeselectorterms | nindent 8 }}
 {{- end }}
 status: {}
diff --git a/helm-chart/templates/05-hub-service.yaml b/helm-chart/templates/05-hub-service.yaml
index 1c0efc27b..0a17b5b7b 100644
--- a/helm-chart/templates/05-hub-service.yaml
+++ b/helm-chart/templates/05-hub-service.yaml
@@ -7,8 +7,8 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: kubeshark-hub
   namespace: '{{ .Values.tap.selfnamespace }}'
diff --git a/helm-chart/templates/06-front-pod.yaml b/helm-chart/templates/06-front-pod.yaml
index 2f0203678..845093e0d 100644
--- a/helm-chart/templates/06-front-pod.yaml
+++ b/helm-chart/templates/06-front-pod.yaml
@@ -7,8 +7,8 @@ metadata:
     app: kubeshark-front
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: kubeshark-front
   namespace: '{{ .Values.tap.selfnamespace }}'
@@ -56,6 +56,6 @@ spec:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
         nodeSelectorTerms:
-          {{ .Values.tap.nodeselectorterms | toJson }}
+          {{- toYaml .Values.tap.nodeselectorterms | nindent 8 }}
 {{- end }}
 status: {}
diff --git a/helm-chart/templates/07-front-service.yaml b/helm-chart/templates/07-front-service.yaml
index 718f92bae..fa0557360 100644
--- a/helm-chart/templates/07-front-service.yaml
+++ b/helm-chart/templates/07-front-service.yaml
@@ -7,8 +7,8 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: kubeshark-front
   namespace: '{{ .Values.tap.selfnamespace }}'
diff --git a/helm-chart/templates/08-persistent-volume-claim.yaml b/helm-chart/templates/08-persistent-volume-claim.yaml
index 19d4505c9..6ff6255e8 100644
--- a/helm-chart/templates/08-persistent-volume-claim.yaml
+++ b/helm-chart/templates/08-persistent-volume-claim.yaml
@@ -8,8 +8,8 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: kubeshark-persistent-volume-claim
   namespace: '{{ .Values.tap.selfnamespace }}'
diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml
index 48f0ae6b2..94a3c63a9 100644
--- a/helm-chart/templates/09-worker-daemon-set.yaml
+++ b/helm-chart/templates/09-worker-daemon-set.yaml
@@ -8,8 +8,8 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: kubeshark-worker-daemon-set
   namespace: '{{ .Values.tap.selfnamespace }}'
@@ -19,8 +19,8 @@ spec:
       app: kubeshark-worker-daemon-set
       kubeshark-created-by: kubeshark
       kubeshark-managed-by: kubeshark
-    {{- range $key, $value := .Values.tap.resourcelabels }}
-      {{ $key }}: {{ $value }}
+    {{- if .Values.tap.resourcelabels }}
+      {{- toYaml .Values.tap.resourcelabels | nindent 6 }}
     {{- end }}
   template:
     metadata:
@@ -29,8 +29,8 @@ spec:
         app: kubeshark-worker-daemon-set
         kubeshark-created-by: kubeshark
         kubeshark-managed-by: kubeshark
-      {{- range $key, $value := .Values.tap.resourcelabels }}
-        {{ $key }}: {{ $value }}
+      {{- if .Values.tap.resourcelabels }}
+        {{- toYaml .Values.tap.resourcelabels | nindent 8 }}
       {{- end }}
       name: kubeshark-worker-daemon-set
       namespace: kubeshark
@@ -99,7 +99,7 @@ spec:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
-              {{ .Values.tap.nodeselectorterms | toJson }}
+              {{- toYaml .Values.tap.nodeselectorterms | nindent 12 }}
 {{- end }}
       volumes:
         - hostPath:
diff --git a/helm-chart/templates/10-ingress-class.yaml b/helm-chart/templates/10-ingress-class.yaml
index 2926b0d13..86f3dcfd6 100644
--- a/helm-chart/templates/10-ingress-class.yaml
+++ b/helm-chart/templates/10-ingress-class.yaml
@@ -8,8 +8,8 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: kubeshark-ingress-class
   namespace: '{{ .Values.tap.selfnamespace }}'
diff --git a/helm-chart/templates/11-ingress.yaml b/helm-chart/templates/11-ingress.yaml
index bb36f5951..4dc5641c8 100644
--- a/helm-chart/templates/11-ingress.yaml
+++ b/helm-chart/templates/11-ingress.yaml
@@ -11,8 +11,8 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  {{- range $key, $value := .Values.tap.resourcelabels }}
-    {{ $key }}: {{ $value }}
+  {{- if .Values.tap.resourcelabels }}
+    {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
   {{- end }}
   name: kubeshark-ingress
   namespace: '{{ .Values.tap.selfnamespace }}'
@@ -37,13 +37,7 @@ spec:
             path: /()(.*)
             pathType: Prefix
   tls:
-  {{- range .Values.tap.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
+    {{- toYaml .Values.tap.ingress.tls | nindent 2 }}
 status:
   loadBalancer: {}
 {{- end }}