chore: correct linting errors

ref: #5
2025-08-02 04:22:42 +00:00 · 2025-06-13 18:37:06 +09:30
parent 80c017297d
commit 50ec5e1fe8
9 changed files with 89 additions and 95 deletions
--- a/.yamllint
+++ b/.yamllint
@ -6,6 +6,7 @@
 ignore:
  - '.github/'
  - '**/crd/**'
+  - mkdocs.yml
  - '*PrometheusRule*'
  - '**/source/**'

--- a/manifests/alert-manager/base/AlertManager-cluster.yaml
+++ b/manifests/alert-manager/base/AlertManager-cluster.yaml
@ -7,7 +7,6 @@ metadata:
  name: cluster
 spec:
  externalUrl: alert-manager.local
-  # image: "{{ .Values.nfc_monitoring.alert_manager.image.name }}:{{ .Values.nfc_monitoring.alert_manager.image.tag }}"
  nodeSelector:
    kubernetes.io/os: linux
  podMetadata:
--- a/manifests/gitlab-operator/base/kustomization.yaml
+++ b/manifests/gitlab-operator/base/kustomization.yaml
@ -32,7 +32,7 @@ images:
    newName: |-
      registry.gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator/gitlab-runner-operator
    newTag: "v1.37.0"
-    # config/manager/kustomization.tpl.yaml
+  # config/manager/kustomization.tpl.yaml
  - name: kube-rbac-proxy
    newName: |-
      registry.gitlab.com/gitlab-org/gl-openshift/gitlab-runner-operator/openshift4/ose-kube-rbac-proxy
@ -40,17 +40,16 @@ images:

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

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

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

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


--- a/manifests/grafana-agent/base/ConfigMap-GrafanaAgent.yaml
+++ b/manifests/grafana-agent/base/ConfigMap-GrafanaAgent.yaml
@ -20,9 +20,7 @@ data:
        procfs_path: /host/proc
        udev_data_path: /host/root/run/udev/data

-        # collector.filesystem.ignored-mount-points: ^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+|/run/containerd/io.containerd.+)($|/)
        filesystem_mount_points_exclude: "^/(dev|proc|sys|var/lib/docker/.+|/run/containerd/io.containerd.+)($|/)"
-        #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)$"
        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)$"


--- a/manifests/grafana-agent/components/metrics/ServiceMonitor-Node.yaml
+++ b/manifests/grafana-agent/components/metrics/ServiceMonitor-Node.yaml
@ -10,68 +10,66 @@ metadata:
  name: node
 spec:
  endpoints:
+    - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
+      interval: 5s
+      honorLabels: true
+      path: /metrics
+      port: grafana-metrics
+      scheme: http
+      relabelings:
+        - action: replace
+          regex: (.*)
+          replacement: $1
+          sourceLabels:
+            - __meta_kubernetes_pod_node_name
+          targetLabel: instance
+        - targetLabel: "job"
+          replacement: "node-exporter"
+        - action: replace
+          regex: (.*)
+          replacement: $1
+          sourceLabels:
+            - __meta_kubernetes_pod_node_name
+          targetLabel: node
+      metricRelabelings:
+        - action: drop
+          sourceLabels: [ __name__ ]
+          regex: "(promtail_).*"

-  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-    interval: 5s
-    honorLabels: true
-    path: /metrics
-    port: grafana-metrics
-    scheme: http
-    relabelings:
-    - action: replace
-      regex: (.*)
-      replacement: $1
-      sourceLabels:
-      - __meta_kubernetes_pod_node_name
-      targetLabel: instance
-    - targetLabel: "job"
-      replacement: "node-exporter"
-    - action: replace
-      regex: (.*)
-      replacement: $1
-      sourceLabels:
-      - __meta_kubernetes_pod_node_name
-      targetLabel: node
-    metricRelabelings:
-      - action: drop
-        sourceLabels: [__name__]
-        regex: '(promtail_).*'
-
-  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-    interval: 5s
-    honorLabels: true
-    path: /metrics
-    port: grafana-metrics
-    scheme: http
-    relabelings:
-    - action: replace
-      regex: (.*)
-      replacement: $1
-      sourceLabels:
-      - __meta_kubernetes_pod_node_name
-      targetLabel: instance
-    - targetLabel: "job"
-      replacement: "promtail"
-    - action: replace
-      regex: (.*)
-      replacement: $1
-      sourceLabels:
-      - __meta_kubernetes_pod_node_name
-      targetLabel: node
-    - action: replace
-      separator: /
-      sourceLabels:
-      - namespace
-      - job
-      targetLabel: job
-    metricRelabelings:
-      - action: keep
-        sourceLabels: [__name__]
-        regex: '(promtail_).*'
+    - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
+      interval: 5s
+      honorLabels: true
+      path: /metrics
+      port: grafana-metrics
+      scheme: http
+      relabelings:
+        - action: replace
+          regex: (.*)
+          replacement: $1
+          sourceLabels:
+            - __meta_kubernetes_pod_node_name
+          targetLabel: instance
+        - targetLabel: "job"
+          replacement: "promtail"
+        - action: replace
+          regex: (.*)
+          replacement: $1
+          sourceLabels:
+            - __meta_kubernetes_pod_node_name
+          targetLabel: node
+        - action: replace
+          separator: /
+          sourceLabels:
+            - namespace
+            - job
+          targetLabel: job
+      metricRelabelings:
+        - action: keep
+          sourceLabels: [ __name__ ]
+          regex: "(promtail_).*"
  selector:
    matchLabels:
      app.kubernetes.io/component: exporter
      app.kubernetes.io/instance: cluster
      app.kubernetes.io/name: grafana-agent
      app.kubernetes.io/part-of: monitoring
-
--- a/manifests/grafana-agent/components/metrics/ServiceMonitor-node-exporter.yaml
+++ b/manifests/grafana-agent/components/metrics/ServiceMonitor-node-exporter.yaml
@ -11,34 +11,32 @@ metadata:
  namespace: monitoring
 spec:
  endpoints:
-
-  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-    interval: 5s
-    honorLabels: true
-    path: /integrations/node_exporter/metrics
-    port: grafana-metrics
-    scheme: http
-    relabelings:
-    - action: replace
-      regex: (.*)
-      replacement: $1
-      sourceLabels:
-      - __meta_kubernetes_pod_node_name
-      targetLabel: instance
-    - targetLabel: "job"
-      replacement: "node-exporter"
-    - action: replace
-      regex: (.*)
-      replacement: $1
-      sourceLabels:
-      - __meta_kubernetes_pod_node_name
-      targetLabel: node
-    tlsConfig:
-      insecureSkipVerify: true
+    - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
+      interval: 5s
+      honorLabels: true
+      path: /integrations/node_exporter/metrics
+      port: grafana-metrics
+      scheme: http
+      relabelings:
+        - action: replace
+          regex: (.*)
+          replacement: $1
+          sourceLabels:
+            - __meta_kubernetes_pod_node_name
+          targetLabel: instance
+        - targetLabel: "job"
+          replacement: "node-exporter"
+        - action: replace
+          regex: (.*)
+          replacement: $1
+          sourceLabels:
+            - __meta_kubernetes_pod_node_name
+          targetLabel: node
+      tlsConfig:
+        insecureSkipVerify: true
  selector:
    matchLabels:
      app.kubernetes.io/component: exporter
      app.kubernetes.io/instance: cluster
      app.kubernetes.io/name: grafana-agent
      app.kubernetes.io/part-of: monitoring
-
--- a/manifests/prometheus/base/Prometheus.yaml
+++ b/manifests/prometheus/base/Prometheus.yaml
@ -15,7 +15,6 @@ spec:
  enableFeatures: []
  enableRemoteWriteReceiver: false
  externalLabels: {}
-  # image: {{ .Values.nfc_monitoring.prometheus.image.name }}:{{ .Values.nfc_monitoring.prometheus.image.tag}}
  nodeSelector:
    kubernetes.io/os: linux
  podMetadata:
--- a/mkdocs.yml
+++ b/mkdocs.yml
@ -1,3 +1,5 @@
+---
+
 INHERIT: website-template/mkdocs.yml

 docs_dir: "docs"