Use toYaml and nindent instead of range in the Helm templates

This commit is contained in:
M. Mert Yildiran 2023-06-27 02:45:55 +03:00
parent a8df589076
commit 0bf7c83b86
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
12 changed files with 32 additions and 38 deletions

View File

@ -7,8 +7,8 @@ metadata:
kubeshark-cli-version: v1 kubeshark-cli-version: v1
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: '{{ .Values.tap.selfnamespace }}' name: '{{ .Values.tap.selfnamespace }}'
spec: {} spec: {}

View File

@ -7,8 +7,8 @@ metadata:
kubeshark-cli-version: v1 kubeshark-cli-version: v1
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: kubeshark-service-account name: kubeshark-service-account
namespace: '{{ .Values.tap.selfnamespace }}' namespace: '{{ .Values.tap.selfnamespace }}'

View File

@ -7,8 +7,8 @@ metadata:
kubeshark-cli-version: v1 kubeshark-cli-version: v1
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: kubeshark-cluster-role name: kubeshark-cluster-role
namespace: '{{ .Values.tap.selfnamespace }}' namespace: '{{ .Values.tap.selfnamespace }}'

View File

@ -7,8 +7,8 @@ metadata:
kubeshark-cli-version: v1 kubeshark-cli-version: v1
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: kubeshark-cluster-role-binding name: kubeshark-cluster-role-binding
namespace: '{{ .Values.tap.selfnamespace }}' namespace: '{{ .Values.tap.selfnamespace }}'

View File

@ -7,8 +7,8 @@ metadata:
app: kubeshark-hub app: kubeshark-hub
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: kubeshark-hub name: kubeshark-hub
namespace: '{{ .Values.tap.selfnamespace }}' namespace: '{{ .Values.tap.selfnamespace }}'
@ -57,6 +57,6 @@ spec:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
{{ .Values.tap.nodeselectorterms | toJson }} {{- toYaml .Values.tap.nodeselectorterms | nindent 8 }}
{{- end }} {{- end }}
status: {} status: {}

View File

@ -7,8 +7,8 @@ metadata:
kubeshark-cli-version: v1 kubeshark-cli-version: v1
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: kubeshark-hub name: kubeshark-hub
namespace: '{{ .Values.tap.selfnamespace }}' namespace: '{{ .Values.tap.selfnamespace }}'

View File

@ -7,8 +7,8 @@ metadata:
app: kubeshark-front app: kubeshark-front
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: kubeshark-front name: kubeshark-front
namespace: '{{ .Values.tap.selfnamespace }}' namespace: '{{ .Values.tap.selfnamespace }}'
@ -56,6 +56,6 @@ spec:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
{{ .Values.tap.nodeselectorterms | toJson }} {{- toYaml .Values.tap.nodeselectorterms | nindent 8 }}
{{- end }} {{- end }}
status: {} status: {}

View File

@ -7,8 +7,8 @@ metadata:
kubeshark-cli-version: v1 kubeshark-cli-version: v1
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: kubeshark-front name: kubeshark-front
namespace: '{{ .Values.tap.selfnamespace }}' namespace: '{{ .Values.tap.selfnamespace }}'

View File

@ -8,8 +8,8 @@ metadata:
kubeshark-cli-version: v1 kubeshark-cli-version: v1
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: kubeshark-persistent-volume-claim name: kubeshark-persistent-volume-claim
namespace: '{{ .Values.tap.selfnamespace }}' namespace: '{{ .Values.tap.selfnamespace }}'

View File

@ -8,8 +8,8 @@ metadata:
kubeshark-cli-version: v1 kubeshark-cli-version: v1
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: kubeshark-worker-daemon-set name: kubeshark-worker-daemon-set
namespace: '{{ .Values.tap.selfnamespace }}' namespace: '{{ .Values.tap.selfnamespace }}'
@ -19,8 +19,8 @@ spec:
app: kubeshark-worker-daemon-set app: kubeshark-worker-daemon-set
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 6 }}
{{- end }} {{- end }}
template: template:
metadata: metadata:
@ -29,8 +29,8 @@ spec:
app: kubeshark-worker-daemon-set app: kubeshark-worker-daemon-set
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 8 }}
{{- end }} {{- end }}
name: kubeshark-worker-daemon-set name: kubeshark-worker-daemon-set
namespace: kubeshark namespace: kubeshark
@ -99,7 +99,7 @@ spec:
nodeAffinity: nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms: nodeSelectorTerms:
{{ .Values.tap.nodeselectorterms | toJson }} {{- toYaml .Values.tap.nodeselectorterms | nindent 12 }}
{{- end }} {{- end }}
volumes: volumes:
- hostPath: - hostPath:

View File

@ -8,8 +8,8 @@ metadata:
kubeshark-cli-version: v1 kubeshark-cli-version: v1
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: kubeshark-ingress-class name: kubeshark-ingress-class
namespace: '{{ .Values.tap.selfnamespace }}' namespace: '{{ .Values.tap.selfnamespace }}'

View File

@ -11,8 +11,8 @@ metadata:
kubeshark-cli-version: v1 kubeshark-cli-version: v1
kubeshark-created-by: kubeshark kubeshark-created-by: kubeshark
kubeshark-managed-by: kubeshark kubeshark-managed-by: kubeshark
{{- range $key, $value := .Values.tap.resourcelabels }} {{- if .Values.tap.resourcelabels }}
{{ $key }}: {{ $value }} {{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- end }} {{- end }}
name: kubeshark-ingress name: kubeshark-ingress
namespace: '{{ .Values.tap.selfnamespace }}' namespace: '{{ .Values.tap.selfnamespace }}'
@ -37,13 +37,7 @@ spec:
path: /()(.*) path: /()(.*)
pathType: Prefix pathType: Prefix
tls: tls:
{{- range .Values.tap.ingress.tls }} {{- toYaml .Values.tap.ingress.tls | nindent 2 }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
status: status:
loadBalancer: {} loadBalancer: {}
{{- end }} {{- end }}