From 5ed16b84477b4acb58cfe5bfd865751683f0b97e Mon Sep 17 00:00:00 2001
From: Guillermo Facundo Colunga <guillermo.facundo.colunga@cern.ch>
Date: Tue, 25 Jun 2024 11:28:06 +0200
Subject: [PATCH] Fix problem with key `commonLabels`.
- In the Fluent-bit daemon set it had the wrong number of indents.
- The key was misspelled everywhere as commomLabels. Changed to commonLabels.
Signed-off-by: Guillermo Facundo Colunga's avatarGuillermo Facundo Colunga <guillermo.facundo.colunga@cern.ch>
---
README.md | 2 +-
templates/api_server/servicemonitor.yaml | 2 +-
templates/coredns/servicemonitor.yaml | 2 +-
templates/ectd/servicemonitor.yaml | 2 +-
templates/fluentbit/clusterrole.yaml | 2 +-
templates/fluentbit/clusterrolebinding.yaml | 2 +-
templates/fluentbit/configmap.yaml | 2 +-
templates/fluentbit/daemonset.yaml | 4 ++--
templates/fluentbit/serviceaccount.yaml | 2 +-
templates/ingress_nginx/servicemonitor.yaml | 2 +-
templates/kube_state/clusterrole.yaml | 2 +-
templates/kube_state/clusterrolebinding.yaml | 2 +-
templates/kube_state/deployment.yaml | 2 +-
templates/kube_state/service.yaml | 2 +-
templates/kube_state/serviceaccount.yaml | 2 +-
templates/kube_state/servicemonitor.yaml | 2 +-
templates/kubecontroller/servicemonitor.yaml | 2 +-
templates/kubelet/servicemonitor.yaml | 2 +-
templates/kubeproxy/servicemonitor.yaml | 2 +-
templates/namespace.yaml | 2 +-
templates/node_exporter/daemonset.yaml | 2 +-
templates/node_exporter/podmonitor.yaml | 2 +-
templates/prometheus/clusterrole.yaml | 2 +-
templates/prometheus/clusterrolebinding.yaml | 2 +-
templates/prometheus/prometheus.yaml | 2 +-
templates/prometheus/remotewritesecret.yaml | 2 +-
templates/prometheus/serviceaccount.yaml | 2 +-
templates/prometheus_operator/clusterrole.yaml | 2 +-
templates/prometheus_operator/clusterrolebinding.yaml | 2 +-
templates/prometheus_operator/deployment.yaml | 2 +-
templates/prometheus_operator/service.yaml | 2 +-
templates/prometheus_operator/serviceaccount.yaml | 2 +-
values.yaml | 2 +-
33 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/README.md b/README.md
index b3a9147..734f08b 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ The chart can be customized using the following parameters in the values.yaml fi
- k8sClusterName: A label added to all metrics and logs to track their origin.
- tenantName: The tenant name for sending metrics and logs to central monitoring.
- tenantPassword: The tenant password for sending metrics and logs to central monitoring.
-- commomLabels: Common labels applied to every resource created by the chart.
+- commonLabels: Common labels applied to every resource created by the chart.
- namespace: The namespace for deploying all components.
- metrics: Configuration for metrics collection components.
- nodeExporter, metricsServer, kubeState, prometheusOperator, prometheusServer, fluentbit: Specific configurations for each component.
diff --git a/templates/api_server/servicemonitor.yaml b/templates/api_server/servicemonitor.yaml
index 360cbb1..3460f24 100644
--- a/templates/api_server/servicemonitor.yaml
+++ b/templates/api_server/servicemonitor.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-servicemonitor-apiserver
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/templates/coredns/servicemonitor.yaml b/templates/coredns/servicemonitor.yaml
index aaef08e..38687df 100644
--- a/templates/coredns/servicemonitor.yaml
+++ b/templates/coredns/servicemonitor.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-servicemonitor-coredns
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/templates/ectd/servicemonitor.yaml b/templates/ectd/servicemonitor.yaml
index 3af9a9a..fe43a8f 100644
--- a/templates/ectd/servicemonitor.yaml
+++ b/templates/ectd/servicemonitor.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-servicemonitor-etcd
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/templates/fluentbit/clusterrole.yaml b/templates/fluentbit/clusterrole.yaml
index 4eb2e26..806d90a 100644
--- a/templates/fluentbit/clusterrole.yaml
+++ b/templates/fluentbit/clusterrole.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-logs-collector-fluentbit
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
rules:
- apiGroups:
- ""
diff --git a/templates/fluentbit/clusterrolebinding.yaml b/templates/fluentbit/clusterrolebinding.yaml
index f08a7d2..4eda1bb 100644
--- a/templates/fluentbit/clusterrolebinding.yaml
+++ b/templates/fluentbit/clusterrolebinding.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-logs-collector-fluentbit
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
diff --git a/templates/fluentbit/configmap.yaml b/templates/fluentbit/configmap.yaml
index b3c2c59..533e220 100644
--- a/templates/fluentbit/configmap.yaml
+++ b/templates/fluentbit/configmap.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-logs-collector-fluentbit
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
data:
custom_parsers.conf: |
{{- (tpl .Values.logs.fluentbit.customParsers $) | nindent 4 }}
diff --git a/templates/fluentbit/daemonset.yaml b/templates/fluentbit/daemonset.yaml
index 2879df0..9f18bd9 100644
--- a/templates/fluentbit/daemonset.yaml
+++ b/templates/fluentbit/daemonset.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-logs-collector-fluentbit
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
selector:
matchLabels:
@@ -15,7 +15,7 @@ spec:
namespace: {{ .Values.namespace }}
labels:
name: it-monit-logs-collector-fluentbit
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 8 }}
spec:
serviceAccountName: it-monit-logs-collector-fluentbit
containers:
diff --git a/templates/fluentbit/serviceaccount.yaml b/templates/fluentbit/serviceaccount.yaml
index 3c0b420..fb1a73e 100644
--- a/templates/fluentbit/serviceaccount.yaml
+++ b/templates/fluentbit/serviceaccount.yaml
@@ -4,4 +4,4 @@ metadata:
name: it-monit-logs-collector-fluentbit
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
\ No newline at end of file
+ {{ toYaml .Values.commonLabels | nindent 4 }}
\ No newline at end of file
diff --git a/templates/ingress_nginx/servicemonitor.yaml b/templates/ingress_nginx/servicemonitor.yaml
index d35d747..46354ce 100644
--- a/templates/ingress_nginx/servicemonitor.yaml
+++ b/templates/ingress_nginx/servicemonitor.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-servicemonitor-ingress-nginx
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
endpoints:
- interval: 15s
diff --git a/templates/kube_state/clusterrole.yaml b/templates/kube_state/clusterrole.yaml
index 4d6e2c8..734acad 100644
--- a/templates/kube_state/clusterrole.yaml
+++ b/templates/kube_state/clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
namespace: {{ .Values.namespace }}
labels:
app.kubernetes.io/name: it-monit-metrics-collector-kubestate
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
rules:
- apiGroups:
- ""
diff --git a/templates/kube_state/clusterrolebinding.yaml b/templates/kube_state/clusterrolebinding.yaml
index 02583c8..140e954 100644
--- a/templates/kube_state/clusterrolebinding.yaml
+++ b/templates/kube_state/clusterrolebinding.yaml
@@ -5,7 +5,7 @@ metadata:
namespace: {{ .Values.namespace }}
labels:
app.kubernetes.io/name: it-monit-metrics-collector-kubestate
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
diff --git a/templates/kube_state/deployment.yaml b/templates/kube_state/deployment.yaml
index d96c49b..77888db 100644
--- a/templates/kube_state/deployment.yaml
+++ b/templates/kube_state/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
namespace: {{ .Values.namespace }}
labels:
app.kubernetes.io/name: it-monit-metrics-collector-kubestate
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
replicas: 1
selector:
diff --git a/templates/kube_state/service.yaml b/templates/kube_state/service.yaml
index e567173..eab9258 100644
--- a/templates/kube_state/service.yaml
+++ b/templates/kube_state/service.yaml
@@ -5,7 +5,7 @@ metadata:
namespace: {{ .Values.namespace }}
labels:
app.kubernetes.io/name: it-monit-metrics-collector-kubestate
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
clusterIP: None
ports:
diff --git a/templates/kube_state/serviceaccount.yaml b/templates/kube_state/serviceaccount.yaml
index 9fc9ff1..c78d016 100644
--- a/templates/kube_state/serviceaccount.yaml
+++ b/templates/kube_state/serviceaccount.yaml
@@ -6,4 +6,4 @@ metadata:
namespace: {{ .Values.namespace }}
labels:
app.kubernetes.io/name: it-monit-metrics-collector-kubestate
- {{ toYaml .Values.commomLabels | nindent 4 }}
\ No newline at end of file
+ {{ toYaml .Values.commonLabels | nindent 4 }}
\ No newline at end of file
diff --git a/templates/kube_state/servicemonitor.yaml b/templates/kube_state/servicemonitor.yaml
index de08679..61bd572 100644
--- a/templates/kube_state/servicemonitor.yaml
+++ b/templates/kube_state/servicemonitor.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-servicemonitor-kubestate
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
jobLabel: k8s-app
diff --git a/templates/kubecontroller/servicemonitor.yaml b/templates/kubecontroller/servicemonitor.yaml
index ccce823..6680cd9 100644
--- a/templates/kubecontroller/servicemonitor.yaml
+++ b/templates/kubecontroller/servicemonitor.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-servicemonitor-kubecontroller
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/templates/kubelet/servicemonitor.yaml b/templates/kubelet/servicemonitor.yaml
index 2013a2d..543fade 100644
--- a/templates/kubelet/servicemonitor.yaml
+++ b/templates/kubelet/servicemonitor.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-servicemonitor-kubelet
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
jobLabel: k8s-app
endpoints:
diff --git a/templates/kubeproxy/servicemonitor.yaml b/templates/kubeproxy/servicemonitor.yaml
index cc3667f..789cee5 100644
--- a/templates/kubeproxy/servicemonitor.yaml
+++ b/templates/kubeproxy/servicemonitor.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-servicemonitor-kubeproxy
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/templates/namespace.yaml b/templates/namespace.yaml
index 7523abb..3482dd4 100644
--- a/templates/namespace.yaml
+++ b/templates/namespace.yaml
@@ -3,4 +3,4 @@ kind: Namespace
metadata:
name: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
\ No newline at end of file
+ {{ toYaml .Values.commonLabels | nindent 4 }}
\ No newline at end of file
diff --git a/templates/node_exporter/daemonset.yaml b/templates/node_exporter/daemonset.yaml
index f7c22fc..1b28a4d 100644
--- a/templates/node_exporter/daemonset.yaml
+++ b/templates/node_exporter/daemonset.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-collector-nodeexporter
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
selector:
matchLabels:
diff --git a/templates/node_exporter/podmonitor.yaml b/templates/node_exporter/podmonitor.yaml
index 0e78d36..404ae28 100644
--- a/templates/node_exporter/podmonitor.yaml
+++ b/templates/node_exporter/podmonitor.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-podmonitor-nodeexporter
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
namespaceSelector:
matchNames:
diff --git a/templates/prometheus/clusterrole.yaml b/templates/prometheus/clusterrole.yaml
index 60c6459..bde5da2 100644
--- a/templates/prometheus/clusterrole.yaml
+++ b/templates/prometheus/clusterrole.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-collector-prometheus
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
rules:
- apiGroups: [""]
resources:
diff --git a/templates/prometheus/clusterrolebinding.yaml b/templates/prometheus/clusterrolebinding.yaml
index 264d9aa..c18eee4 100644
--- a/templates/prometheus/clusterrolebinding.yaml
+++ b/templates/prometheus/clusterrolebinding.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-collector-prometheus
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
diff --git a/templates/prometheus/prometheus.yaml b/templates/prometheus/prometheus.yaml
index 5993f78..0559edc 100644
--- a/templates/prometheus/prometheus.yaml
+++ b/templates/prometheus/prometheus.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-collector-prometheus
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
version: {{ .Values.metrics.prometheusServer.version }}
scrapeInterval: {{ .Values.metrics.prometheusServer.scrapeInterval }}
diff --git a/templates/prometheus/remotewritesecret.yaml b/templates/prometheus/remotewritesecret.yaml
index 536abff..ed673cd 100644
--- a/templates/prometheus/remotewritesecret.yaml
+++ b/templates/prometheus/remotewritesecret.yaml
@@ -5,7 +5,7 @@ metadata:
name: it-monit-metrics-collector-prometheus
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
type: kubernetes.io/basic-auth
data:
{{- if and .Values.metrics.prometheusServer.remoteWrite.username .Values.metrics.prometheusServer.remoteWrite.password }}
diff --git a/templates/prometheus/serviceaccount.yaml b/templates/prometheus/serviceaccount.yaml
index 82fbb02..dfc5f73 100644
--- a/templates/prometheus/serviceaccount.yaml
+++ b/templates/prometheus/serviceaccount.yaml
@@ -4,4 +4,4 @@ metadata:
name: it-monit-metrics-collector-prometheus
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
diff --git a/templates/prometheus_operator/clusterrole.yaml b/templates/prometheus_operator/clusterrole.yaml
index fdaa532..a555b69 100644
--- a/templates/prometheus_operator/clusterrole.yaml
+++ b/templates/prometheus_operator/clusterrole.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-operator-prometheus
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
rules:
- apiGroups:
- monitoring.coreos.com
diff --git a/templates/prometheus_operator/clusterrolebinding.yaml b/templates/prometheus_operator/clusterrolebinding.yaml
index a376691..ff79241 100644
--- a/templates/prometheus_operator/clusterrolebinding.yaml
+++ b/templates/prometheus_operator/clusterrolebinding.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-operator-prometheus
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
diff --git a/templates/prometheus_operator/deployment.yaml b/templates/prometheus_operator/deployment.yaml
index 0c46c4e..f933661 100644
--- a/templates/prometheus_operator/deployment.yaml
+++ b/templates/prometheus_operator/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-operator-prometheus
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
replicas: 1
selector:
diff --git a/templates/prometheus_operator/service.yaml b/templates/prometheus_operator/service.yaml
index 80d822c..268c8de 100644
--- a/templates/prometheus_operator/service.yaml
+++ b/templates/prometheus_operator/service.yaml
@@ -4,7 +4,7 @@ metadata:
name: it-monit-metrics-operator-prometheus
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
+ {{ toYaml .Values.commonLabels | nindent 4 }}
spec:
clusterIP: None
ports:
diff --git a/templates/prometheus_operator/serviceaccount.yaml b/templates/prometheus_operator/serviceaccount.yaml
index a15f6f4..25200bb 100644
--- a/templates/prometheus_operator/serviceaccount.yaml
+++ b/templates/prometheus_operator/serviceaccount.yaml
@@ -5,4 +5,4 @@ metadata:
name: it-monit-metrics-operator-prometheus
namespace: {{ .Values.namespace }}
labels:
- {{ toYaml .Values.commomLabels | nindent 4 }}
\ No newline at end of file
+ {{ toYaml .Values.commonLabels | nindent 4 }}
\ No newline at end of file
diff --git a/values.yaml b/values.yaml
index ee296e5..416f772 100644
--- a/values.yaml
+++ b/values.yaml
@@ -13,7 +13,7 @@ tenantName: "YOUR-TENANT-NAME"
tenantPassword: "YOUR-TENANT-PASSWORD"
# commonLabels is a set of labels and values that will be added to every resource created by this helm chart.
-commomLabels:
+commonLabels:
helm.sh/chart: "cern-it-monitoring-kubernetes-0-1-0"
app.kubernetes.io/managed-by: "Helm"
app.kubernetes.io/instance: "cern-it-monitoring-kubernetes-base"
--
GitLab