From ea2a4827723b8965d1c80fa0012d608fda04a86b Mon Sep 17 00:00:00 2001 From: Tobias Giese Date: Tue, 27 Aug 2024 16:03:21 +0200 Subject: [PATCH] Revert "Add nilIsZero to all KSM metric configs where needed" This reverts commit 82adc3980eea57394503c69ef73c4ec8c3125fbc. Signed-off-by: Tobias Giese --- config/metrics/crd-metrics-config.yaml | 25 ------------------- config/metrics/templates/cluster.yaml | 1 - config/metrics/templates/common_metrics.yaml | 2 -- config/metrics/templates/machine.yaml | 1 - .../metrics/templates/machinehealthcheck.yaml | 3 --- config/metrics/templates/machinepool.yaml | 1 - config/metrics/templates/machineset.yaml | 1 - 7 files changed, 34 deletions(-) diff --git a/config/metrics/crd-metrics-config.yaml b/config/metrics/crd-metrics-config.yaml index 907df17aa0d2..718af5a9bd9f 100644 --- a/config/metrics/crd-metrics-config.yaml +++ b/config/metrics/crd-metrics-config.yaml @@ -64,7 +64,6 @@ spec: - conditions valueFrom: - status - nilIsZero: true type: StateSet - name: status_condition_last_transition_time help: The condition last transition time of a clusterclass. @@ -80,7 +79,6 @@ spec: - conditions valueFrom: - lastTransitionTime - nilIsZero: true type: Gauge - name: owner help: Owner references. @@ -177,7 +175,6 @@ spec: path: - status - phase - nilIsZero: true type: StateSet - name: created help: Unix creation timestamp. @@ -215,7 +212,6 @@ spec: - conditions valueFrom: - status - nilIsZero: true type: StateSet - name: status_condition_last_transition_time help: The condition last transition time of a cluster. @@ -231,7 +227,6 @@ spec: - conditions valueFrom: - lastTransitionTime - nilIsZero: true type: Gauge - groupVersionKind: group: controlplane.cluster.x-k8s.io @@ -353,7 +348,6 @@ spec: - conditions valueFrom: - status - nilIsZero: true type: StateSet - name: status_condition_last_transition_time help: The condition last transition time of a kubeadmcontrolplane. @@ -369,7 +363,6 @@ spec: - conditions valueFrom: - lastTransitionTime - nilIsZero: true type: Gauge - name: owner help: Owner references. @@ -454,7 +447,6 @@ spec: - conditions valueFrom: - status - nilIsZero: true type: StateSet - name: status_condition_last_transition_time help: The condition last transition time of a kubeadmconfig. @@ -470,7 +462,6 @@ spec: - conditions valueFrom: - lastTransitionTime - nilIsZero: true type: Gauge - name: owner help: Owner references. @@ -618,7 +609,6 @@ spec: path: - status - phase - nilIsZero: true type: StateSet - name: created help: Unix creation timestamp. @@ -656,7 +646,6 @@ spec: - conditions valueFrom: - status - nilIsZero: true type: StateSet - name: status_condition_last_transition_time help: The condition last transition time of a machine. @@ -672,7 +661,6 @@ spec: - conditions valueFrom: - lastTransitionTime - nilIsZero: true type: Gauge - name: owner help: Owner references. @@ -880,7 +868,6 @@ spec: - conditions valueFrom: - status - nilIsZero: true type: StateSet - name: status_condition_last_transition_time help: The condition last transition time of a machinedeployment. @@ -896,7 +883,6 @@ spec: - conditions valueFrom: - lastTransitionTime - nilIsZero: true type: Gauge - name: owner help: Owner references. @@ -951,7 +937,6 @@ spec: path: - status - currentHealthy - nilIsZero: true type: Gauge - name: status_expected_machines help: Total number of pods counted by this machinehealthcheck. @@ -960,7 +945,6 @@ spec: path: - status - expectedMachines - nilIsZero: true type: Gauge - name: status_remediations_allowed help: Number of machine remediations that are currently allowed. @@ -969,7 +953,6 @@ spec: path: - status - remediationsAllowed - nilIsZero: true type: Gauge - name: created help: Unix creation timestamp. @@ -1007,7 +990,6 @@ spec: - conditions valueFrom: - status - nilIsZero: true type: StateSet - name: status_condition_last_transition_time help: The condition last transition time of a machinehealthcheck. @@ -1023,7 +1005,6 @@ spec: - conditions valueFrom: - lastTransitionTime - nilIsZero: true type: Gauge - name: owner help: Owner references. @@ -1123,7 +1104,6 @@ spec: path: - status - fullyLabeledReplicas - nilIsZero: true type: Gauge - name: status_replicas_ready help: The number of ready replicas per machineset. @@ -1179,7 +1159,6 @@ spec: - conditions valueFrom: - status - nilIsZero: true type: StateSet - name: status_condition_last_transition_time help: The condition last transition time of a machineset. @@ -1195,7 +1174,6 @@ spec: - conditions valueFrom: - lastTransitionTime - nilIsZero: true type: Gauge - name: owner help: Owner references. @@ -1332,7 +1310,6 @@ spec: path: - status - phase - nilIsZero: true type: StateSet - name: created help: Unix creation timestamp. @@ -1370,7 +1347,6 @@ spec: - conditions valueFrom: - status - nilIsZero: true type: StateSet - name: status_condition_last_transition_time help: The condition last transition time of a machinepool. @@ -1386,7 +1362,6 @@ spec: - conditions valueFrom: - lastTransitionTime - nilIsZero: true type: Gauge - name: owner help: Owner references. diff --git a/config/metrics/templates/cluster.yaml b/config/metrics/templates/cluster.yaml index 137ac88178ef..f1e91daa6b57 100644 --- a/config/metrics/templates/cluster.yaml +++ b/config/metrics/templates/cluster.yaml @@ -76,5 +76,4 @@ path: - status - phase - nilIsZero: true type: StateSet diff --git a/config/metrics/templates/common_metrics.yaml b/config/metrics/templates/common_metrics.yaml index feb17f969d09..073631b9c88b 100644 --- a/config/metrics/templates/common_metrics.yaml +++ b/config/metrics/templates/common_metrics.yaml @@ -34,7 +34,6 @@ - conditions valueFrom: - status - nilIsZero: true type: StateSet - name: status_condition_last_transition_time help: The condition last transition time of a ${RESOURCE}. @@ -50,5 +49,4 @@ - conditions valueFrom: - lastTransitionTime - nilIsZero: true type: Gauge diff --git a/config/metrics/templates/machine.yaml b/config/metrics/templates/machine.yaml index fe8d012d4880..b49b1d3b7c7e 100644 --- a/config/metrics/templates/machine.yaml +++ b/config/metrics/templates/machine.yaml @@ -127,5 +127,4 @@ path: - status - phase - nilIsZero: true type: StateSet diff --git a/config/metrics/templates/machinehealthcheck.yaml b/config/metrics/templates/machinehealthcheck.yaml index 22c7d4e49a98..a14a164be72b 100644 --- a/config/metrics/templates/machinehealthcheck.yaml +++ b/config/metrics/templates/machinehealthcheck.yaml @@ -34,7 +34,6 @@ path: - status - currentHealthy - nilIsZero: true type: Gauge - name: status_expected_machines help: Total number of pods counted by this machinehealthcheck. @@ -43,7 +42,6 @@ path: - status - expectedMachines - nilIsZero: true type: Gauge - name: status_remediations_allowed help: Number of machine remediations that are currently allowed. @@ -52,5 +50,4 @@ path: - status - remediationsAllowed - nilIsZero: true type: Gauge diff --git a/config/metrics/templates/machinepool.yaml b/config/metrics/templates/machinepool.yaml index 83c56fe6a8d5..a4dbb4aa7254 100644 --- a/config/metrics/templates/machinepool.yaml +++ b/config/metrics/templates/machinepool.yaml @@ -116,5 +116,4 @@ path: - status - phase - nilIsZero: true type: StateSet diff --git a/config/metrics/templates/machineset.yaml b/config/metrics/templates/machineset.yaml index fc3b19b5b421..e2bde1ecde6e 100644 --- a/config/metrics/templates/machineset.yaml +++ b/config/metrics/templates/machineset.yaml @@ -79,7 +79,6 @@ path: - status - fullyLabeledReplicas - nilIsZero: true type: Gauge - name: status_replicas_ready help: The number of ready replicas per machineset.