Merge pull request #2078 from rexagod/2858

MON-3163: support VPAs

Author: openshift-merge-bot[bot]

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - [#2302](https://github.com/openshift/cluster-monitoring-operator/issues/2302) Enable feature `extra-scrape-metrics` in Prometheus user-workload
 - [#2319](https://github.com/openshift/cluster-monitoring-operator/pull/2319) Allow read-only access to the Alertmanager API (use `monitoring-alertmanager-view`).
+- [#2078](https://github.com/openshift/cluster-monitoring-operator/pull/2078) Support exporting VPA metrics from KSM.
 
 ## 4.15
 

Documentation/deps-versions.md

@@ -1,7 +1,7 @@
 |  OCP Version |                                   alertmanager                                   |                              kubeRbacProxy                               |                              kubeStateMetrics                               |                              kubernetesMetricsServer                              |                             monitoringPlugin                              |                             nodeExporter                              |                              promLabelProxy                              |                             prometheus                              |                                prometheusAdapter                                |                              prometheusOperator                              |                             thanos                              |
 |--------------|----------------------------------------------------------------------------------|--------------------------------------------------------------------------|-----------------------------------------------------------------------------|-----------------------------------------------------------------------------------|---------------------------------------------------------------------------|-----------------------------------------------------------------------|--------------------------------------------------------------------------|---------------------------------------------------------------------|---------------------------------------------------------------------------------|------------------------------------------------------------------------------|-----------------------------------------------------------------|
-| release-4.17 | [0.26.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.17) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.17) | [2.12.0](https://github.com/openshift/kube-state-metrics/blob/release-4.17) | [0.7.1](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.17) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.17) | [1.7.0](https://github.com/openshift/node_exporter/blob/release-4.17) | [0.8.1](https://github.com/openshift/prom-label-proxy/blob/release-4.17) | [2.51.2](https://github.com/openshift/prometheus/blob/release-4.17) | [0.11.2](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.17) | [0.73.1](https://github.com/openshift/prometheus-operator/blob/release-4.17) | [0.34.1](https://github.com/openshift/thanos/blob/release-4.17) |
-| release-4.16 | [0.26.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.16) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.16) | [2.12.0](https://github.com/openshift/kube-state-metrics/blob/release-4.16) | [0.7.1](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.16) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.16) | [1.7.0](https://github.com/openshift/node_exporter/blob/release-4.16) | [0.8.1](https://github.com/openshift/prom-label-proxy/blob/release-4.16) | [2.51.2](https://github.com/openshift/prometheus/blob/release-4.16) | [0.11.2](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.16) | [0.73.1](https://github.com/openshift/prometheus-operator/blob/release-4.16) | [0.34.1](https://github.com/openshift/thanos/blob/release-4.16) |
+| release-4.17 | [0.26.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.17) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.17) | [2.12.0](https://github.com/openshift/kube-state-metrics/blob/release-4.17) | [0.7.1](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.17) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.17) | [1.7.0](https://github.com/openshift/node_exporter/blob/release-4.17) | [0.8.1](https://github.com/openshift/prom-label-proxy/blob/release-4.17) | [2.51.2](https://github.com/openshift/prometheus/blob/release-4.17) | [0.11.2](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.17) | [0.73.2](https://github.com/openshift/prometheus-operator/blob/release-4.17) | [0.34.1](https://github.com/openshift/thanos/blob/release-4.17) |
+| release-4.16 | [0.26.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.16) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.16) | [2.12.0](https://github.com/openshift/kube-state-metrics/blob/release-4.16) | [0.7.1](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.16) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.16) | [1.7.0](https://github.com/openshift/node_exporter/blob/release-4.16) | [0.8.1](https://github.com/openshift/prom-label-proxy/blob/release-4.16) | [2.51.2](https://github.com/openshift/prometheus/blob/release-4.16) | [0.11.2](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.16) | [0.73.2](https://github.com/openshift/prometheus-operator/blob/release-4.16) | [0.34.1](https://github.com/openshift/thanos/blob/release-4.16) |
 | release-4.15 | [0.26.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.15) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.15) | [2.10.1](https://github.com/openshift/kube-state-metrics/blob/release-4.15) | [0.6.4](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.15) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.15) | [1.7.0](https://github.com/openshift/node_exporter/blob/release-4.15) | [0.7.0](https://github.com/openshift/prom-label-proxy/blob/release-4.15) | [2.48.0](https://github.com/openshift/prometheus/blob/release-4.15) | [0.11.2](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.15) | [0.70.0](https://github.com/openshift/prometheus-operator/blob/release-4.15) | [0.32.5](https://github.com/openshift/thanos/blob/release-4.15) |
 | release-4.14 | [0.25.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.14) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.14) | [2.9.2](https://github.com/openshift/kube-state-metrics/blob/release-4.14)  | [0.6.4](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.14) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.14) | [1.6.1](https://github.com/openshift/node_exporter/blob/release-4.14) | [0.7.0](https://github.com/openshift/prom-label-proxy/blob/release-4.14) | [2.46.0](https://github.com/openshift/prometheus/blob/release-4.14) | [0.10.0](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.14) | [0.67.1](https://github.com/openshift/prometheus-operator/blob/release-4.14) | [0.30.2](https://github.com/openshift/thanos/blob/release-4.14) |
 | release-4.13 | [0.25.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.13) | [0.15.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.13) | [2.8.1](https://github.com/openshift/kube-state-metrics/blob/release-4.13)  | N/A                                                                               | N/A                                                                       | [1.5.0](https://github.com/openshift/node_exporter/blob/release-4.13) | [0.6.0](https://github.com/openshift/prom-label-proxy/blob/release-4.13) | [2.42.0](https://github.com/openshift/prometheus/blob/release-4.13) | [0.10.0](https://github.com/openshift/k8s-prometheus-adapter/blob/release-4.13) | [0.63.0](https://github.com/openshift/prometheus-operator/blob/release-4.13) | [0.30.2](https://github.com/openshift/thanos/blob/release-4.13) |

Makefile

@@ -17,7 +17,12 @@ PKGS=$(shell go list ./... | grep -v /test/e2e)
 GOLANG_FILES:=$(shell find . -name \*.go -print)
 # NOTE: grep -v %.yaml is needed  because "%s-policy.yaml" is used
 # in manifest.go and that isn't a valid asset.
+# NOTE: Certain paths included in the manifest.go file are not valid
+# asset paths and should be excluded from the list of assets. These
+# paths are:
+# - /etc/
 ASSETS=$(shell grep -oh '[^"]*/.*\.yaml' pkg/manifests/manifests.go \
+          | grep -v '^/etc' \
           | grep -v '%.*yaml' | sed 's/^/assets\//')
 
 BIN_DIR ?= $(shell pwd)/tmp/bin

assets/admission-webhook/deployment.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator-admission-webhook
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.73.1
+    app.kubernetes.io/version: 0.73.2
   name: prometheus-operator-admission-webhook
   namespace: openshift-monitoring
 spec:
@@ -26,7 +26,7 @@ spec:
         app.kubernetes.io/managed-by: cluster-monitoring-operator
         app.kubernetes.io/name: prometheus-operator-admission-webhook
         app.kubernetes.io/part-of: openshift-monitoring
-        app.kubernetes.io/version: 0.73.1
+        app.kubernetes.io/version: 0.73.2
     spec:
       affinity:
         podAntiAffinity:
@@ -46,7 +46,7 @@ spec:
         - --web.key-file=/etc/tls/private/tls.key
         - --web.tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
         - --web.tls-min-version=VersionTLS12
-        image: quay.io/prometheus-operator/admission-webhook:v0.73.1
+        image: quay.io/prometheus-operator/admission-webhook:v0.73.2
         livenessProbe:
           httpGet:
             path: /healthz

assets/admission-webhook/pod-disruption-budget.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator-admission-webhook
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.73.1
+    app.kubernetes.io/version: 0.73.2
   name: prometheus-operator-admission-webhook
   namespace: openshift-monitoring
 spec:

assets/admission-webhook/service-account.yaml

@@ -6,6 +6,6 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator-admission-webhook
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.73.1
+    app.kubernetes.io/version: 0.73.2
   name: prometheus-operator-admission-webhook
   namespace: openshift-monitoring

assets/admission-webhook/service.yaml

@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator-admission-webhook
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.73.1
+    app.kubernetes.io/version: 0.73.2
   name: prometheus-operator-admission-webhook
   namespace: openshift-monitoring
 spec:

assets/kube-state-metrics/cluster-role.yaml

@@ -128,3 +128,18 @@ rules:
   verbs:
   - list
   - watch
+- apiGroups:
+  - autoscaling.k8s.io
+  resources:
+  - verticalpodautoscalers
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - get
+  - list
+  - watch