Skip to content

Commit f13e1cd

Browse files
wrenixwrenix
committed
chore: replace if with with (and improve strip using with -)
Signed-off-by: WrenIX <[email protected]>
1 parent 9e51e9c commit f13e1cd

File tree

12 files changed

+71
-75
lines changed

12 files changed

+71
-75
lines changed

‎charts/nextcloud/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: nextcloud
3-
version: 4.5.17
3+
version: 4.5.18
44
appVersion: 28.0.2
55
description: A file sharing server that puts the control and security of your own data back into your hands.
66
keywords:

‎charts/nextcloud/templates/deployment.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ spec:
6363
postStart:
6464
exec:
6565
command:
66-
{{- toYaml . | nindent 18 -}}
66+
{{- toYaml . | nindent 18 }}
6767
{{- end }}
6868
{{- with .preStopCommand }}
6969
preStop:
7070
exec:
7171
command:
72-
{{- toYaml . | nindent 18 -}}
72+
{{- toYaml . | nindent 18 }}
7373
{{- end }}
7474
{{- end }}
7575
env:
@@ -245,13 +245,13 @@ spec:
245245
postStart:
246246
exec:
247247
command:
248-
{{- toYaml . | nindent 18 -}}
248+
{{- toYaml . | nindent 18 }}
249249
{{- end }}
250250
{{- with .preStopCommand }}
251251
preStop:
252252
exec:
253253
command:
254-
{{- toYaml . | nindent 18 -}}
254+
{{- toYaml . | nindent 18 }}
255255
{{- end }}
256256
{{- end }}
257257
env:

‎charts/nextcloud/templates/hpa.yaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.hpa.enabled -}}
1+
{{- if .Values.hpa.enabled }}
22
apiVersion: autoscaling/v1
33
kind: HorizontalPodAutoscaler
44
metadata:
@@ -14,7 +14,9 @@ spec:
1414
kind: Deployment
1515
apiVersion: apps/v1
1616
name: {{ template "nextcloud.fullname" . }}
17-
minReplicas: {{ .Values.hpa.minPods }}
18-
maxReplicas: {{ .Values.hpa.maxPods }}
19-
targetCPUUtilizationPercentage: {{ .Values.hpa.cputhreshold }}
20-
{{- end }}
17+
{{- with .Values.hpa }}
18+
minReplicas: {{ .minPods }}
19+
maxReplicas: {{ .maxPods }}
20+
targetCPUUtilizationPercentage: {{ .cputhreshold }}
21+
{{- end }}{{/* end-with .hpa */}}
22+
{{- end }}

‎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 . | nindent 4 }}
1414
{{- end }}
15-
{{- if .Values.ingress.annotations }}
15+
{{- with .Values.ingress.annotations }}
1616
annotations:
17-
{{ toYaml .Values.ingress.annotations | indent 4 }}
17+
{{- toYaml . | nindent 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 . | nindent 4 }}
4444
{{- end }}
4545
{{- end }}

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

Lines changed: 5 additions & 5 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 }}

‎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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{{- if and .Values.persistence.enabled .Values.persistence.nextcloudData.enabled -}}
2-
{{- if not .Values.persistence.nextcloudData.existingClaim -}}
1+
{{- if and .Values.persistence.enabled .Values.persistence.nextcloudData.enabled (not .Values.persistence.nextcloudData.existingClaim) }}
32
kind: PersistentVolumeClaim
43
apiVersion: v1
54
metadata:
@@ -10,22 +9,21 @@ metadata:
109
app.kubernetes.io/instance: {{ .Release.Name }}
1110
app.kubernetes.io/managed-by: {{ .Release.Service }}
1211
app.kubernetes.io/component: app
13-
{{- if .Values.persistence.nextcloudData.annotations }}
12+
{{- with .Values.persistence.nextcloudData.annotations }}
1413
annotations:
15-
{{ toYaml .Values.persistence.nextcloudData.annotations | indent 4 }}
14+
{{- toYaml . | nindent 4 }}
1615
{{- end }}
1716
spec:
1817
accessModes:
1918
- {{ .Values.persistence.nextcloudData.accessMode | quote }}
2019
resources:
2120
requests:
2221
storage: {{ .Values.persistence.nextcloudData.size | quote }}
23-
{{- if .Values.persistence.nextcloudData.storageClass }}
24-
{{- if (eq "-" .Values.persistence.nextcloudData.storageClass) }}
22+
{{- with .Values.persistence.nextcloudData.storageClass }}
23+
{{- if (eq "-" .) }}
2524
storageClassName: ""
2625
{{- else }}
27-
storageClassName: "{{ .Values.persistence.nextcloudData.storageClass }}"
26+
storageClassName: "{{ . }}"
2827
{{- end }}
2928
{{- end }}
30-
{{- end -}}
31-
{{- end -}}
29+
{{- end }}

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{{- if .Values.persistence.enabled -}}
2-
{{- if not .Values.persistence.existingClaim -}}
1+
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
32
kind: PersistentVolumeClaim
43
apiVersion: v1
54
metadata:
@@ -10,22 +9,21 @@ metadata:
109
app.kubernetes.io/instance: {{ .Release.Name }}
1110
app.kubernetes.io/managed-by: {{ .Release.Service }}
1211
app.kubernetes.io/component: app
13-
{{- if .Values.persistence.annotations }}
12+
{{- with .Values.persistence.annotations }}
1413
annotations:
15-
{{ toYaml .Values.persistence.annotations | indent 4 }}
14+
{{- toYaml . | nindent 4 }}
1615
{{- end }}
1716
spec:
1817
accessModes:
1918
- {{ .Values.persistence.accessMode | quote }}
2019
resources:
2120
requests:
2221
storage: {{ .Values.persistence.size | quote }}
23-
{{- if .Values.persistence.storageClass }}
24-
{{- if (eq "-" .Values.persistence.storageClass) }}
22+
{{- with .Values.persistence.storageClass }}
23+
{{- if (eq "-" .) }}
2524
storageClassName: ""
2625
{{- else }}
27-
storageClassName: "{{ .Values.persistence.storageClass }}"
26+
storageClassName: "{{ . }}"
2827
{{- end }}
2928
{{- end }}
30-
{{- end -}}
31-
{{- end -}}
29+
{{- 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 }}

0 commit comments

Comments
 (0)