Skip to content

Commit 74d41c1

Browse files
wrenixWrenIX
wrenix
authored and
WrenIX
committed
fix: cleanup and liniting metrics components
Signed-off-by: WrenIX <dev.github@wrenix.eu>
1 parent 99d643d commit 74d41c1

4 files changed

Lines changed: 99 additions & 94 deletions

File tree

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

Lines changed: 0 additions & 75 deletions
This file was deleted.

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
{{- if .Values.metrics.enabled }}
2+
---
3+
apiVersion: apps/v1
4+
kind: Deployment
5+
metadata:
6+
name: {{ template "nextcloud.fullname" . }}-metrics
7+
labels:
8+
app.kubernetes.io/name: {{ include "nextcloud.name" . }}
9+
helm.sh/chart: {{ include "nextcloud.chart" . }}
10+
app.kubernetes.io/instance: {{ .Release.Name }}
11+
app.kubernetes.io/managed-by: {{ .Release.Service }}
12+
app.kubernetes.io/component: metrics
13+
spec:
14+
replicas: {{ .Values.metrics.replicaCount }}
15+
selector:
16+
matchLabels:
17+
app.kubernetes.io/name: {{ include "nextcloud.name" . }}
18+
app.kubernetes.io/instance: {{ .Release.Name }}
19+
app.kubernetes.io/component: metrics
20+
template:
21+
metadata:
22+
annotations:
23+
{{- toYaml .Values.metrics.podAnnotations | nindent 8 }}
24+
labels:
25+
app.kubernetes.io/name: {{ include "nextcloud.name" . }}
26+
app.kubernetes.io/instance: {{ .Release.Name }}
27+
app.kubernetes.io/component: metrics
28+
{{- with .Values.metrics.podLabels }}
29+
{{- toYaml . | nindent 8 }}
30+
{{- end }}
31+
spec:
32+
{{- with .Values.metrics.image.pullSecrets }}
33+
imagePullSecrets:
34+
{{- range . }}
35+
- name: {{ . }}
36+
{{- end}}
37+
{{- end }}
38+
containers:
39+
- name: metrics-exporter
40+
image: "{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}"
41+
imagePullPolicy: {{ .Values.metrics.image.pullPolicy }}
42+
env:
43+
{{- if .Values.metrics.token }}
44+
- name: NEXTCLOUD_AUTH_TOKEN
45+
valueFrom:
46+
secretKeyRef:
47+
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
48+
key: {{ .Values.nextcloud.existingSecret.tokenKey }}
49+
{{- else }}
50+
- name: NEXTCLOUD_USERNAME
51+
valueFrom:
52+
secretKeyRef:
53+
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
54+
key: {{ .Values.nextcloud.existingSecret.usernameKey }}
55+
- name: NEXTCLOUD_PASSWORD
56+
valueFrom:
57+
secretKeyRef:
58+
name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
59+
key: {{ .Values.nextcloud.existingSecret.passwordKey }}
60+
{{- end }}
61+
- name: NEXTCLOUD_SERVER
62+
# NEXTCLOUD_SERVER is used by metrics-exporter to reach the Nextcloud (K8s-)Service to grab the serverinfo api endpoint
63+
value: http{{ if .Values.metrics.https }}s{{ end }}://{{ template "nextcloud.fullname" . }}:{{ .Values.service.port }}
64+
- name: NEXTCLOUD_TIMEOUT
65+
value: {{ .Values.metrics.timeout }}
66+
- name: NEXTCLOUD_TLS_SKIP_VERIFY
67+
value: {{ .Values.metrics.tlsSkipVerify | quote }}
68+
ports:
69+
- name: metrics
70+
containerPort: 9205
71+
{{- with .Values.metrics.resources }}
72+
resources:
73+
{{- toYaml . | nindent 10 }}
74+
{{- end }}
75+
securityContext:
76+
runAsUser: 1000
77+
runAsNonRoot: true
78+
{{- end }}

charts/nextcloud/templates/metrics-service.yaml renamed to charts/nextcloud/templates/metrics/service.yaml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{{- if .Values.metrics.enabled }}
2+
---
23
apiVersion: v1
34
kind: Service
45
metadata:
@@ -9,22 +10,22 @@ metadata:
910
app.kubernetes.io/instance: {{ .Release.Name }}
1011
app.kubernetes.io/managed-by: {{ .Release.Service }}
1112
app.kubernetes.io/component: metrics
12-
{{- if .Values.metrics.service.labels -}}
13-
{{ toYaml .Values.metrics.service.labels | nindent 4 }}
14-
{{- end -}}
15-
{{- if .Values.metrics.service.annotations }}
16-
annotations: {{ toYaml .Values.metrics.service.annotations | nindent 4 }}
13+
{{- with .Values.metrics.service.labels }}
14+
{{- toYaml . | nindent 4 }}
15+
{{- end }}
16+
{{- with .Values.metrics.service.annotations }}
17+
annotations:
18+
{{- toYaml . | nindent 4 }}
1719
{{- end }}
1820
spec:
1921
type: {{ .Values.metrics.service.type }}
20-
{{ if eq .Values.metrics.service.type "LoadBalancer" -}} {{ if .Values.metrics.service.loadBalancerIP }}
22+
{{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerIP }}
2123
loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }}
22-
{{ end -}}
23-
{{- end -}}
24+
{{- end }}
2425
ports:
25-
- name: metrics
26-
port: 9205
27-
targetPort: metrics
26+
- name: metrics
27+
port: 9205
28+
targetPort: metrics
2829
selector:
2930
app.kubernetes.io/name: {{ include "nextcloud.name" . }}
3031
app.kubernetes.io/instance: {{ .Release.Name }}

charts/nextcloud/templates/metrics-servicemonitor.yaml renamed to charts/nextcloud/templates/metrics/servicemonitor.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
2+
---
23
apiVersion: monitoring.coreos.com/v1
34
kind: ServiceMonitor
45
metadata:
56
name: {{ template "nextcloud.fullname" . }}
6-
{{- if .Values.metrics.serviceMonitor.namespace }}
7-
namespace: {{ .Values.metrics.serviceMonitor.namespace | quote }}
7+
{{- with .Values.metrics.serviceMonitor.namespace }}
8+
namespace: {{ . | quote }}
89
{{- else }}
910
namespace: {{ .Release.Namespace | quote }}
1011
{{- end }}
@@ -14,8 +15,8 @@ metadata:
1415
app.kubernetes.io/instance: {{ .Release.Name }}
1516
app.kubernetes.io/managed-by: {{ .Release.Service }}
1617
app.kubernetes.io/component: metrics
17-
{{- if .Values.metrics.serviceMonitor.labels -}}
18-
{{ toYaml .Values.metrics.serviceMonitor.labels | nindent 4 }}
18+
{{- with .Values.metrics.serviceMonitor.labels }}
19+
{{- toYaml . | nindent 4 }}
1920
{{- end }}
2021
spec:
2122
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel | quote }}
@@ -30,10 +31,10 @@ spec:
3031
endpoints:
3132
- port: metrics
3233
path: "/"
33-
{{- if .Values.metrics.serviceMonitor.interval }}
34-
interval: {{ .Values.metrics.serviceMonitor.interval }}
34+
{{- with .Values.metrics.serviceMonitor.interval }}
35+
interval: {{ . }}
3536
{{- end }}
36-
{{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
37-
scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
37+
{{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
38+
scrapeTimeout: {{ . }}
3839
{{- end }}
3940
{{- end }}

0 commit comments

Comments
 (0)