Add config section metricsServer

This ensures that the new metrics-server component of the cluster monitoring stack has the default configs (e.g. node selector) applied.
appuio · Dec 4, 2024 · 682d2c2 · 682d2c2
1 parent f0b386f
commit 682d2c2
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 0 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -54,6 +54,7 @@ parameters:
       k8sPrometheusAdapter: {}
       openshiftStateMetrics: {}
       thanosQuerier: {}
+      metricsServer: {}
     configsUserWorkload:
       alertmanager:
         enabled: true

diff --git a/...ity-alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/...ity-alerts-with-node-labels/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -19,6 +19,9 @@ data:
     "kubeStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""
+    "metricsServer":
+      "nodeSelector":
+        "node-role.kubernetes.io/infra": ""
     "openshiftStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""

diff --git a/tests/golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/capacity-alerts/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -19,6 +19,9 @@ data:
     "kubeStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""
+    "metricsServer":
+      "nodeSelector":
+        "node-role.kubernetes.io/infra": ""
     "openshiftStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""

diff --git a/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/custom-rules/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -19,6 +19,9 @@ data:
     "kubeStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""
+    "metricsServer":
+      "nodeSelector":
+        "node-role.kubernetes.io/infra": ""
     "openshiftStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""

diff --git a/tests/golden/ovn-kubernetes/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/ovn-kubernetes/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -19,6 +19,9 @@ data:
     "kubeStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""
+    "metricsServer":
+      "nodeSelector":
+        "node-role.kubernetes.io/infra": ""
     "openshiftStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""

diff --git a/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -19,6 +19,9 @@ data:
     "kubeStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""
+    "metricsServer":
+      "nodeSelector":
+        "node-role.kubernetes.io/infra": ""
     "openshiftStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""

diff --git a/tests/golden/release-4.15/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/release-4.15/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -19,6 +19,9 @@ data:
     "kubeStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""
+    "metricsServer":
+      "nodeSelector":
+        "node-role.kubernetes.io/infra": ""
     "openshiftStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""

diff --git a/tests/golden/release-4.16/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/release-4.16/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -19,6 +19,9 @@ data:
     "kubeStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""
+    "metricsServer":
+      "nodeSelector":
+        "node-role.kubernetes.io/infra": ""
     "openshiftStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""

diff --git a/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/remote-write/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -19,6 +19,9 @@ data:
     "kubeStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""
+    "metricsServer":
+      "nodeSelector":
+        "node-role.kubernetes.io/infra": ""
     "openshiftStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""

diff --git a/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/team-routing/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -19,6 +19,9 @@ data:
     "kubeStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""
+    "metricsServer":
+      "nodeSelector":
+        "node-role.kubernetes.io/infra": ""
     "openshiftStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""

diff --git a/...en/user-workload-monitoring/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/...en/user-workload-monitoring/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -19,6 +19,9 @@ data:
     "kubeStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""
+    "metricsServer":
+      "nodeSelector":
+        "node-role.kubernetes.io/infra": ""
     "openshiftStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""

diff --git a/tests/golden/vsphere/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml b/tests/golden/vsphere/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
@@ -19,6 +19,9 @@ data:
     "kubeStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""
+    "metricsServer":
+      "nodeSelector":
+        "node-role.kubernetes.io/infra": ""
     "openshiftStateMetrics":
       "nodeSelector":
         "node-role.kubernetes.io/infra": ""