Skip to content

Commit a9211ca

Browse files
Merge pull request #2342 from rhobs/automated-updates-master-versions-generate
MON-3856: Bump openshift/prometheus to v2.52.0
2 parents 86b6d4b + 7a81497 commit a9211ca

40 files changed

+70
-70
lines changed

Documentation/deps-versions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
| OCP Version | alertmanager | kubeRbacProxy | kubeStateMetrics | kubernetesMetricsServer | monitoringPlugin | nodeExporter | promLabelProxy | prometheus | prometheusAdapter | prometheusOperator | thanos |
22
|--------------|----------------------------------------------------------------------------------|--------------------------------------------------------------------------|-----------------------------------------------------------------------------|-----------------------------------------------------------------------------------|---------------------------------------------------------------------------|-----------------------------------------------------------------------|--------------------------------------------------------------------------|---------------------------------------------------------------------|---------------------------------------------------------------------------------|------------------------------------------------------------------------------|-----------------------------------------------------------------|
3-
| 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.8.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.35.0](https://github.com/openshift/thanos/blob/release-4.17) |
4-
| 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.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.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.35.0](https://github.com/openshift/thanos/blob/release-4.16) |
3+
| release-4.17 | [0.26.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.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.8.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.52.0](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.35.0](https://github.com/openshift/thanos/blob/release-4.17) |
4+
| 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.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.35.0](https://github.com/openshift/thanos/blob/release-4.16) |
55
| 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) |
66
| 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) |
77
| 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) |

assets/alertmanager-user-workload/alertmanager.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
- --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
3535
- --config-file=/etc/kube-rbac-proxy/config.yaml
3636
- --logtostderr=true
37-
image: quay.io/brancz/kube-rbac-proxy:v0.15.0
37+
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
3838
name: alertmanager-proxy
3939
ports:
4040
- containerPort: 9095
@@ -63,7 +63,7 @@ spec:
6363
- --tls-cert-file=/etc/tls/private/tls.crt
6464
- --tls-private-key-file=/etc/tls/private/tls.key
6565
- --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
66-
image: quay.io/brancz/kube-rbac-proxy:v0.15.0
66+
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
6767
name: tenancy-proxy
6868
ports:
6969
- containerPort: 9092
@@ -93,7 +93,7 @@ spec:
9393
- --client-ca-file=/etc/tls/client/client-ca.crt
9494
- --logtostderr=true
9595
- --allow-paths=/metrics
96-
image: quay.io/brancz/kube-rbac-proxy:v0.15.0
96+
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
9797
name: kube-rbac-proxy-metric
9898
ports:
9999
- containerPort: 9097

assets/alertmanager/alertmanager.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
- --tls-private-key-file=/etc/tls/private/tls.key
3636
- --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
3737
- --ignore-paths=/-/healthy,/-/ready
38-
image: quay.io/brancz/kube-rbac-proxy:v0.15.0
38+
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
3939
name: kube-rbac-proxy-web
4040
ports:
4141
- containerPort: 9095
@@ -59,7 +59,7 @@ spec:
5959
- --tls-cert-file=/etc/tls/private/tls.crt
6060
- --tls-private-key-file=/etc/tls/private/tls.key
6161
- --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
62-
image: quay.io/brancz/kube-rbac-proxy:v0.15.0
62+
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
6363
name: kube-rbac-proxy
6464
ports:
6565
- containerPort: 9092
@@ -83,7 +83,7 @@ spec:
8383
- --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
8484
- --client-ca-file=/etc/tls/client/client-ca.crt
8585
- --allow-paths=/metrics
86-
image: quay.io/brancz/kube-rbac-proxy:v0.15.0
86+
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
8787
name: kube-rbac-proxy-metric
8888
ports:
8989
- containerPort: 9097

assets/kube-state-metrics/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
- --tls-private-key-file=/etc/tls/private/tls.key
8080
- --client-ca-file=/etc/tls/client/client-ca.crt
8181
- --config-file=/etc/kube-rbac-policy/config.yaml
82-
image: quay.io/brancz/kube-rbac-proxy:v0.15.0
82+
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
8383
name: kube-rbac-proxy-main
8484
ports:
8585
- containerPort: 8443
@@ -108,7 +108,7 @@ spec:
108108
- --tls-private-key-file=/etc/tls/private/tls.key
109109
- --client-ca-file=/etc/tls/client/client-ca.crt
110110
- --config-file=/etc/kube-rbac-policy/config.yaml
111-
image: quay.io/brancz/kube-rbac-proxy:v0.15.0
111+
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
112112
name: kube-rbac-proxy-self
113113
ports:
114114
- containerPort: 9443

assets/node-exporter/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ spec:
9292
valueFrom:
9393
fieldRef:
9494
fieldPath: status.podIP
95-
image: quay.io/brancz/kube-rbac-proxy:v0.15.0
95+
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
9696
name: kube-rbac-proxy
9797
ports:
9898
- containerPort: 9100

assets/openshift-state-metrics/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
- --tls-private-key-file=/etc/tls/private/tls.key
3636
- --config-file=/etc/kube-rbac-policy/config.yaml
3737
- --client-ca-file=/etc/tls/client/client-ca.crt
38-
image: quay.io/brancz/kube-rbac-proxy:v0.15.0
38+
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
3939
name: kube-rbac-proxy-main
4040
ports:
4141
- containerPort: 8443
@@ -64,7 +64,7 @@ spec:
6464
- --tls-private-key-file=/etc/tls/private/tls.key
6565
- --config-file=/etc/kube-rbac-policy/config.yaml
6666
- --client-ca-file=/etc/tls/client/client-ca.crt
67-
image: quay.io/brancz/kube-rbac-proxy:v0.15.0
67+
image: quay.io/brancz/kube-rbac-proxy:v0.17.1
6868
name: kube-rbac-proxy-self
6969
ports:
7070
- containerPort: 9443

assets/prometheus-k8s/cluster-role-binding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app.kubernetes.io/managed-by: cluster-monitoring-operator
88
app.kubernetes.io/name: prometheus
99
app.kubernetes.io/part-of: openshift-monitoring
10-
app.kubernetes.io/version: 2.51.2
10+
app.kubernetes.io/version: 2.52.0
1111
name: prometheus-k8s
1212
roleRef:
1313
apiGroup: rbac.authorization.k8s.io

assets/prometheus-k8s/cluster-role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app.kubernetes.io/managed-by: cluster-monitoring-operator
88
app.kubernetes.io/name: prometheus
99
app.kubernetes.io/part-of: openshift-monitoring
10-
app.kubernetes.io/version: 2.51.2
10+
app.kubernetes.io/version: 2.52.0
1111
name: prometheus-k8s
1212
rules:
1313
- apiGroups:

assets/prometheus-k8s/pod-disruption-budget.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app.kubernetes.io/managed-by: cluster-monitoring-operator
88
app.kubernetes.io/name: prometheus
99
app.kubernetes.io/part-of: openshift-monitoring
10-
app.kubernetes.io/version: 2.51.2
10+
app.kubernetes.io/version: 2.52.0
1111
name: prometheus-k8s
1212
namespace: openshift-monitoring
1313
spec:

assets/prometheus-k8s/prometheus-rule-thanos-sidecar.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app.kubernetes.io/managed-by: cluster-monitoring-operator
88
app.kubernetes.io/name: prometheus
99
app.kubernetes.io/part-of: openshift-monitoring
10-
app.kubernetes.io/version: 2.51.2
10+
app.kubernetes.io/version: 2.52.0
1111
prometheus: k8s
1212
role: alert-rules
1313
name: prometheus-k8s-thanos-sidecar-rules

0 commit comments

Comments
 (0)