Merge pull request #2677 from rexagod/MON-4376

OCPBUGS-62310: Fix KSM deny-list typo

Author: openshift-merge-bot[bot]

CHANGELOG.md

@@ -7,6 +7,7 @@
   - `KubePdbNotEnoughHealthyPods`
   - `KubeNodePressure`
   - `KubeNodeEviction`
+- [#2677](https://github.com/openshift/cluster-monitoring-operator/pull/2677) Fix KSM deny-list typo that put `^kube_.+_annotations$^kube_customresource_.+_annotations_info$,` in the deny-list instead of seperate entries, like so, `^kube_.+_annotations$,^kube_customresource_.+_annotations_info$,`, due to the omission of a comma.
 
 ## 4.18
 

assets/kube-state-metrics/deployment.yaml

@@ -40,9 +40,9 @@ spec:
         - |
           --metric-denylist=
           ^kube_secret_labels$,
-          ^kube_.+_annotations$
+          ^kube_.+_annotations$,
           ^kube_customresource_.+_annotations_info$,
-          ^kube_customresource_.+_labels_info$,
+          ^kube_customresource_.+_labels_info$
         - --metric-labels-allowlist=pods=[*],nodes=[*],namespaces=[*],persistentvolumes=[*],persistentvolumeclaims=[*],poddisruptionbudgets=[*]
         - |
           --metric-denylist=

jsonnet/components/kube-state-metrics.libsonnet

@@ -241,9 +241,9 @@ function(params)
                         |||
                           --metric-denylist=
                           ^kube_secret_labels$,
-                          ^kube_.+_annotations$
+                          ^kube_.+_annotations$,
                           ^kube_customresource_.+_annotations_info$,
-                          ^kube_customresource_.+_labels_info$,
+                          ^kube_customresource_.+_labels_info$
                         |||,
                         '--metric-labels-allowlist=pods=[*],nodes=[*],namespaces=[*],persistentvolumes=[*],persistentvolumeclaims=[*],poddisruptionbudgets=[*]',
                       ],