Skip to content

Commit 0e4f052

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2531 from rhobs/automated-updates-master-versions-generate
NO-JIRA: [bot] Synchronize versions of the downstream components
2 parents 0264620 + 7240dbb commit 0e4f052

39 files changed

+56
-56
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 | 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.78.2](https://github.com/openshift/prometheus-operator/blob/release-4.20) | [0.36.1](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.78.2](https://github.com/openshift/prometheus-operator/blob/release-4.19) | [0.36.1](https://github.com/openshift/thanos/blob/release-4.19) |
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) |
55
| 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) |
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) |

‎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.78.2
8+
app.kubernetes.io/version: 0.79.2
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.78.2
30+
app.kubernetes.io/version: 0.79.2
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.78.2
50+
image: quay.io/prometheus-operator/admission-webhook:v0.79.2
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.78.2
8+
app.kubernetes.io/version: 0.79.2
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.78.2
9+
app.kubernetes.io/version: 0.79.2
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.78.2
11+
app.kubernetes.io/version: 0.79.2
1212
name: prometheus-operator-admission-webhook
1313
namespace: openshift-monitoring
1414
spec:

‎assets/prometheus-k8s/prometheus.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,12 @@ spec:
221221
openshift.io/cluster-monitoring: "true"
222222
serviceMonitorSelector: {}
223223
thanos:
224-
image: quay.io/thanos/thanos:v0.36.1
224+
image: quay.io/thanos/thanos:v0.37.2
225225
resources:
226226
requests:
227227
cpu: 1m
228228
memory: 100Mi
229-
version: 0.36.1
229+
version: 0.37.2
230230
version: 2.55.1
231231
volumes:
232232
- configMap:

‎assets/prometheus-operator-user-workload/cluster-role-binding.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/managed-by: cluster-monitoring-operator
77
app.kubernetes.io/name: prometheus-operator
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.78.2
9+
app.kubernetes.io/version: 0.79.2
1010
name: prometheus-user-workload-operator
1111
roleRef:
1212
apiGroup: rbac.authorization.k8s.io

‎assets/prometheus-operator-user-workload/cluster-role.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/managed-by: cluster-monitoring-operator
77
app.kubernetes.io/name: prometheus-operator
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.78.2
9+
app.kubernetes.io/version: 0.79.2
1010
name: prometheus-user-workload-operator
1111
rules:
1212
- apiGroups:

‎assets/prometheus-operator-user-workload/deployment.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/managed-by: cluster-monitoring-operator
77
app.kubernetes.io/name: prometheus-operator
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.78.2
9+
app.kubernetes.io/version: 0.79.2
1010
name: prometheus-operator
1111
namespace: openshift-user-workload-monitoring
1212
spec:
@@ -27,12 +27,12 @@ spec:
2727
app.kubernetes.io/managed-by: cluster-monitoring-operator
2828
app.kubernetes.io/name: prometheus-operator
2929
app.kubernetes.io/part-of: openshift-monitoring
30-
app.kubernetes.io/version: 0.78.2
30+
app.kubernetes.io/version: 0.79.2
3131
spec:
3232
automountServiceAccountToken: true
3333
containers:
3434
- args:
35-
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.78.2
35+
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.79.2
3636
- --kubelet-endpoints=true
3737
- --kubelet-endpointslice=false
3838
- --prometheus-instance-namespaces=openshift-user-workload-monitoring
@@ -47,7 +47,7 @@ spec:
4747
env:
4848
- name: GOGC
4949
value: "30"
50-
image: quay.io/prometheus-operator/prometheus-operator:v0.78.2
50+
image: quay.io/prometheus-operator/prometheus-operator:v0.79.2
5151
name: prometheus-operator
5252
ports: []
5353
resources:

‎assets/prometheus-operator-user-workload/service-account.yaml‎

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

0 commit comments

Comments
 (0)