Skip to content

Commit 52f5312

Browse files
author
WrenIX
committed
chore: replace if with with (and improve strip using with -)
Signed-off-by: WrenIX <dev@wrenix.eu>
1 parent 76825b4 commit 52f5312

File tree

9 files changed

+62
-63
lines changed

9 files changed

+62
-63
lines changed

‎charts/nextcloud/templates/ingress.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ metadata:
99
app.kubernetes.io/instance: {{ .Release.Name }}
1010
app.kubernetes.io/managed-by: {{ .Release.Service }}
1111
app.kubernetes.io/component: app
12-
{{- if .Values.ingress.labels }}
13-
{{ toYaml .Values.ingress.labels | indent 4 }}
12+
{{- with .Values.ingress.labels }}
13+
{{- toYaml . | indent 4 }}
1414
{{- end }}
15-
{{- if .Values.ingress.annotations }}
15+
{{- with .Values.ingress.annotations }}
1616
annotations:
17-
{{ toYaml .Values.ingress.annotations | indent 4 }}
17+
{{- toYaml . | indent 4 }}
1818
{{- end }}
1919
spec:
20-
{{- if .Values.ingress.className }}
21-
ingressClassName: {{ .Values.ingress.className }}
20+
{{- with .Values.ingress.className }}
21+
ingressClassName: {{ . }}
2222
{{- end }}
2323
rules:
2424
- host: {{ .Values.nextcloud.host }}
@@ -38,8 +38,8 @@ spec:
3838
serviceName: {{ template "nextcloud.fullname" . }}
3939
servicePort: {{ .Values.service.port }}
4040
{{- end }}
41-
{{- if .Values.ingress.tls }}
41+
{{- with .Values.ingress.tls }}
4242
tls:
43-
{{ toYaml .Values.ingress.tls | indent 4 }}
43+
{{- toYaml . | indent 4 }}
4444
{{- end }}
4545
{{- end }}

‎charts/nextcloud/templates/metrics/deployment.yaml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ spec:
2323
app.kubernetes.io/name: {{ include "nextcloud.name" . }}
2424
app.kubernetes.io/instance: {{ .Release.Name }}
2525
app.kubernetes.io/component: metrics
26-
{{- if .Values.metrics.podLabels }}
27-
{{ toYaml .Values.metrics.podLabels | indent 8 }}
28-
{{- end }}
26+
{{- with .Values.metrics.podLabels }}
27+
{{- toYaml . | nindent 8 }}
28+
{{- end }}
2929
spec:
30-
{{- if .Values.metrics.image.pullSecrets }}
30+
{{- with .Values.metrics.image.pullSecrets }}
3131
imagePullSecrets:
32-
{{- range .Values.metrics.image.pullSecrets }}
32+
{{- range . }}
3333
- name: {{ . }}
3434
{{- end}}
3535
{{- end }}
@@ -66,8 +66,9 @@ spec:
6666
ports:
6767
- name: metrics
6868
containerPort: 9205
69-
{{- if .Values.metrics.resources }}
70-
resources: {{- toYaml .Values.metrics.resources | nindent 10 }}
69+
{{- with .Values.metrics.resources }}
70+
resources:
71+
{{- toYaml . | nindent 10 }}
7172
{{- end }}
7273
securityContext:
7374
runAsUser: 1000

‎charts/nextcloud/templates/metrics/service.yaml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,20 @@ metadata:
99
app.kubernetes.io/instance: {{ .Release.Name }}
1010
app.kubernetes.io/managed-by: {{ .Release.Service }}
1111
app.kubernetes.io/component: metrics
12-
{{- if .Values.metrics.service.labels -}}
13-
{{ toYaml .Values.metrics.service.labels | nindent 4 }}
12+
{{- with .Values.metrics.service.labels }}
13+
{{- toYaml . | nindent 4 }}
1414
{{- end -}}
15-
{{- if .Values.metrics.service.annotations }}
16-
annotations: {{ toYaml .Values.metrics.service.annotations | nindent 4 }}
15+
{{- with .Values.metrics.service.annotations }}
16+
annotations:
17+
{{- toYaml . | nindent 4 }}
1718
{{- end }}
1819
spec:
1920
type: {{ .Values.metrics.service.type }}
20-
{{ if eq .Values.metrics.service.type "LoadBalancer" -}} {{ if .Values.metrics.service.loadBalancerIP }}
21-
loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }}
22-
{{ end -}}
23-
{{- end -}}
21+
{{- if eq .Values.metrics.service.type "LoadBalancer" }}
22+
{{- with .Values.metrics.service.loadBalancerIP }}
23+
loadBalancerIP: {{ . }}
24+
{{- end }}
25+
{{- end }}
2426
ports:
2527
- name: metrics
2628
port: 9205

‎charts/nextcloud/templates/metrics/servicemonitor.yaml‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@ apiVersion: monitoring.coreos.com/v1
33
kind: ServiceMonitor
44
metadata:
55
name: {{ template "nextcloud.fullname" . }}
6-
{{- if .Values.metrics.serviceMonitor.namespace }}
7-
namespace: {{ .Values.metrics.serviceMonitor.namespace | quote }}
8-
{{- else }}
9-
namespace: {{ .Release.Namespace | quote }}
10-
{{- end }}
6+
namespace: {{ .Values.metrics.serviceMonitor.namespace | default .Release.Namespace | quote }}
117
labels:
128
app.kubernetes.io/name: {{ include "nextcloud.name" . }}
139
helm.sh/chart: {{ include "nextcloud.chart" . }}
1410
app.kubernetes.io/instance: {{ .Release.Name }}
1511
app.kubernetes.io/managed-by: {{ .Release.Service }}
1612
app.kubernetes.io/component: metrics
17-
{{- if .Values.metrics.serviceMonitor.labels -}}
18-
{{ toYaml .Values.metrics.serviceMonitor.labels | nindent 4 }}
13+
{{- with .Values.metrics.serviceMonitor.labels }}
14+
{{- toYaml . | nindent 4 }}
1915
{{- end }}
2016
spec:
2117
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel | quote }}
@@ -30,10 +26,10 @@ spec:
3026
endpoints:
3127
- port: metrics
3228
path: "/"
33-
{{- if .Values.metrics.serviceMonitor.interval }}
34-
interval: {{ .Values.metrics.serviceMonitor.interval }}
29+
{{- with .Values.metrics.serviceMonitor.interval }}
30+
interval: {{ . }}
3531
{{- end }}
36-
{{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
37-
scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
32+
{{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
33+
scrapeTimeout: {{ . }}
3834
{{- end }}
3935
{{- end }}

‎charts/nextcloud/templates/nextcloud-data-pvc.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ metadata:
1010
app.kubernetes.io/instance: {{ .Release.Name }}
1111
app.kubernetes.io/managed-by: {{ .Release.Service }}
1212
app.kubernetes.io/component: app
13-
{{- if .Values.persistence.nextcloudData.annotations }}
13+
{{- with .Values.persistence.nextcloudData.annotations }}
1414
annotations:
15-
{{ toYaml .Values.persistence.nextcloudData.annotations | indent 4 }}
15+
{{- toYaml . | indent 4 }}
1616
{{- end }}
1717
spec:
1818
accessModes:
1919
- {{ .Values.persistence.nextcloudData.accessMode | quote }}
2020
resources:
2121
requests:
2222
storage: {{ .Values.persistence.nextcloudData.size | quote }}
23-
{{- if .Values.persistence.nextcloudData.storageClass }}
24-
{{- if (eq "-" .Values.persistence.nextcloudData.storageClass) }}
23+
{{- with .Values.persistence.nextcloudData.storageClass }}
24+
{{- if (eq "-" .) }}
2525
storageClassName: ""
2626
{{- else }}
27-
storageClassName: "{{ .Values.persistence.nextcloudData.storageClass }}"
27+
storageClassName: "{{ . }}"
2828
{{- end }}
2929
{{- end }}
30-
{{- end -}}
31-
{{- end -}}
30+
{{- end }}
31+
{{- end }}

‎charts/nextcloud/templates/nextcloud-pvc.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ metadata:
1010
app.kubernetes.io/instance: {{ .Release.Name }}
1111
app.kubernetes.io/managed-by: {{ .Release.Service }}
1212
app.kubernetes.io/component: app
13-
{{- if .Values.persistence.annotations }}
13+
{{- with .Values.persistence.annotations }}
1414
annotations:
15-
{{ toYaml .Values.persistence.annotations | indent 4 }}
15+
{{- toYaml . | indent 4 }}
1616
{{- end }}
1717
spec:
1818
accessModes:
1919
- {{ .Values.persistence.accessMode | quote }}
2020
resources:
2121
requests:
2222
storage: {{ .Values.persistence.size | quote }}
23-
{{- if .Values.persistence.storageClass }}
24-
{{- if (eq "-" .Values.persistence.storageClass) }}
23+
{{- with .Values.persistence.storageClass }}
24+
{{- if (eq "-" .) }}
2525
storageClassName: ""
2626
{{- else }}
27-
storageClassName: "{{ .Values.persistence.storageClass }}"
27+
storageClassName: "{{ . }}"
2828
{{- end }}
2929
{{- end }}
30-
{{- end -}}
31-
{{- end -}}
30+
{{- end }}
31+
{{- end }}

‎charts/nextcloud/templates/secrets.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ metadata:
1111
type: Opaque
1212
data:
1313
nextcloud-username: {{ .Values.nextcloud.username | b64enc | quote }}
14-
{{- if .Values.nextcloud.password }}
15-
nextcloud-password: {{ .Values.nextcloud.password | b64enc | quote }}
14+
{{- with .Values.nextcloud.password }}
15+
nextcloud-password: {{ . | b64enc | quote }}
1616
{{- else }}
1717
nextcloud-password: {{ randAlphaNum 10 | b64enc | quote }}
1818
{{- end }}
19-
{{- if .Values.metrics.token }}
20-
nextcloud-token: {{ .Values.metrics.token | b64enc | quote }}
19+
{{- with .Values.metrics.token }}
20+
nextcloud-token: {{ . | b64enc | quote }}
2121
{{- else }}
2222
nextcloud-token: {{ randAlphaNum 10 | b64enc | quote }}
2323
{{- end }}
2424
{{- if .Values.nextcloud.mail.enabled }}
25-
smtp-username: {{ default "" .Values.nextcloud.mail.smtp.name | b64enc | quote }}
26-
smtp-password: {{ default "" .Values.nextcloud.mail.smtp.password | b64enc | quote }}
27-
smtp-host: {{ default "" .Values.nextcloud.mail.smtp.host | b64enc | quote }}
25+
smtp-username: {{ .Values.nextcloud.mail.smtp.name | default "" | b64enc | quote }}
26+
smtp-password: {{ .Values.nextcloud.mail.smtp.password | default "" | b64enc | quote }}
27+
smtp-host: {{ .Values.nextcloud.mail.smtp.host | default "" | b64enc | quote }}
2828
{{- end }}
2929
{{- end }}

‎charts/nextcloud/templates/service.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ metadata:
1111
spec:
1212
type: {{ .Values.service.type }}
1313
{{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerIP }}
14-
loadBalancerIP: {{ default "" .Values.service.loadBalancerIP }}
14+
loadBalancerIP: {{ .Values.service.loadBalancerIP | default "" }}
1515
{{- end }}
16-
{{- if .Values.service.ipFamilies }}
16+
{{- with .Values.service.ipFamilies }}
1717
ipFamilies:
18-
{{- toYaml .Values.service.ipFamilies | nindent 4 }}
18+
{{- toYaml . | nindent 4 }}
1919
{{- end }}
20-
{{- if .Values.service.ipFamilyPolicy }}
21-
ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
20+
{{- with .Values.service.ipFamilyPolicy }}
21+
ipFamilyPolicy: {{ . }}
2222
{{- end }}
2323
ports:
2424
- port: {{ .Values.service.port }}
2525
targetPort: {{ .Values.nextcloud.containerPort }}
2626
protocol: TCP
2727
name: http
2828
{{- if eq .Values.service.type "NodePort" }}
29-
nodePort: {{ default "" .Values.service.nodePort}}
29+
nodePort: {{ .Values.service.nodePort | default "" }}
3030
{{- end }}
3131
selector:
3232
app.kubernetes.io/name: {{ include "nextcloud.name" . }}

‎charts/nextcloud/templates/serviceaccount.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
name: {{ .Values.rbac.serviceaccount.name }}
6-
{{- if .Values.rbac.serviceaccount.annotations }}
6+
{{- with .Values.rbac.serviceaccount.annotations }}
77
annotations:
8-
{{- toYaml .Values.rbac.serviceaccount.annotations | nindent 4 }}
8+
{{- toYaml . | nindent 4 }}
99
{{- end }}
1010
{{- end }}

0 commit comments

Comments
 (0)