From bdc1f28c1d96def527727863a27b61004efd67f8 Mon Sep 17 00:00:00 2001 From: Pranshu Srivastava Date: Mon, 7 Oct 2024 16:00:18 +0530 Subject: [PATCH] OCPBUGS-35095: unpin `kubernetes-mixin` Unpin kubernetes-mixin to rely on the version pulled in from kube-prometheus, and update the dependencies as a result. Also, update the version manifest as well, as that changed during the tenure of this PR. Signed-off-by: Pranshu Srivastava --- Documentation/deps-versions.md | 4 +- .../alertmanager.yaml | 6 +- assets/alertmanager/alertmanager.yaml | 6 +- assets/control-plane/prometheus-rule.yaml | 18 ++- assets/kube-state-metrics/deployment.yaml | 4 +- assets/node-exporter/daemonset.yaml | 2 +- .../openshift-state-metrics/deployment.yaml | 4 +- assets/prometheus-k8s/prometheus-rule.yaml | 4 +- assets/prometheus-k8s/prometheus.yaml | 6 +- .../deployment.yaml | 2 +- assets/prometheus-operator/deployment.yaml | 2 +- .../prometheus-user-workload/prometheus.yaml | 6 +- assets/telemeter-client/deployment.yaml | 2 +- assets/thanos-querier/deployment.yaml | 8 +- assets/thanos-ruler/thanos-ruler.yaml | 4 +- jsonnet/jsonnetfile.json | 10 -- jsonnet/jsonnetfile.lock.json | 37 +++-- jsonnet/versions.yaml | 2 +- ...ger-config-custom-resource-definition.yaml | 146 +++++++++++++++++- ...ertmanager-custom-resource-definition.yaml | 2 +- ...podmonitor-custom-resource-definition.yaml | 2 +- ..._00_0probe-custom-resource-definition.yaml | 2 +- ...prometheus-custom-resource-definition.yaml | 2 +- ...etheusrule-custom-resource-definition.yaml | 2 +- ...icemonitor-custom-resource-definition.yaml | 2 +- ...hanosruler-custom-resource-definition.yaml | 2 +- 26 files changed, 213 insertions(+), 74 deletions(-) diff --git a/Documentation/deps-versions.md b/Documentation/deps-versions.md index 64a56bb4f5..fa775f17e8 100644 --- a/Documentation/deps-versions.md +++ b/Documentation/deps-versions.md @@ -1,7 +1,7 @@ | OCP Version | alertmanager | kubeRbacProxy | kubeStateMetrics | kubernetesMetricsServer | monitoringPlugin | nodeExporter | promLabelProxy | prometheus | prometheusOperator | thanos | |--------------|----------------------------------------------------------------------------------|--------------------------------------------------------------------------|-----------------------------------------------------------------------------|-----------------------------------------------------------------------------------|---------------------------------------------------------------------------|-----------------------------------------------------------------------|---------------------------------------------------------------------------|---------------------------------------------------------------------|------------------------------------------------------------------------------|-----------------------------------------------------------------| -| release-4.20 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.20) | [0.18.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.20) | [2.13.0](https://github.com/openshift/kube-state-metrics/blob/release-4.20) | [0.7.2](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.20) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.20) | [1.8.2](https://github.com/openshift/node_exporter/blob/release-4.20) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.20) | [2.55.1](https://github.com/openshift/prometheus/blob/release-4.20) | [0.78.2](https://github.com/openshift/prometheus-operator/blob/release-4.20) | [0.36.1](https://github.com/openshift/thanos/blob/release-4.20) | -| release-4.19 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.19) | [0.18.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.19) | [2.13.0](https://github.com/openshift/kube-state-metrics/blob/release-4.19) | [0.7.2](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.19) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.19) | [1.8.2](https://github.com/openshift/node_exporter/blob/release-4.19) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.19) | [2.55.1](https://github.com/openshift/prometheus/blob/release-4.19) | [0.78.2](https://github.com/openshift/prometheus-operator/blob/release-4.19) | [0.36.1](https://github.com/openshift/thanos/blob/release-4.19) | +| release-4.20 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.20) | [0.18.2](https://github.com/openshift/kube-rbac-proxy/blob/release-4.20) | [2.13.0](https://github.com/openshift/kube-state-metrics/blob/release-4.20) | [0.7.2](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.20) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.20) | [1.8.2](https://github.com/openshift/node_exporter/blob/release-4.20) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.20) | [2.55.1](https://github.com/openshift/prometheus/blob/release-4.20) | [0.78.2](https://github.com/openshift/prometheus-operator/blob/release-4.20) | [0.36.1](https://github.com/openshift/thanos/blob/release-4.20) | +| release-4.19 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.19) | [0.18.2](https://github.com/openshift/kube-rbac-proxy/blob/release-4.19) | [2.13.0](https://github.com/openshift/kube-state-metrics/blob/release-4.19) | [0.7.2](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.19) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.19) | [1.8.2](https://github.com/openshift/node_exporter/blob/release-4.19) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.19) | [2.55.1](https://github.com/openshift/prometheus/blob/release-4.19) | [0.78.2](https://github.com/openshift/prometheus-operator/blob/release-4.19) | [0.36.1](https://github.com/openshift/thanos/blob/release-4.19) | | release-4.18 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.18) | [0.18.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.18) | [2.13.0](https://github.com/openshift/kube-state-metrics/blob/release-4.18) | [0.7.2](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.18) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.18) | [1.8.2](https://github.com/openshift/node_exporter/blob/release-4.18) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.18) | [2.55.1](https://github.com/openshift/prometheus/blob/release-4.18) | [0.78.1](https://github.com/openshift/prometheus-operator/blob/release-4.18) | [0.36.1](https://github.com/openshift/thanos/blob/release-4.18) | | release-4.17 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.17) | [0.17.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.17) | [2.13.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.8.2](https://github.com/openshift/node_exporter/blob/release-4.17) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.17) | [2.53.1](https://github.com/openshift/prometheus/blob/release-4.17) | [0.75.2](https://github.com/openshift/prometheus-operator/blob/release-4.17) | [0.35.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.17.1](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.8.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.52.0](https://github.com/openshift/prometheus/blob/release-4.16) | [0.73.2](https://github.com/openshift/prometheus-operator/blob/release-4.16) | [0.35.0](https://github.com/openshift/thanos/blob/release-4.16) | diff --git a/assets/alertmanager-user-workload/alertmanager.yaml b/assets/alertmanager-user-workload/alertmanager.yaml index 6793958b3f..476f074d65 100644 --- a/assets/alertmanager-user-workload/alertmanager.yaml +++ b/assets/alertmanager-user-workload/alertmanager.yaml @@ -43,7 +43,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --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 - --config-file=/etc/kube-rbac-proxy/config.yaml - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: alertmanager-proxy ports: - containerPort: 9095 @@ -72,7 +72,7 @@ spec: - --tls-cert-file=/etc/tls/private/tls.crt - --tls-private-key-file=/etc/tls/private/tls.key - --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 - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: tenancy-proxy ports: - containerPort: 9092 @@ -101,7 +101,7 @@ spec: - --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 - --client-ca-file=/etc/tls/client/client-ca.crt - --allow-paths=/metrics - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-metric ports: - containerPort: 9097 diff --git a/assets/alertmanager/alertmanager.yaml b/assets/alertmanager/alertmanager.yaml index 05acd2d1f1..b5ba5f93b6 100644 --- a/assets/alertmanager/alertmanager.yaml +++ b/assets/alertmanager/alertmanager.yaml @@ -44,7 +44,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --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 - --ignore-paths=/-/healthy,/-/ready - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-web ports: - containerPort: 9095 @@ -68,7 +68,7 @@ spec: - --tls-cert-file=/etc/tls/private/tls.crt - --tls-private-key-file=/etc/tls/private/tls.key - --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 - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 9092 @@ -92,7 +92,7 @@ spec: - --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 - --client-ca-file=/etc/tls/client/client-ca.crt - --allow-paths=/metrics - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-metric ports: - containerPort: 9097 diff --git a/assets/control-plane/prometheus-rule.yaml b/assets/control-plane/prometheus-rule.yaml index c477f58dbb..3ddb93eb88 100644 --- a/assets/control-plane/prometheus-rule.yaml +++ b/assets/control-plane/prometheus-rule.yaml @@ -94,7 +94,7 @@ spec: summary: StatefulSet update has not been rolled out. expr: | ( - max without (revision) ( + max by(namespace, statefulset, job, cluster) ( kube_statefulset_status_current_revision{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics"} unless kube_statefulset_status_update_revision{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics"} @@ -146,10 +146,10 @@ spec: severity: warning - alert: KubeContainerWaiting annotations: - description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }} on container {{ $labels.container}} has been in waiting state for longer than 1 hour. + description: 'pod/{{ $labels.pod }} in namespace {{ $labels.namespace }} on container {{ $labels.container}} has been in waiting state for longer than 1 hour. (reason: "{{ $labels.reason }}").' summary: Pod container waiting longer than 1 hour expr: | - sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics"}) > 0 + kube_pod_container_status_waiting_reason{reason!="CrashLoopBackOff", namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics"} > 0 for: 1h labels: severity: warning @@ -232,7 +232,7 @@ spec: description: Cluster {{ $labels.cluster }} has overcommitted CPU resource requests for Pods by {{ $value }} CPU shares and cannot tolerate node failure. summary: Cluster has overcommitted CPU resource requests. expr: | - sum(namespace_cpu:kube_pod_container_resource_requests:sum{job="kube-state-metrics",}) by (cluster) - (sum(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster) - max(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster)) > 0 + sum(namespace_cpu:kube_pod_container_resource_requests:sum{}) by (cluster) - (sum(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster) - max(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster)) > 0 and (sum(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster) - max(kube_node_status_allocatable{job="kube-state-metrics",resource="cpu"}) by (cluster)) > 0 for: 10m @@ -336,7 +336,7 @@ spec: description: The kubernetes apiserver has terminated {{ $value | humanizePercentage }} of its incoming requests. summary: The kubernetes apiserver has terminated {{ $value | humanizePercentage }} of its incoming requests. expr: | - sum(rate(apiserver_request_terminations_total{job="apiserver"}[10m])) / ( sum(rate(apiserver_request_total{job="apiserver"}[10m])) + sum(rate(apiserver_request_terminations_total{job="apiserver"}[10m])) ) > 0.20 + sum by(cluster) (rate(apiserver_request_terminations_total{job="apiserver"}[10m])) / ( sum by(cluster) (rate(apiserver_request_total{job="apiserver"}[10m])) + sum by(cluster) (rate(apiserver_request_terminations_total{job="apiserver"}[10m])) ) > 0.20 for: 5m labels: severity: warning @@ -477,7 +477,7 @@ spec: max by(cluster, namespace, pod, node) (kube_pod_info{node!=""}) ) record: node_namespace_pod_container:container_memory_swap - - name: k8s.rules.container_resource + - name: k8s.rules.container_memory_requests rules: - expr: | kube_pod_container_resource_requests{resource="memory",job="kube-state-metrics"} * on (namespace, pod, cluster) @@ -496,6 +496,8 @@ spec: ) ) record: namespace_memory:kube_pod_container_resource_requests:sum + - name: k8s.rules.container_cpu_requests + rules: - expr: | kube_pod_container_resource_requests{resource="cpu",job="kube-state-metrics"} * on (namespace, pod, cluster) group_left() max by (namespace, pod, cluster) ( @@ -513,6 +515,8 @@ spec: ) ) record: namespace_cpu:kube_pod_container_resource_requests:sum + - name: k8s.rules.container_memory_limits + rules: - expr: | kube_pod_container_resource_limits{resource="memory",job="kube-state-metrics"} * on (namespace, pod, cluster) group_left() max by (namespace, pod, cluster) ( @@ -530,6 +534,8 @@ spec: ) ) record: namespace_memory:kube_pod_container_resource_limits:sum + - name: k8s.rules.container_cpu_limits + rules: - expr: | kube_pod_container_resource_limits{resource="cpu",job="kube-state-metrics"} * on (namespace, pod, cluster) group_left() max by (namespace, pod, cluster) ( diff --git a/assets/kube-state-metrics/deployment.yaml b/assets/kube-state-metrics/deployment.yaml index ec651432e7..6c2ff57cf7 100644 --- a/assets/kube-state-metrics/deployment.yaml +++ b/assets/kube-state-metrics/deployment.yaml @@ -79,7 +79,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --client-ca-file=/etc/tls/client/client-ca.crt - --config-file=/etc/kube-rbac-policy/config.yaml - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-main ports: - containerPort: 8443 @@ -108,7 +108,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --client-ca-file=/etc/tls/client/client-ca.crt - --config-file=/etc/kube-rbac-policy/config.yaml - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-self ports: - containerPort: 9443 diff --git a/assets/node-exporter/daemonset.yaml b/assets/node-exporter/daemonset.yaml index af4ccc7fad..1e939e6d35 100644 --- a/assets/node-exporter/daemonset.yaml +++ b/assets/node-exporter/daemonset.yaml @@ -93,7 +93,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 9100 diff --git a/assets/openshift-state-metrics/deployment.yaml b/assets/openshift-state-metrics/deployment.yaml index 98cf276156..08f8932b7c 100644 --- a/assets/openshift-state-metrics/deployment.yaml +++ b/assets/openshift-state-metrics/deployment.yaml @@ -34,7 +34,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --config-file=/etc/kube-rbac-policy/config.yaml - --client-ca-file=/etc/tls/client/client-ca.crt - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-main ports: - containerPort: 8443 @@ -62,7 +62,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --config-file=/etc/kube-rbac-policy/config.yaml - --client-ca-file=/etc/tls/client/client-ca.crt - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-self ports: - containerPort: 9443 diff --git a/assets/prometheus-k8s/prometheus-rule.yaml b/assets/prometheus-k8s/prometheus-rule.yaml index 819a8e8fa5..ea7a9f2206 100644 --- a/assets/prometheus-k8s/prometheus-rule.yaml +++ b/assets/prometheus-k8s/prometheus-rule.yaml @@ -62,8 +62,8 @@ spec: severity: warning - alert: PrometheusErrorSendingAlertsToSomeAlertmanagers annotations: - description: '{{ printf "%.1f" $value }}% errors while sending alerts from Prometheus {{$labels.namespace}}/{{$labels.pod}} to Alertmanager {{$labels.alertmanager}}.' - summary: Prometheus has encountered more than 1% errors sending alerts to a specific Alertmanager. + description: '{{ printf "%.1f" $value }}% of alerts sent by Prometheus {{$labels.namespace}}/{{$labels.pod}} to Alertmanager {{$labels.alertmanager}} were affected by errors.' + summary: More than 1% of alerts sent by Prometheus to a specific Alertmanager were affected by errors. expr: | ( rate(prometheus_notifications_errors_total{job=~"prometheus-k8s|prometheus-user-workload"}[5m]) diff --git a/assets/prometheus-k8s/prometheus.yaml b/assets/prometheus-k8s/prometheus.yaml index 36761a9f00..a0adc06b8a 100644 --- a/assets/prometheus-k8s/prometheus.yaml +++ b/assets/prometheus-k8s/prometheus.yaml @@ -56,7 +56,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --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 - --ignore-paths=/-/healthy,/-/ready - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-web ports: - containerPort: 9091 @@ -85,7 +85,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --client-ca-file=/etc/tls/client/client-ca.crt - --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 - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 9092 @@ -117,7 +117,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-thanos ports: - containerPort: 10903 diff --git a/assets/prometheus-operator-user-workload/deployment.yaml b/assets/prometheus-operator-user-workload/deployment.yaml index 5702fb823c..aa198e15f8 100644 --- a/assets/prometheus-operator-user-workload/deployment.yaml +++ b/assets/prometheus-operator-user-workload/deployment.yaml @@ -69,7 +69,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --config-file=/etc/kube-rbac-policy/config.yaml - --client-ca-file=/etc/tls/client/client-ca.crt - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/assets/prometheus-operator/deployment.yaml b/assets/prometheus-operator/deployment.yaml index f89a9e35de..ace3b983e0 100644 --- a/assets/prometheus-operator/deployment.yaml +++ b/assets/prometheus-operator/deployment.yaml @@ -70,7 +70,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --client-ca-file=/etc/tls/client/client-ca.crt - --config-file=/etc/kube-rbac-policy/config.yaml - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/assets/prometheus-user-workload/prometheus.yaml b/assets/prometheus-user-workload/prometheus.yaml index 07eafc7212..5f20016952 100644 --- a/assets/prometheus-user-workload/prometheus.yaml +++ b/assets/prometheus-user-workload/prometheus.yaml @@ -54,7 +54,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --client-ca-file=/etc/tls/client/client-ca.crt - --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 - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-federate ports: - containerPort: 9092 @@ -86,7 +86,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --client-ca-file=/etc/tls/client/client-ca.crt - --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 - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-metrics ports: - containerPort: 9091 @@ -123,7 +123,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-thanos ports: - containerPort: 10903 diff --git a/assets/telemeter-client/deployment.yaml b/assets/telemeter-client/deployment.yaml index 4848074187..fee344c014 100644 --- a/assets/telemeter-client/deployment.yaml +++ b/assets/telemeter-client/deployment.yaml @@ -96,7 +96,7 @@ spec: - --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 - --config-file=/etc/kube-rbac-policy/config.yaml - --client-ca-file=/etc/tls/client/client-ca.crt - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 8443 diff --git a/assets/thanos-querier/deployment.yaml b/assets/thanos-querier/deployment.yaml index c4d991b628..249d3adb3a 100644 --- a/assets/thanos-querier/deployment.yaml +++ b/assets/thanos-querier/deployment.yaml @@ -98,7 +98,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --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 - --ignore-paths=/-/healthy,/-/ready - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 livenessProbe: failureThreshold: 4 httpGet: @@ -142,7 +142,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --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 - --allow-paths=/api/v1/query,/api/v1/query_range,/api/v1/labels,/api/v1/label/*/values,/api/v1/series - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy ports: - containerPort: 9092 @@ -189,7 +189,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --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 - --allow-paths=/api/v1/rules,/api/v1/alerts - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-rules ports: - containerPort: 9093 @@ -218,7 +218,7 @@ spec: - --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 - --client-ca-file=/etc/tls/client/client-ca.crt - --allow-paths=/metrics - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-metrics ports: - containerPort: 9094 diff --git a/assets/thanos-ruler/thanos-ruler.yaml b/assets/thanos-ruler/thanos-ruler.yaml index 32f3765315..0e782bef03 100644 --- a/assets/thanos-ruler/thanos-ruler.yaml +++ b/assets/thanos-ruler/thanos-ruler.yaml @@ -44,7 +44,7 @@ spec: - --config-file=/etc/kube-rbac-proxy/config.yaml - --tls-cert-file=/etc/tls/private/tls.crt - --tls-private-key-file=/etc/tls/private/tls.key - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-web ports: - containerPort: 9091 @@ -74,7 +74,7 @@ spec: - --tls-private-key-file=/etc/tls/private/tls.key - --client-ca-file=/etc/tls/client/client-ca.crt - --allow-paths=/metrics - image: quay.io/brancz/kube-rbac-proxy:v0.18.1 + image: quay.io/brancz/kube-rbac-proxy:v0.18.2 name: kube-rbac-proxy-metrics ports: - containerPort: 9092 diff --git a/jsonnet/jsonnetfile.json b/jsonnet/jsonnetfile.json index c887a826ea..3e26683d69 100644 --- a/jsonnet/jsonnetfile.json +++ b/jsonnet/jsonnetfile.json @@ -56,16 +56,6 @@ } }, "version": "main" - }, - { - "name": "kubernetes-mixin is pinned because newer versions are breaking MON-3837", - "source": { - "git": { - "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git", - "subdir": "" - } - }, - "version": "b247371d1780f530587a8d9dd04ccb19ea970ba0" } ], "legacyImports": true diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json index 4e456a6664..1196a136e3 100644 --- a/jsonnet/jsonnetfile.lock.json +++ b/jsonnet/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "bd8896364a1d9adb554b538232004e5b2d6c850a", + "version": "b0387393a212a0a6be40851ab61d50f2d1ce8bb5", "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws=" }, { @@ -88,7 +88,7 @@ "subdir": "grafana-builder" } }, - "version": "ab84b9f67c7a7f61e0c0a311afb47a1af4f5903f", + "version": "57b0b85dc1d7ed5e30c2e41f3bd26744b8aef519", "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo=" }, { @@ -129,9 +129,8 @@ "subdir": "" } }, - "version": "b247371d1780f530587a8d9dd04ccb19ea970ba0", - "sum": "7M2QHK3WhOc1xT7T7KhL9iKsCYTfsIXpmcItffAcbL0=", - "name": "kubernetes-mixin is pinned because newer versions are breaking MON-3837" + "version": "a3fbf21977deb89b7d843eb8371170c011ea6835", + "sum": "57zW2IGJ9zbYd8BI0qe6JkoWTRSMNiBUWC6+YcnEsWo=" }, { "source": { @@ -140,7 +139,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "0738de0be2ba1607aac8b58a0d783891664d48a9", + "version": "32e7727ff4613b0f55dfc18aff15afb8c04d03c5", "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4=" }, { @@ -150,7 +149,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "0738de0be2ba1607aac8b58a0d783891664d48a9", + "version": "32e7727ff4613b0f55dfc18aff15afb8c04d03c5", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -171,8 +170,8 @@ "subdir": "jsonnet/telemeter" } }, - "version": "0453f452b7ca677e3be10faa95bea714733b4830", - "sum": "0m1kvO0SH4YoldGek69nhBGMTPxYz3gYcyNhfrymAOE=", + "version": "700802fe29aba4ed602309f0c68222c4bedb08f5", + "sum": "53k2pqb4mjABCulTT/H5d7pQDiemIOO23gzfon7g9K4=", "name": "telemeter-client" }, { @@ -182,8 +181,8 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "69d9636b64192418d64912c032f5437361e88ea5", - "sum": "W4HnSyscMMutOCaDyjNZy1XXcdhRPibYuV1yVgqxXm0=" + "version": "7e5a571a3fb735c78e17c76a637eb7e8bb5dd086", + "sum": "uTw/Mj+X91S+oqUpAX81xcfWPDlox0tdSZY/YBw7nGE=" }, { "source": { @@ -192,7 +191,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "3c35a6d7baf761cc2e4426d508528e913cc9aab2", + "version": "18155805bb93800e6ad0d2533873e54d0c6cf7d6", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -203,8 +202,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "40104e6b861f6794243d65a11ef5ba3bc356e121", - "sum": "rgCAJulmuWjMCgd17hyaw4CE/G52MnPZH8Bd6kLmnW4=" + "version": "9efea40e09ee6d80627c40b0ef208af200ecd7d5", + "sum": "C4oz34hEILHHKOHgaI+XvZur0cKObfU+cYy30e5tApQ=" }, { "source": { @@ -213,7 +212,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "ff8c09d60174f27850830ceed6be38b3cf86974b", + "version": "0f65e8fa5fc72d2678655105c0213b416ca6f34c", "sum": "Mf4h1BYLle2nrgjf/HXrBbl0Zk8N+xaoEM017o0BC+k=", "name": "alertmanager" }, @@ -224,7 +223,7 @@ "subdir": "docs/node-mixin" } }, - "version": "07ee8efaa4f8e7260eb8611f3f42973cbbf8ce8f", + "version": "cf8c6891cc610e54f70383addd4bb6079f0add35", "sum": "cQCW+1N0Xae5yXecCWDK2oAlN0luBS/5GrwBYSlaFms=" }, { @@ -234,8 +233,8 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "3c5551df68442dd07668987e0685d12d9c3138dd", - "sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=", + "version": "48287b15d4fe3a2c9578982bdffeccdc0e14d1ef", + "sum": "OYT5u3S8DbamuJV/v3gbWSteOvFzMeNwMj+u4Apk7jM=", "name": "prometheus" }, { @@ -266,7 +265,7 @@ "subdir": "mixin" } }, - "version": "df3df36986e07b21aaa88adefb5fbf0b648129b8", + "version": "51fddeb28d78ffcc67e38117c5f6294932800ec9", "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=" } ], diff --git a/jsonnet/versions.yaml b/jsonnet/versions.yaml index b48b9b47e9..4f0d538acd 100644 --- a/jsonnet/versions.yaml +++ b/jsonnet/versions.yaml @@ -15,7 +15,7 @@ repos: thanos: openshift/thanos versions: alertmanager: 0.27.0 - kubeRbacProxy: 0.18.1 + kubeRbacProxy: 0.18.2 kubeStateMetrics: 2.13.0 kubernetesMetricsServer: 0.7.2 monitoringPlugin: 1.0.0 diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml index 7303d9abee..06f1129d6f 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 service.beta.openshift.io/inject-cabundle: "true" labels: app.kubernetes.io/managed-by: cluster-version-operator @@ -738,6 +738,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -1641,6 +1647,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -2369,6 +2381,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -3083,6 +3101,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -3821,6 +3845,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -4654,6 +4684,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -5325,6 +5361,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -6088,6 +6130,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -6783,6 +6831,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -7438,6 +7492,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -8082,6 +8142,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -8787,6 +8853,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -9677,6 +9749,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -10559,6 +10637,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -11273,6 +11357,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -11981,6 +12071,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -12698,6 +12794,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -13503,6 +13605,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -14167,6 +14275,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -14916,6 +15030,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -15597,6 +15717,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -16243,6 +16369,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -16880,6 +17012,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -17564,6 +17702,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml index 0e40aea964..a289c512c1 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml index 1068cdfac2..79349f8a33 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml index a43a2d569e..1832de1e7e 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml index 419e2fbb8f..d25c93a7e3 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0prometheus-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml index b92f011efe..e03b4be79d 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0prometheusrule-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml index e2d2e9e3ed..0e75a78b0c 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0servicemonitor-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml b/manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml index 72834063e2..cda8e44bb2 100644 --- a/manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml +++ b/manifests/0000_50_cluster-monitoring-operator_00_0thanosruler-custom-resource-definition.yaml @@ -7,7 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 labels: app.kubernetes.io/managed-by: cluster-version-operator app.kubernetes.io/part-of: openshift-monitoring