Skip to content

Commit ea2a482

Browse files
committed
Revert "Add nilIsZero to all KSM metric configs where needed"
This reverts commit 82adc39. Signed-off-by: Tobias Giese <[email protected]>
1 parent 82adc39 commit ea2a482

File tree

7 files changed

+0
-34
lines changed

7 files changed

+0
-34
lines changed

config/metrics/crd-metrics-config.yaml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ spec:
6464
- conditions
6565
valueFrom:
6666
- status
67-
nilIsZero: true
6867
type: StateSet
6968
- name: status_condition_last_transition_time
7069
help: The condition last transition time of a clusterclass.
@@ -80,7 +79,6 @@ spec:
8079
- conditions
8180
valueFrom:
8281
- lastTransitionTime
83-
nilIsZero: true
8482
type: Gauge
8583
- name: owner
8684
help: Owner references.
@@ -177,7 +175,6 @@ spec:
177175
path:
178176
- status
179177
- phase
180-
nilIsZero: true
181178
type: StateSet
182179
- name: created
183180
help: Unix creation timestamp.
@@ -215,7 +212,6 @@ spec:
215212
- conditions
216213
valueFrom:
217214
- status
218-
nilIsZero: true
219215
type: StateSet
220216
- name: status_condition_last_transition_time
221217
help: The condition last transition time of a cluster.
@@ -231,7 +227,6 @@ spec:
231227
- conditions
232228
valueFrom:
233229
- lastTransitionTime
234-
nilIsZero: true
235230
type: Gauge
236231
- groupVersionKind:
237232
group: controlplane.cluster.x-k8s.io
@@ -353,7 +348,6 @@ spec:
353348
- conditions
354349
valueFrom:
355350
- status
356-
nilIsZero: true
357351
type: StateSet
358352
- name: status_condition_last_transition_time
359353
help: The condition last transition time of a kubeadmcontrolplane.
@@ -369,7 +363,6 @@ spec:
369363
- conditions
370364
valueFrom:
371365
- lastTransitionTime
372-
nilIsZero: true
373366
type: Gauge
374367
- name: owner
375368
help: Owner references.
@@ -454,7 +447,6 @@ spec:
454447
- conditions
455448
valueFrom:
456449
- status
457-
nilIsZero: true
458450
type: StateSet
459451
- name: status_condition_last_transition_time
460452
help: The condition last transition time of a kubeadmconfig.
@@ -470,7 +462,6 @@ spec:
470462
- conditions
471463
valueFrom:
472464
- lastTransitionTime
473-
nilIsZero: true
474465
type: Gauge
475466
- name: owner
476467
help: Owner references.
@@ -618,7 +609,6 @@ spec:
618609
path:
619610
- status
620611
- phase
621-
nilIsZero: true
622612
type: StateSet
623613
- name: created
624614
help: Unix creation timestamp.
@@ -656,7 +646,6 @@ spec:
656646
- conditions
657647
valueFrom:
658648
- status
659-
nilIsZero: true
660649
type: StateSet
661650
- name: status_condition_last_transition_time
662651
help: The condition last transition time of a machine.
@@ -672,7 +661,6 @@ spec:
672661
- conditions
673662
valueFrom:
674663
- lastTransitionTime
675-
nilIsZero: true
676664
type: Gauge
677665
- name: owner
678666
help: Owner references.
@@ -880,7 +868,6 @@ spec:
880868
- conditions
881869
valueFrom:
882870
- status
883-
nilIsZero: true
884871
type: StateSet
885872
- name: status_condition_last_transition_time
886873
help: The condition last transition time of a machinedeployment.
@@ -896,7 +883,6 @@ spec:
896883
- conditions
897884
valueFrom:
898885
- lastTransitionTime
899-
nilIsZero: true
900886
type: Gauge
901887
- name: owner
902888
help: Owner references.
@@ -951,7 +937,6 @@ spec:
951937
path:
952938
- status
953939
- currentHealthy
954-
nilIsZero: true
955940
type: Gauge
956941
- name: status_expected_machines
957942
help: Total number of pods counted by this machinehealthcheck.
@@ -960,7 +945,6 @@ spec:
960945
path:
961946
- status
962947
- expectedMachines
963-
nilIsZero: true
964948
type: Gauge
965949
- name: status_remediations_allowed
966950
help: Number of machine remediations that are currently allowed.
@@ -969,7 +953,6 @@ spec:
969953
path:
970954
- status
971955
- remediationsAllowed
972-
nilIsZero: true
973956
type: Gauge
974957
- name: created
975958
help: Unix creation timestamp.
@@ -1007,7 +990,6 @@ spec:
1007990
- conditions
1008991
valueFrom:
1009992
- status
1010-
nilIsZero: true
1011993
type: StateSet
1012994
- name: status_condition_last_transition_time
1013995
help: The condition last transition time of a machinehealthcheck.
@@ -1023,7 +1005,6 @@ spec:
10231005
- conditions
10241006
valueFrom:
10251007
- lastTransitionTime
1026-
nilIsZero: true
10271008
type: Gauge
10281009
- name: owner
10291010
help: Owner references.
@@ -1123,7 +1104,6 @@ spec:
11231104
path:
11241105
- status
11251106
- fullyLabeledReplicas
1126-
nilIsZero: true
11271107
type: Gauge
11281108
- name: status_replicas_ready
11291109
help: The number of ready replicas per machineset.
@@ -1179,7 +1159,6 @@ spec:
11791159
- conditions
11801160
valueFrom:
11811161
- status
1182-
nilIsZero: true
11831162
type: StateSet
11841163
- name: status_condition_last_transition_time
11851164
help: The condition last transition time of a machineset.
@@ -1195,7 +1174,6 @@ spec:
11951174
- conditions
11961175
valueFrom:
11971176
- lastTransitionTime
1198-
nilIsZero: true
11991177
type: Gauge
12001178
- name: owner
12011179
help: Owner references.
@@ -1332,7 +1310,6 @@ spec:
13321310
path:
13331311
- status
13341312
- phase
1335-
nilIsZero: true
13361313
type: StateSet
13371314
- name: created
13381315
help: Unix creation timestamp.
@@ -1370,7 +1347,6 @@ spec:
13701347
- conditions
13711348
valueFrom:
13721349
- status
1373-
nilIsZero: true
13741350
type: StateSet
13751351
- name: status_condition_last_transition_time
13761352
help: The condition last transition time of a machinepool.
@@ -1386,7 +1362,6 @@ spec:
13861362
- conditions
13871363
valueFrom:
13881364
- lastTransitionTime
1389-
nilIsZero: true
13901365
type: Gauge
13911366
- name: owner
13921367
help: Owner references.

config/metrics/templates/cluster.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,4 @@
7676
path:
7777
- status
7878
- phase
79-
nilIsZero: true
8079
type: StateSet

config/metrics/templates/common_metrics.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
- conditions
3535
valueFrom:
3636
- status
37-
nilIsZero: true
3837
type: StateSet
3938
- name: status_condition_last_transition_time
4039
help: The condition last transition time of a ${RESOURCE}.
@@ -50,5 +49,4 @@
5049
- conditions
5150
valueFrom:
5251
- lastTransitionTime
53-
nilIsZero: true
5452
type: Gauge

config/metrics/templates/machine.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,5 +127,4 @@
127127
path:
128128
- status
129129
- phase
130-
nilIsZero: true
131130
type: StateSet

config/metrics/templates/machinehealthcheck.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
path:
3535
- status
3636
- currentHealthy
37-
nilIsZero: true
3837
type: Gauge
3938
- name: status_expected_machines
4039
help: Total number of pods counted by this machinehealthcheck.
@@ -43,7 +42,6 @@
4342
path:
4443
- status
4544
- expectedMachines
46-
nilIsZero: true
4745
type: Gauge
4846
- name: status_remediations_allowed
4947
help: Number of machine remediations that are currently allowed.
@@ -52,5 +50,4 @@
5250
path:
5351
- status
5452
- remediationsAllowed
55-
nilIsZero: true
5653
type: Gauge

config/metrics/templates/machinepool.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,5 +116,4 @@
116116
path:
117117
- status
118118
- phase
119-
nilIsZero: true
120119
type: StateSet

config/metrics/templates/machineset.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
path:
8080
- status
8181
- fullyLabeledReplicas
82-
nilIsZero: true
8382
type: Gauge
8483
- name: status_replicas_ready
8584
help: The number of ready replicas per machineset.

0 commit comments

Comments
 (0)