Skip to content

Commit 50ec5e1

Browse files
committed
chore: correct linting errors
ref: #5
1 parent 80c0172 commit 50ec5e1

File tree

9 files changed

+89
-95
lines changed

9 files changed

+89
-95
lines changed

.yamllint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
ignore:
77
- '.github/'
88
- '**/crd/**'
9+
- mkdocs.yml
910
- '*PrometheusRule*'
1011
- '**/source/**'
1112

manifests/alert-manager/base/AlertManager-cluster.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ metadata:
77
name: cluster
88
spec:
99
externalUrl: alert-manager.local
10-
# image: "{{ .Values.nfc_monitoring.alert_manager.image.name }}:{{ .Values.nfc_monitoring.alert_manager.image.tag }}"
1110
nodeSelector:
1211
kubernetes.io/os: linux
1312
podMetadata:

manifests/gitlab-operator/base/kustomization.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,24 @@ images:
3232
newName: |-
3333
registry.gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator/gitlab-runner-operator
3434
newTag: "v1.37.0"
35-
# config/manager/kustomization.tpl.yaml
35+
# config/manager/kustomization.tpl.yaml
3636
- name: kube-rbac-proxy
3737
newName: |-
3838
registry.gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator/openshift4/ose-kube-rbac-proxy
3939
newTag: "v4.15.0"
4040

4141
# v1.37.0 160ee6bf2ad4e05d0e673d0652cc47bd6100ddec
4242
resources:
43-
# Dont use default as it points to invalid kustomize dirs
44-
# - https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator//config/default?ref=e8254fb99328edd9e78f6646e8abc2f7a42fdd96
43+
# Dont use default as it points to invalid kustomize dirs
44+
# - /config/default?ref=e8254fb99328edd9e78f6646e8abc2f7a42fdd96
4545

46-
# config/default/kustomization.yaml
46+
# config/default/kustomization.yaml
4747
- https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator//config/crd?ref=160ee6bf2ad4e05d0e673d0652cc47bd6100ddec
4848

49-
# config/default/kustomization.yaml
49+
# config/default/kustomization.yaml
5050
- https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator//config/rbac?ref=160ee6bf2ad4e05d0e673d0652cc47bd6100ddec
5151

52-
# config/manager/kustomization.tpl.yaml
53-
# - https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator//config/manager/manager.yaml?ref=e8254fb99328edd9e78f6646e8abc2f7a42fdd96
52+
# config/manager/kustomization.tpl.yaml
5453
- https://gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator/-/raw/160ee6bf2ad4e05d0e673d0652cc47bd6100ddec/config/manager/manager.yaml
5554

5655

manifests/gitlab-operator/components/runner/ConfigMap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ data:
3636
host_path = "/opt/webserver/nofusscomputing.com"
3737
3838
[runners.kubernetes.node_tolerations]
39-
"CriticalAddonsOnly=true" = "NoExecute"
39+
"CriticalAddonsOnly=true" = "NoExecute"

manifests/grafana-agent/base/ConfigMap-GrafanaAgent.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ data:
2020
procfs_path: /host/proc
2121
udev_data_path: /host/root/run/udev/data
2222
23-
# collector.filesystem.ignored-mount-points: ^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+|/run/containerd/io.containerd.+)($|/)
2423
filesystem_mount_points_exclude: "^/(dev|proc|sys|var/lib/docker/.+|/run/containerd/io.containerd.+)($|/)"
25-
#filesystem_fs_types_exclude: "^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|shm|squashfs|sysfs|tracefs)$"
2624
filesystem_fs_types_exclude: "^(autofs|binfmt_misc|bpf|cgroup2?|configfs|ugfs|devpts|devtmpfs|tmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|ocfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$"
2725
2826

manifests/grafana-agent/components/metrics/ServiceMonitor-Node.yaml

Lines changed: 56 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -10,68 +10,66 @@ metadata:
1010
name: node
1111
spec:
1212
endpoints:
13+
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
14+
interval: 5s
15+
honorLabels: true
16+
path: /metrics
17+
port: grafana-metrics
18+
scheme: http
19+
relabelings:
20+
- action: replace
21+
regex: (.*)
22+
replacement: $1
23+
sourceLabels:
24+
- __meta_kubernetes_pod_node_name
25+
targetLabel: instance
26+
- targetLabel: "job"
27+
replacement: "node-exporter"
28+
- action: replace
29+
regex: (.*)
30+
replacement: $1
31+
sourceLabels:
32+
- __meta_kubernetes_pod_node_name
33+
targetLabel: node
34+
metricRelabelings:
35+
- action: drop
36+
sourceLabels: [ __name__ ]
37+
regex: "(promtail_).*"
1338

14-
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
15-
interval: 5s
16-
honorLabels: true
17-
path: /metrics
18-
port: grafana-metrics
19-
scheme: http
20-
relabelings:
21-
- action: replace
22-
regex: (.*)
23-
replacement: $1
24-
sourceLabels:
25-
- __meta_kubernetes_pod_node_name
26-
targetLabel: instance
27-
- targetLabel: "job"
28-
replacement: "node-exporter"
29-
- action: replace
30-
regex: (.*)
31-
replacement: $1
32-
sourceLabels:
33-
- __meta_kubernetes_pod_node_name
34-
targetLabel: node
35-
metricRelabelings:
36-
- action: drop
37-
sourceLabels: [__name__]
38-
regex: '(promtail_).*'
39-
40-
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
41-
interval: 5s
42-
honorLabels: true
43-
path: /metrics
44-
port: grafana-metrics
45-
scheme: http
46-
relabelings:
47-
- action: replace
48-
regex: (.*)
49-
replacement: $1
50-
sourceLabels:
51-
- __meta_kubernetes_pod_node_name
52-
targetLabel: instance
53-
- targetLabel: "job"
54-
replacement: "promtail"
55-
- action: replace
56-
regex: (.*)
57-
replacement: $1
58-
sourceLabels:
59-
- __meta_kubernetes_pod_node_name
60-
targetLabel: node
61-
- action: replace
62-
separator: /
63-
sourceLabels:
64-
- namespace
65-
- job
66-
targetLabel: job
67-
metricRelabelings:
68-
- action: keep
69-
sourceLabels: [__name__]
70-
regex: '(promtail_).*'
39+
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
40+
interval: 5s
41+
honorLabels: true
42+
path: /metrics
43+
port: grafana-metrics
44+
scheme: http
45+
relabelings:
46+
- action: replace
47+
regex: (.*)
48+
replacement: $1
49+
sourceLabels:
50+
- __meta_kubernetes_pod_node_name
51+
targetLabel: instance
52+
- targetLabel: "job"
53+
replacement: "promtail"
54+
- action: replace
55+
regex: (.*)
56+
replacement: $1
57+
sourceLabels:
58+
- __meta_kubernetes_pod_node_name
59+
targetLabel: node
60+
- action: replace
61+
separator: /
62+
sourceLabels:
63+
- namespace
64+
- job
65+
targetLabel: job
66+
metricRelabelings:
67+
- action: keep
68+
sourceLabels: [ __name__ ]
69+
regex: "(promtail_).*"
7170
selector:
7271
matchLabels:
7372
app.kubernetes.io/component: exporter
7473
app.kubernetes.io/instance: cluster
7574
app.kubernetes.io/name: grafana-agent
7675
app.kubernetes.io/part-of: monitoring
77-

manifests/grafana-agent/components/metrics/ServiceMonitor-node-exporter.yaml

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,32 @@ metadata:
1111
namespace: monitoring
1212
spec:
1313
endpoints:
14-
15-
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
16-
interval: 5s
17-
honorLabels: true
18-
path: /integrations/node_exporter/metrics
19-
port: grafana-metrics
20-
scheme: http
21-
relabelings:
22-
- action: replace
23-
regex: (.*)
24-
replacement: $1
25-
sourceLabels:
26-
- __meta_kubernetes_pod_node_name
27-
targetLabel: instance
28-
- targetLabel: "job"
29-
replacement: "node-exporter"
30-
- action: replace
31-
regex: (.*)
32-
replacement: $1
33-
sourceLabels:
34-
- __meta_kubernetes_pod_node_name
35-
targetLabel: node
36-
tlsConfig:
37-
insecureSkipVerify: true
14+
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
15+
interval: 5s
16+
honorLabels: true
17+
path: /integrations/node_exporter/metrics
18+
port: grafana-metrics
19+
scheme: http
20+
relabelings:
21+
- action: replace
22+
regex: (.*)
23+
replacement: $1
24+
sourceLabels:
25+
- __meta_kubernetes_pod_node_name
26+
targetLabel: instance
27+
- targetLabel: "job"
28+
replacement: "node-exporter"
29+
- action: replace
30+
regex: (.*)
31+
replacement: $1
32+
sourceLabels:
33+
- __meta_kubernetes_pod_node_name
34+
targetLabel: node
35+
tlsConfig:
36+
insecureSkipVerify: true
3837
selector:
3938
matchLabels:
4039
app.kubernetes.io/component: exporter
4140
app.kubernetes.io/instance: cluster
4241
app.kubernetes.io/name: grafana-agent
4342
app.kubernetes.io/part-of: monitoring
44-

manifests/prometheus/base/Prometheus.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ spec:
1515
enableFeatures: []
1616
enableRemoteWriteReceiver: false
1717
externalLabels: {}
18-
# image: {{ .Values.nfc_monitoring.prometheus.image.name }}:{{ .Values.nfc_monitoring.prometheus.image.tag}}
1918
nodeSelector:
2019
kubernetes.io/os: linux
2120
podMetadata:

mkdocs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
---
2+
13
INHERIT: website-template/mkdocs.yml
24

35
docs_dir: "docs"

0 commit comments

Comments
 (0)