Skip to content

Commit 2cc7dad

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2577 from rhobs/automated-updates-main-versions-generate
NO-JIRA: [bot] Synchronize versions of the downstream components
2 parents 17769b6 + 6c012ec commit 2cc7dad

File tree

73 files changed

+130
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+130
-130
lines changed

‎Documentation/deps-versions.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
| OCP Version | alertmanager | kubeRbacProxy | kubeStateMetrics | kubernetesMetricsServer | monitoringPlugin | nodeExporter | promLabelProxy | prometheus | prometheusOperator | thanos |
22
|--------------|----------------------------------------------------------------------------------|--------------------------------------------------------------------------|-----------------------------------------------------------------------------|-----------------------------------------------------------------------------------|---------------------------------------------------------------------------|-----------------------------------------------------------------------|---------------------------------------------------------------------------|---------------------------------------------------------------------|------------------------------------------------------------------------------|-----------------------------------------------------------------|
3-
| 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.79.2](https://github.com/openshift/prometheus-operator/blob/release-4.20) | [0.37.2](https://github.com/openshift/thanos/blob/release-4.20) |
4-
| 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.79.2](https://github.com/openshift/prometheus-operator/blob/release-4.19) | [0.37.2](https://github.com/openshift/thanos/blob/release-4.19) |
5-
| 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) |
3+
| release-4.20 | [0.28.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.20) | [0.19.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.20) | [2.15.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) | [3.0.1](https://github.com/openshift/prometheus/blob/release-4.20) | [0.80.1](https://github.com/openshift/prometheus-operator/blob/release-4.20) | [0.37.2](https://github.com/openshift/thanos/blob/release-4.20) |
4+
| release-4.19 | [0.28.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.19) | [0.19.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.19) | [2.15.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) | [3.0.1](https://github.com/openshift/prometheus/blob/release-4.19) | [0.80.1](https://github.com/openshift/prometheus-operator/blob/release-4.19) | [0.37.2](https://github.com/openshift/thanos/blob/release-4.19) |
5+
| 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.2](https://github.com/openshift/prometheus-operator/blob/release-4.18) | [0.36.1](https://github.com/openshift/thanos/blob/release-4.18) |
66
| 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) |
77
| 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) |
88
| 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.70.0](https://github.com/openshift/prometheus-operator/blob/release-4.15) | [0.32.5](https://github.com/openshift/thanos/blob/release-4.15) |

‎assets/admission-webhook/deployment.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/managed-by: cluster-monitoring-operator
66
app.kubernetes.io/name: prometheus-operator-admission-webhook
77
app.kubernetes.io/part-of: openshift-monitoring
8-
app.kubernetes.io/version: 0.79.2
8+
app.kubernetes.io/version: 0.80.1
99
name: prometheus-operator-admission-webhook
1010
namespace: openshift-monitoring
1111
spec:
@@ -27,7 +27,7 @@ spec:
2727
app.kubernetes.io/managed-by: cluster-monitoring-operator
2828
app.kubernetes.io/name: prometheus-operator-admission-webhook
2929
app.kubernetes.io/part-of: openshift-monitoring
30-
app.kubernetes.io/version: 0.79.2
30+
app.kubernetes.io/version: 0.80.1
3131
spec:
3232
affinity:
3333
podAntiAffinity:
@@ -47,7 +47,7 @@ spec:
4747
- --web.key-file=/etc/tls/private/tls.key
4848
- --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
4949
- --web.tls-min-version=VersionTLS12
50-
image: quay.io/prometheus-operator/admission-webhook:v0.79.2
50+
image: quay.io/prometheus-operator/admission-webhook:v0.80.1
5151
livenessProbe:
5252
httpGet:
5353
path: /healthz

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/managed-by: cluster-monitoring-operator
66
app.kubernetes.io/name: prometheus-operator-admission-webhook
77
app.kubernetes.io/part-of: openshift-monitoring
8-
app.kubernetes.io/version: 0.79.2
8+
app.kubernetes.io/version: 0.80.1
99
name: prometheus-operator-admission-webhook
1010
namespace: openshift-monitoring
1111
spec:

‎assets/admission-webhook/service-account.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ metadata:
66
app.kubernetes.io/managed-by: cluster-monitoring-operator
77
app.kubernetes.io/name: prometheus-operator-admission-webhook
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.79.2
9+
app.kubernetes.io/version: 0.80.1
1010
name: prometheus-operator-admission-webhook
1111
namespace: openshift-monitoring

‎assets/admission-webhook/service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
app.kubernetes.io/managed-by: cluster-monitoring-operator
99
app.kubernetes.io/name: prometheus-operator-admission-webhook
1010
app.kubernetes.io/part-of: openshift-monitoring
11-
app.kubernetes.io/version: 0.79.2
11+
app.kubernetes.io/version: 0.80.1
1212
name: prometheus-operator-admission-webhook
1313
namespace: openshift-monitoring
1414
spec:

‎assets/alertmanager-user-workload/alertmanager.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
app.kubernetes.io/managed-by: cluster-monitoring-operator
1010
app.kubernetes.io/name: alertmanager
1111
app.kubernetes.io/part-of: openshift-monitoring
12-
app.kubernetes.io/version: 0.27.0
12+
app.kubernetes.io/version: 0.28.0
1313
name: user-workload
1414
namespace: openshift-user-workload-monitoring
1515
spec:
@@ -43,7 +43,7 @@ spec:
4343
- --tls-private-key-file=/etc/tls/private/tls.key
4444
- --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
4545
- --config-file=/etc/kube-rbac-proxy/config.yaml
46-
image: quay.io/brancz/kube-rbac-proxy:v0.18.2
46+
image: quay.io/brancz/kube-rbac-proxy:v0.19.0
4747
name: alertmanager-proxy
4848
ports:
4949
- containerPort: 9095
@@ -72,7 +72,7 @@ spec:
7272
- --tls-cert-file=/etc/tls/private/tls.crt
7373
- --tls-private-key-file=/etc/tls/private/tls.key
7474
- --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
75-
image: quay.io/brancz/kube-rbac-proxy:v0.18.2
75+
image: quay.io/brancz/kube-rbac-proxy:v0.19.0
7676
name: tenancy-proxy
7777
ports:
7878
- containerPort: 9092
@@ -101,7 +101,7 @@ spec:
101101
- --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
102102
- --client-ca-file=/etc/tls/client/client-ca.crt
103103
- --allow-paths=/metrics
104-
image: quay.io/brancz/kube-rbac-proxy:v0.18.2
104+
image: quay.io/brancz/kube-rbac-proxy:v0.19.0
105105
name: kube-rbac-proxy-metric
106106
ports:
107107
- containerPort: 9097
@@ -143,7 +143,7 @@ spec:
143143
drop:
144144
- ALL
145145
terminationMessagePolicy: FallbackToLogsOnError
146-
image: quay.io/prometheus/alertmanager:v0.27.0
146+
image: quay.io/prometheus/alertmanager:v0.28.0
147147
listenLocal: true
148148
nodeSelector:
149149
kubernetes.io/os: linux
@@ -155,7 +155,7 @@ spec:
155155
app.kubernetes.io/instance: user-workload
156156
app.kubernetes.io/name: alertmanager
157157
app.kubernetes.io/part-of: openshift-monitoring
158-
app.kubernetes.io/version: 0.27.0
158+
app.kubernetes.io/version: 0.28.0
159159
priorityClassName: system-cluster-critical
160160
replicas: 2
161161
resources:
@@ -174,7 +174,7 @@ spec:
174174
seccompProfile:
175175
type: RuntimeDefault
176176
serviceAccountName: alertmanager-user-workload
177-
version: 0.27.0
177+
version: 0.28.0
178178
volumeMounts:
179179
- mountPath: /etc/pki/ca-trust/extracted/pem/
180180
name: alertmanager-trusted-ca-bundle

‎assets/alertmanager-user-workload/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: alertmanager
99
app.kubernetes.io/part-of: openshift-monitoring
10-
app.kubernetes.io/version: 0.27.0
10+
app.kubernetes.io/version: 0.28.0
1111
name: alertmanager-user-workload
1212
namespace: openshift-user-workload-monitoring
1313
spec:

‎assets/alertmanager-user-workload/secret.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: alertmanager
99
app.kubernetes.io/part-of: openshift-monitoring
10-
app.kubernetes.io/version: 0.27.0
10+
app.kubernetes.io/version: 0.28.0
1111
name: alertmanager-user-workload
1212
namespace: openshift-user-workload-monitoring
1313
stringData:

‎assets/alertmanager-user-workload/service-account.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ metadata:
88
app.kubernetes.io/managed-by: cluster-monitoring-operator
99
app.kubernetes.io/name: alertmanager
1010
app.kubernetes.io/part-of: openshift-monitoring
11-
app.kubernetes.io/version: 0.27.0
11+
app.kubernetes.io/version: 0.28.0
1212
name: alertmanager-user-workload
1313
namespace: openshift-user-workload-monitoring

‎assets/alertmanager-user-workload/service-monitor.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: alertmanager
99
app.kubernetes.io/part-of: openshift-monitoring
10-
app.kubernetes.io/version: 0.27.0
10+
app.kubernetes.io/version: 0.28.0
1111
name: alertmanager-user-workload
1212
namespace: openshift-user-workload-monitoring
1313
spec:

0 commit comments

Comments
 (0)