Skip to content

Commit 4bdf151

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2150 from rhobs/automated-updates-master-versions-generate
MON-3503: Synchronize versions of the downstream components
2 parents c0bd88e + 28765e2 commit 4bdf151

File tree

61 files changed

+89
-89
lines changed

Some content is hidden

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

61 files changed

+89
-89
lines changed

‎assets/admission-webhook/deployment.yaml

+3-3
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.68.0
8+
app.kubernetes.io/version: 0.69.1
99
name: prometheus-operator-admission-webhook
1010
namespace: openshift-monitoring
1111
spec:
@@ -26,7 +26,7 @@ spec:
2626
app.kubernetes.io/managed-by: cluster-monitoring-operator
2727
app.kubernetes.io/name: prometheus-operator-admission-webhook
2828
app.kubernetes.io/part-of: openshift-monitoring
29-
app.kubernetes.io/version: 0.68.0
29+
app.kubernetes.io/version: 0.69.1
3030
spec:
3131
affinity:
3232
podAntiAffinity:
@@ -46,7 +46,7 @@ spec:
4646
- --web.key-file=/etc/tls/private/tls.key
4747
- --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
4848
- --web.tls-min-version=VersionTLS12
49-
image: quay.io/prometheus-operator/admission-webhook:v0.68.0
49+
image: quay.io/prometheus-operator/admission-webhook:v0.69.1
5050
livenessProbe:
5151
httpGet:
5252
path: /healthz

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

+1-1
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.68.0
8+
app.kubernetes.io/version: 0.69.1
99
name: prometheus-operator-admission-webhook
1010
namespace: openshift-monitoring
1111
spec:

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

+1-1
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.68.0
9+
app.kubernetes.io/version: 0.69.1
1010
name: prometheus-operator-admission-webhook
1111
namespace: openshift-monitoring

‎assets/admission-webhook/service.yaml

+1-1
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-operator-admission-webhook
99
app.kubernetes.io/part-of: openshift-monitoring
10-
app.kubernetes.io/version: 0.68.0
10+
app.kubernetes.io/version: 0.69.1
1111
name: prometheus-operator-admission-webhook
1212
namespace: openshift-monitoring
1313
spec:

‎assets/prometheus-adapter/api-service.yaml

+1-1
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-adapter
1010
app.kubernetes.io/part-of: openshift-monitoring
11-
app.kubernetes.io/version: 0.11.1
11+
app.kubernetes.io/version: 0.11.2
1212
name: v1beta1.metrics.k8s.io
1313
spec:
1414
group: metrics.k8s.io

‎assets/prometheus-adapter/cluster-role-aggregated-metrics-reader.yaml

+1-1
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-adapter
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.11.1
9+
app.kubernetes.io/version: 0.11.2
1010
rbac.authorization.k8s.io/aggregate-to-admin: "true"
1111
rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true"
1212
rbac.authorization.k8s.io/aggregate-to-edit: "true"

‎assets/prometheus-adapter/cluster-role-binding-delegator.yaml

+1-1
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-adapter
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.11.1
9+
app.kubernetes.io/version: 0.11.2
1010
name: resource-metrics:system:auth-delegator
1111
roleRef:
1212
apiGroup: rbac.authorization.k8s.io

‎assets/prometheus-adapter/cluster-role-binding.yaml

+1-1
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-adapter
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.11.1
9+
app.kubernetes.io/version: 0.11.2
1010
name: prometheus-adapter
1111
roleRef:
1212
apiGroup: rbac.authorization.k8s.io

‎assets/prometheus-adapter/cluster-role-server-resources.yaml

+1-1
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-adapter
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.11.1
9+
app.kubernetes.io/version: 0.11.2
1010
name: resource-metrics-server-resources
1111
rules:
1212
- apiGroups:

‎assets/prometheus-adapter/cluster-role.yaml

+1-1
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-adapter
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.11.1
9+
app.kubernetes.io/version: 0.11.2
1010
name: prometheus-adapter
1111
rules:
1212
- apiGroups:

‎assets/prometheus-adapter/config-map-dedicated-service-monitors.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ metadata:
6565
app.kubernetes.io/managed-by: cluster-monitoring-operator
6666
app.kubernetes.io/name: prometheus-adapter
6767
app.kubernetes.io/part-of: openshift-monitoring
68-
app.kubernetes.io/version: 0.11.1
68+
app.kubernetes.io/version: 0.11.2
6969
name: adapter-config-dedicated-sm
7070
namespace: openshift-monitoring

‎assets/prometheus-adapter/config-map.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ metadata:
6565
app.kubernetes.io/managed-by: cluster-monitoring-operator
6666
app.kubernetes.io/name: prometheus-adapter
6767
app.kubernetes.io/part-of: openshift-monitoring
68-
app.kubernetes.io/version: 0.11.1
68+
app.kubernetes.io/version: 0.11.2
6969
name: adapter-config
7070
namespace: openshift-monitoring

‎assets/prometheus-adapter/deployment.yaml

+3-3
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-adapter
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.11.1
9+
app.kubernetes.io/version: 0.11.2
1010
name: prometheus-adapter
1111
namespace: openshift-monitoring
1212
spec:
@@ -29,7 +29,7 @@ spec:
2929
app.kubernetes.io/managed-by: cluster-monitoring-operator
3030
app.kubernetes.io/name: prometheus-adapter
3131
app.kubernetes.io/part-of: openshift-monitoring
32-
app.kubernetes.io/version: 0.11.1
32+
app.kubernetes.io/version: 0.11.2
3333
spec:
3434
affinity:
3535
podAntiAffinity:
@@ -52,7 +52,7 @@ spec:
5252
- --secure-port=6443
5353
- --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
5454
- --disable-http2
55-
image: kubernetes-sigs/prometheus-adapter:v0.11.1
55+
image: kubernetes-sigs/prometheus-adapter:v0.11.2
5656
livenessProbe:
5757
failureThreshold: 5
5858
httpGet:

‎assets/prometheus-adapter/minimal-service-monitor.yaml

+1-1
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-adapter
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.11.1
9+
app.kubernetes.io/version: 0.11.2
1010
monitoring.openshift.io/collection-profile: minimal
1111
name: prometheus-adapter-minimal
1212
namespace: openshift-monitoring

‎assets/prometheus-adapter/pod-disruption-budget.yaml

+1-1
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-adapter
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.11.1
9+
app.kubernetes.io/version: 0.11.2
1010
name: prometheus-adapter
1111
namespace: openshift-monitoring
1212
spec:

‎assets/prometheus-adapter/role-binding-auth-reader.yaml

+1-1
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-adapter
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.11.1
9+
app.kubernetes.io/version: 0.11.2
1010
name: resource-metrics-auth-reader
1111
namespace: kube-system
1212
roleRef:

‎assets/prometheus-adapter/service-account.yaml

+1-1
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-adapter
99
app.kubernetes.io/part-of: openshift-monitoring
10-
app.kubernetes.io/version: 0.11.1
10+
app.kubernetes.io/version: 0.11.2
1111
name: prometheus-adapter
1212
namespace: openshift-monitoring

‎assets/prometheus-adapter/service-monitor.yaml

+1-1
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-adapter
88
app.kubernetes.io/part-of: openshift-monitoring
9-
app.kubernetes.io/version: 0.11.1
9+
app.kubernetes.io/version: 0.11.2
1010
monitoring.openshift.io/collection-profile: full
1111
name: prometheus-adapter
1212
namespace: openshift-monitoring

‎assets/prometheus-adapter/service.yaml

+1-1
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-adapter
1010
app.kubernetes.io/part-of: openshift-monitoring
11-
app.kubernetes.io/version: 0.11.1
11+
app.kubernetes.io/version: 0.11.2
1212
name: prometheus-adapter
1313
namespace: openshift-monitoring
1414
spec:

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

+1-1
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.47.2
10+
app.kubernetes.io/version: 2.48.0
1111
name: prometheus-k8s
1212
roleRef:
1313
apiGroup: rbac.authorization.k8s.io

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

+1-1
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.47.2
10+
app.kubernetes.io/version: 2.48.0
1111
name: prometheus-k8s
1212
rules:
1313
- apiGroups:

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

+1-1
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.47.2
10+
app.kubernetes.io/version: 2.48.0
1111
name: prometheus-k8s
1212
namespace: openshift-monitoring
1313
spec:

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

+1-1
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.47.2
10+
app.kubernetes.io/version: 2.48.0
1111
prometheus: k8s
1212
role: alert-rules
1313
name: prometheus-k8s-thanos-sidecar-rules

‎assets/prometheus-k8s/prometheus-rule.yaml

+1-1
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.47.2
10+
app.kubernetes.io/version: 2.48.0
1111
prometheus: k8s
1212
role: alert-rules
1313
name: prometheus-k8s-prometheus-rules

‎assets/prometheus-k8s/prometheus.yaml

+4-4
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.47.2
10+
app.kubernetes.io/version: 2.48.0
1111
name: k8s
1212
namespace: openshift-monitoring
1313
spec:
@@ -157,7 +157,7 @@ spec:
157157
enableFeatures: []
158158
externalLabels: {}
159159
externalURL: https://prometheus-k8s.openshift-monitoring.svc:9091
160-
image: quay.io/prometheus/prometheus:v2.47.2
160+
image: quay.io/prometheus/prometheus:v2.48.0
161161
listenLocal: true
162162
nodeSelector:
163163
kubernetes.io/os: linux
@@ -169,7 +169,7 @@ spec:
169169
app.kubernetes.io/instance: k8s
170170
app.kubernetes.io/name: prometheus
171171
app.kubernetes.io/part-of: openshift-monitoring
172-
app.kubernetes.io/version: 2.47.2
172+
app.kubernetes.io/version: 2.48.0
173173
podMonitorNamespaceSelector:
174174
matchLabels:
175175
openshift.io/cluster-monitoring: "true"
@@ -210,7 +210,7 @@ spec:
210210
cpu: 1m
211211
memory: 100Mi
212212
version: 0.32.5
213-
version: 2.47.2
213+
version: 2.48.0
214214
web:
215215
httpConfig:
216216
headers:

‎assets/prometheus-k8s/role-binding-config.yaml

+1-1
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.47.2
10+
app.kubernetes.io/version: 2.48.0
1111
name: prometheus-k8s-config
1212
namespace: openshift-monitoring
1313
roleRef:

‎assets/prometheus-k8s/role-binding-specific-namespaces.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ items:
88
app.kubernetes.io/instance: k8s
99
app.kubernetes.io/name: prometheus
1010
app.kubernetes.io/part-of: openshift-monitoring
11-
app.kubernetes.io/version: 2.47.2
11+
app.kubernetes.io/version: 2.48.0
1212
name: prometheus-k8s
1313
namespace: default
1414
roleRef:
@@ -27,7 +27,7 @@ items:
2727
app.kubernetes.io/instance: k8s
2828
app.kubernetes.io/name: prometheus
2929
app.kubernetes.io/part-of: openshift-monitoring
30-
app.kubernetes.io/version: 2.47.2
30+
app.kubernetes.io/version: 2.48.0
3131
name: prometheus-k8s
3232
namespace: kube-system
3333
roleRef:
@@ -46,7 +46,7 @@ items:
4646
app.kubernetes.io/instance: k8s
4747
app.kubernetes.io/name: prometheus
4848
app.kubernetes.io/part-of: openshift-monitoring
49-
app.kubernetes.io/version: 2.47.2
49+
app.kubernetes.io/version: 2.48.0
5050
name: prometheus-k8s
5151
namespace: openshift-monitoring
5252
roleRef:
@@ -65,7 +65,7 @@ items:
6565
app.kubernetes.io/instance: k8s
6666
app.kubernetes.io/name: prometheus
6767
app.kubernetes.io/part-of: openshift-monitoring
68-
app.kubernetes.io/version: 2.47.2
68+
app.kubernetes.io/version: 2.48.0
6969
name: prometheus-k8s
7070
namespace: openshift-etcd
7171
roleRef:
@@ -84,7 +84,7 @@ items:
8484
app.kubernetes.io/instance: k8s
8585
app.kubernetes.io/name: prometheus
8686
app.kubernetes.io/part-of: openshift-monitoring
87-
app.kubernetes.io/version: 2.47.2
87+
app.kubernetes.io/version: 2.48.0
8888
name: prometheus-k8s
8989
namespace: openshift-user-workload-monitoring
9090
roleRef:

‎assets/prometheus-k8s/role-config.yaml

+1-1
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.47.2
10+
app.kubernetes.io/version: 2.48.0
1111
name: prometheus-k8s-config
1212
namespace: openshift-monitoring
1313
rules:

‎assets/prometheus-k8s/role-specific-namespaces.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ items:
88
app.kubernetes.io/instance: k8s
99
app.kubernetes.io/name: prometheus
1010
app.kubernetes.io/part-of: openshift-monitoring
11-
app.kubernetes.io/version: 2.47.2
11+
app.kubernetes.io/version: 2.48.0
1212
name: prometheus-k8s
1313
namespace: default
1414
rules:
@@ -46,7 +46,7 @@ items:
4646
app.kubernetes.io/instance: k8s
4747
app.kubernetes.io/name: prometheus
4848
app.kubernetes.io/part-of: openshift-monitoring
49-
app.kubernetes.io/version: 2.47.2
49+
app.kubernetes.io/version: 2.48.0
5050
name: prometheus-k8s
5151
namespace: kube-system
5252
rules:
@@ -84,7 +84,7 @@ items:
8484
app.kubernetes.io/instance: k8s
8585
app.kubernetes.io/name: prometheus
8686
app.kubernetes.io/part-of: openshift-monitoring
87-
app.kubernetes.io/version: 2.47.2
87+
app.kubernetes.io/version: 2.48.0
8888
name: prometheus-k8s
8989
namespace: openshift-monitoring
9090
rules:
@@ -122,7 +122,7 @@ items:
122122
app.kubernetes.io/instance: k8s
123123
app.kubernetes.io/name: prometheus
124124
app.kubernetes.io/part-of: openshift-monitoring
125-
app.kubernetes.io/version: 2.47.2
125+
app.kubernetes.io/version: 2.48.0
126126
name: prometheus-k8s
127127
namespace: openshift-etcd
128128
rules:
@@ -160,7 +160,7 @@ items:
160160
app.kubernetes.io/instance: k8s
161161
app.kubernetes.io/name: prometheus
162162
app.kubernetes.io/part-of: openshift-monitoring
163-
app.kubernetes.io/version: 2.47.2
163+
app.kubernetes.io/version: 2.48.0
164164
name: prometheus-k8s
165165
namespace: openshift-user-workload-monitoring
166166
rules:

‎assets/prometheus-k8s/service-account.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ metadata:
1010
app.kubernetes.io/managed-by: cluster-monitoring-operator
1111
app.kubernetes.io/name: prometheus
1212
app.kubernetes.io/part-of: openshift-monitoring
13-
app.kubernetes.io/version: 2.47.2
13+
app.kubernetes.io/version: 2.48.0
1414
name: prometheus-k8s
1515
namespace: openshift-monitoring

0 commit comments

Comments
 (0)