Skip to content

Commit e1cea34

Browse files
provokateurinprovokateurin
authored
Merge pull request #517 from wrenix/chore/metrics-indent
2 parents ef41d75 + 76825b4 commit e1cea34

11 files changed

Lines changed: 105 additions & 105 deletions

File tree

‎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.14
3+
version: 4.5.15
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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ spec:
151151
path: /status.php
152152
port: {{ $.Values.nextcloud.containerPort }}
153153
httpHeaders:
154-
- name: Host
155-
value: {{ $.Values.nextcloud.host | quote }}
154+
- name: Host
155+
value: {{ $.Values.nextcloud.host | quote }}
156156
initialDelaySeconds: {{ .initialDelaySeconds }}
157157
periodSeconds: {{ .periodSeconds }}
158158
timeoutSeconds: {{ .timeoutSeconds }}
@@ -167,8 +167,8 @@ spec:
167167
path: /status.php
168168
port: {{ $.Values.nextcloud.containerPort }}
169169
httpHeaders:
170-
- name: Host
171-
value: {{ $.Values.nextcloud.host | quote }}
170+
- name: Host
171+
value: {{ $.Values.nextcloud.host | quote }}
172172
initialDelaySeconds: {{ .initialDelaySeconds }}
173173
periodSeconds: {{ .periodSeconds }}
174174
timeoutSeconds: {{ .timeoutSeconds }}
@@ -183,8 +183,8 @@ spec:
183183
path: /status.php
184184
port: {{ $.Values.nextcloud.containerPort }}
185185
httpHeaders:
186-
- name: Host
187-
value: {{ $.Values.nextcloud.host | quote }}
186+
- name: Host
187+
value: {{ $.Values.nextcloud.host | quote }}
188188
initialDelaySeconds: {{ .initialDelaySeconds }}
189189
periodSeconds: {{ .periodSeconds }}
190190
timeoutSeconds: {{ .timeoutSeconds }}
@@ -238,7 +238,7 @@ spec:
238238
image: {{ include "nextcloud.image" . }}
239239
imagePullPolicy: {{ .Values.image.pullPolicy }}
240240
command:
241-
- /cron.sh
241+
- /cron.sh
242242
{{- with .Values.cronjob.lifecycle }}
243243
lifecycle:
244244
{{- with .postStartCommand }}

‎charts/nextcloud/templates/ingress.yaml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@ 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 }}
12+
{{- if .Values.ingress.labels }}
1313
{{ toYaml .Values.ingress.labels | indent 4 }}
14-
{{- end }}
15-
{{- if .Values.ingress.annotations }}
14+
{{- end }}
15+
{{- if .Values.ingress.annotations }}
1616
annotations:
1717
{{ toYaml .Values.ingress.annotations | indent 4 }}
18-
{{- end }}
18+
{{- end }}
1919
spec:
2020
{{- if .Values.ingress.className }}
2121
ingressClassName: {{ .Values.ingress.className }}
2222
{{- end }}
2323
rules:
24-
- host: {{ .Values.nextcloud.host }}
25-
http:
26-
paths:
27-
- path: {{ .Values.ingress.path }}
28-
{{- if eq (include "nextcloud.ingress.apiVersion" $) "networking.k8s.io/v1" }}
29-
pathType: {{ .Values.ingress.pathType }}
30-
{{- end }}
31-
backend:
32-
{{- if eq (include "nextcloud.ingress.apiVersion" $) "networking.k8s.io/v1" }}
33-
service:
34-
name: {{ template "nextcloud.fullname" . }}
35-
port:
36-
number: {{ .Values.service.port }}
37-
{{- else }}
38-
serviceName: {{ template "nextcloud.fullname" . }}
39-
servicePort: {{ .Values.service.port }}
40-
{{- end }}
41-
{{- if .Values.ingress.tls }}
24+
- host: {{ .Values.nextcloud.host }}
25+
http:
26+
paths:
27+
- path: {{ .Values.ingress.path }}
28+
{{- if eq (include "nextcloud.ingress.apiVersion" $) "networking.k8s.io/v1" }}
29+
pathType: {{ .Values.ingress.pathType }}
30+
{{- end }}
31+
backend:
32+
{{- if eq (include "nextcloud.ingress.apiVersion" $) "networking.k8s.io/v1" }}
33+
service:
34+
name: {{ template "nextcloud.fullname" . }}
35+
port:
36+
number: {{ .Values.service.port }}
37+
{{- else }}
38+
serviceName: {{ template "nextcloud.fullname" . }}
39+
servicePort: {{ .Values.service.port }}
40+
{{- end }}
41+
{{- if .Values.ingress.tls }}
4242
tls:
4343
{{ toYaml .Values.ingress.tls | indent 4 }}
44-
{{- end -}}
44+
{{- end }}
4545
{{- end }}

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,43 +29,43 @@ spec:
2929
spec:
3030
{{- if .Values.metrics.image.pullSecrets }}
3131
imagePullSecrets:
32-
{{- range .Values.metrics.image.pullSecrets }}
32+
{{- range .Values.metrics.image.pullSecrets }}
3333
- name: {{ . }}
34-
{{- end}}
34+
{{- end}}
3535
{{- end }}
3636
containers:
37-
- name: metrics-exporter
38-
image: "{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}"
39-
imagePullPolicy: {{ .Values.metrics.image.pullPolicy }}
40-
env:
41-
{{- if .Values.metrics.token }}
42-
- name: NEXTCLOUD_AUTH_TOKEN
43-
valueFrom:
44-
secretKeyRef:
45-
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
46-
key: {{ .Values.nextcloud.existingSecret.tokenKey }}
47-
{{- else }}
48-
- name: NEXTCLOUD_USERNAME
49-
valueFrom:
50-
secretKeyRef:
51-
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
52-
key: {{ .Values.nextcloud.existingSecret.usernameKey }}
53-
- name: NEXTCLOUD_PASSWORD
54-
valueFrom:
55-
secretKeyRef:
56-
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
57-
key: {{ .Values.nextcloud.existingSecret.passwordKey }}
58-
{{- end }}
59-
# NEXTCLOUD_SERVER is used by metrics-exporter to reach the Nextcloud (K8s-)Service to grab the serverinfo api endpoint
60-
- name: NEXTCLOUD_SERVER # deployment.namespace.svc.cluster.local
61-
value: "http{{ if .Values.metrics.https }}s{{ end }}://{{ template "nextcloud.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }}"
62-
- name: NEXTCLOUD_TIMEOUT
63-
value: {{ .Values.metrics.timeout }}
64-
- name: NEXTCLOUD_TLS_SKIP_VERIFY
65-
value: {{ .Values.metrics.tlsSkipVerify | quote }}
37+
- name: metrics-exporter
38+
image: "{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}"
39+
imagePullPolicy: {{ .Values.metrics.image.pullPolicy }}
40+
env:
41+
{{- if .Values.metrics.token }}
42+
- name: NEXTCLOUD_AUTH_TOKEN
43+
valueFrom:
44+
secretKeyRef:
45+
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
46+
key: {{ .Values.nextcloud.existingSecret.tokenKey }}
47+
{{- else }}
48+
- name: NEXTCLOUD_USERNAME
49+
valueFrom:
50+
secretKeyRef:
51+
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
52+
key: {{ .Values.nextcloud.existingSecret.usernameKey }}
53+
- name: NEXTCLOUD_PASSWORD
54+
valueFrom:
55+
secretKeyRef:
56+
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
57+
key: {{ .Values.nextcloud.existingSecret.passwordKey }}
58+
{{- end }}
59+
# NEXTCLOUD_SERVER is used by metrics-exporter to reach the Nextcloud (K8s-)Service to grab the serverinfo api endpoint
60+
- name: NEXTCLOUD_SERVER # deployment.namespace.svc.cluster.local
61+
value: "http{{ if .Values.metrics.https }}s{{ end }}://{{ template "nextcloud.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }}"
62+
- name: NEXTCLOUD_TIMEOUT
63+
value: {{ .Values.metrics.timeout }}
64+
- name: NEXTCLOUD_TLS_SKIP_VERIFY
65+
value: {{ .Values.metrics.tlsSkipVerify | quote }}
6666
ports:
67-
- name: metrics
68-
containerPort: 9205
67+
- name: metrics
68+
containerPort: 9205
6969
{{- if .Values.metrics.resources }}
7070
resources: {{- toYaml .Values.metrics.resources | nindent 10 }}
7171
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ spec:
2222
{{ end -}}
2323
{{- end -}}
2424
ports:
25-
- name: metrics
26-
port: 9205
27-
targetPort: metrics
25+
- name: metrics
26+
port: 9205
27+
targetPort: metrics
2828
selector:
2929
app.kubernetes.io/name: {{ include "nextcloud.name" . }}
3030
app.kubernetes.io/instance: {{ .Release.Name }}

‎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+
{{- if .Values.persistence.nextcloudData.annotations }}
1414
annotations:
1515
{{ toYaml .Values.persistence.nextcloudData.annotations | indent 4 }}
16-
{{- end }}
16+
{{- 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+
{{- if .Values.persistence.nextcloudData.storageClass }}
24+
{{- if (eq "-" .Values.persistence.nextcloudData.storageClass) }}
2525
storageClassName: ""
26-
{{- else }}
26+
{{- else }}
2727
storageClassName: "{{ .Values.persistence.nextcloudData.storageClass }}"
28-
{{- end }}
29-
{{- end }}
28+
{{- end }}
29+
{{- end }}
3030
{{- end -}}
3131
{{- 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+
{{- if .Values.persistence.annotations }}
1414
annotations:
1515
{{ toYaml .Values.persistence.annotations | indent 4 }}
16-
{{- end }}
16+
{{- 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+
{{- if .Values.persistence.storageClass }}
24+
{{- if (eq "-" .Values.persistence.storageClass) }}
2525
storageClassName: ""
26-
{{- else }}
26+
{{- else }}
2727
storageClassName: "{{ .Values.persistence.storageClass }}"
28-
{{- end }}
29-
{{- end }}
28+
{{- end }}
29+
{{- end }}
3030
{{- end -}}
3131
{{- end -}}

‎charts/nextcloud/templates/nginx-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@ metadata:
144144
app.kubernetes.io/instance: {{ .Release.Name }}
145145
app.kubernetes.io/managed-by: {{ .Release.Service }}
146146
data:
147-
{{- if .Values.nginx.config.default }}
147+
{{- if .Values.nginx.config.default }}
148148
default.conf: |-
149149
{{- template "default.conf" $ }}
150-
{{- end }}
151-
{{- if .Values.nginx.config.custom }}
150+
{{- end }}
151+
{{- if .Values.nginx.config.custom }}
152152
zz-custom.conf: |-
153153
{{ .Values.nginx.config.custom | indent 4 }}
154-
{{- end }}
154+
{{- end }}
155155
{{- end }}

‎charts/nextcloud/templates/php-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ metadata:
99
app.kubernetes.io/instance: {{ .Release.Name }}
1010
app.kubernetes.io/managed-by: {{ .Release.Service }}
1111
data:
12-
{{- range $key, $value := .Values.nextcloud.phpConfigs }}
12+
{{- range $key, $value := .Values.nextcloud.phpConfigs }}
1313
{{ $key }}: |-
1414
{{ $value | indent 4 }}
15-
{{- end }}
15+
{{- end }}
1616
{{- end }}

‎charts/nextcloud/templates/rbac.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ metadata:
55
name: {{ template "nextcloud.fullname" . }}-privileged
66
namespace: {{ .Release.Namespace }}
77
rules:
8-
- apiGroups:
9-
- extensions
10-
resourceNames:
11-
- privileged
12-
resources:
13-
- podsecuritypolicies
14-
verbs:
15-
- use
8+
- apiGroups:
9+
- extensions
10+
resourceNames:
11+
- privileged
12+
resources:
13+
- podsecuritypolicies
14+
verbs:
15+
- use
1616
---
1717
apiVersion: rbac.authorization.k8s.io/v1
1818
kind: RoleBinding
@@ -24,7 +24,7 @@ roleRef:
2424
kind: Role
2525
name: {{ template "nextcloud.fullname" . }}-privileged
2626
subjects:
27-
- kind: ServiceAccount
28-
name: {{ .Values.rbac.serviceaccount.name }}
29-
namespace: {{ .Release.Namespace }}
27+
- kind: ServiceAccount
28+
name: {{ .Values.rbac.serviceaccount.name }}
29+
namespace: {{ .Release.Namespace }}
3030
{{- end }}

0 commit comments

Comments
 (0)