Skip to content

Commit 3b20abe

Browse files
simonpasquiersimonpasquier
committed
NO-ISSUE: bump Prometheus operator CRDs to v0.87.0
1 parent e4ba303 commit 3b20abe

13 files changed

+112
-65
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ rules:
2929
- probes
3030
- probes/status
3131
- prometheusrules
32+
- prometheusrules/status
3233
verbs:
3334
- '*'
3435
- apiGroups:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ rules:
2929
- probes
3030
- probes/status
3131
- prometheusrules
32+
- prometheusrules/status
3233
verbs:
3334
- '*'
3435
- apiGroups:

‎jsonnet/jsonnetfile.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"subdir": "jsonnet/prometheus-operator"
1818
}
1919
},
20-
"version": "release-0.86"
20+
"version": "release-0.87"
2121
},
2222
{
2323
"source": {

‎jsonnet/jsonnetfile.lock.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "0e1d3ca558dd3efa989adbb595331f210aeb932f",
21+
"version": "6775d033bc560a4604831837e56cc914e3fe172d",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -48,7 +48,7 @@
4848
"subdir": "gen/grafonnet-latest"
4949
}
5050
},
51-
"version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
51+
"version": "8a27651b56fbdba45a389ccb11440200091c73a1",
5252
"sum": "V9vAj21qJOc2DlMPDgB1eEjSQU4A+sAA4AXuJ6bd4xc="
5353
},
5454
{
@@ -58,7 +58,7 @@
5858
"subdir": "gen/grafonnet-v10.0.0"
5959
}
6060
},
61-
"version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
61+
"version": "8a27651b56fbdba45a389ccb11440200091c73a1",
6262
"sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="
6363
},
6464
{
@@ -68,7 +68,7 @@
6868
"subdir": "gen/grafonnet-v11.4.0"
6969
}
7070
},
71-
"version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
71+
"version": "8a27651b56fbdba45a389ccb11440200091c73a1",
7272
"sum": "aVAX09paQYNOoCSKVpuk1exVIyBoMt/C50QJI+Q/3nA="
7373
},
7474
{
@@ -78,8 +78,8 @@
7878
"subdir": "grafana-builder"
7979
}
8080
},
81-
"version": "38e888ec993543791c4c565cd700c9d47c0d84dd",
82-
"sum": "dr3ok/KQ0aNc/U+CxO5hlHFuP66z1IlsnthKeE+m/ss="
81+
"version": "d1eede9462c03d44dcd4a707aa8e7dcaf155a552",
82+
"sum": "d8iL8gbyQxspZJ8mDGsqHRR/JF3cu+YOaV50vao93Nw="
8383
},
8484
{
8585
"source": {
@@ -88,7 +88,7 @@
8888
"subdir": "mixin-utils"
8989
}
9090
},
91-
"version": "38e888ec993543791c4c565cd700c9d47c0d84dd",
91+
"version": "d1eede9462c03d44dcd4a707aa8e7dcaf155a552",
9292
"sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo="
9393
},
9494
{
@@ -108,8 +108,8 @@
108108
"subdir": ""
109109
}
110110
},
111-
"version": "4eee017d21cb63a303925d1dcd9fc5c496809b46",
112-
"sum": "Kh0GbIycNmJPzk6IOMXn1BbtLNyaiiimclYk7+mvsns="
111+
"version": "4d7f8cb24d613430799f9d56809cc6964f35cea9",
112+
"sum": "hOrwkOx34tOXqoDVnwuI/Uf/dr9HFFSPWpDPOvnEGrk="
113113
},
114114
{
115115
"source": {
@@ -139,7 +139,7 @@
139139
"subdir": "jsonnet/kube-state-metrics"
140140
}
141141
},
142-
"version": "807f8bd184ed4325c1a04214039bb0bd51e1878e",
142+
"version": "9ea375226bc72c0283bd0d35a7d4b3e399749b73",
143143
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
144144
},
145145
{
@@ -149,7 +149,7 @@
149149
"subdir": "jsonnet/kube-state-metrics-mixin"
150150
}
151151
},
152-
"version": "807f8bd184ed4325c1a04214039bb0bd51e1878e",
152+
"version": "9ea375226bc72c0283bd0d35a7d4b3e399749b73",
153153
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
154154
},
155155
{
@@ -170,7 +170,7 @@
170170
"subdir": "jsonnet/telemeter"
171171
}
172172
},
173-
"version": "0634eee9f7efb2c53eb3b13f9ebfb1315386e285",
173+
"version": "80acf50b0b105f9a83b2caec8a1e9aba05ab0f4d",
174174
"sum": "sgPbiGdB2J/VDC14OeDwKK8Okru2gYRKygv+urKYuhA=",
175175
"name": "telemeter-client"
176176
},
@@ -181,8 +181,8 @@
181181
"subdir": "jsonnet/kube-prometheus"
182182
}
183183
},
184-
"version": "e806626c30705bfa8ba0f97392e3a91507bb3fdb",
185-
"sum": "omXCBuv4xqc5feTGkX7ElQmQ3fjhyteHrLKXP/51trE="
184+
"version": "2e016283f2505a99ed03687b36d41d3e9dd5c49f",
185+
"sum": "ky9yNtgZxHDmXiygPo6pJl1GzBOiRfuGKmUEeiv+0rA="
186186
},
187187
{
188188
"source": {
@@ -191,7 +191,7 @@
191191
"subdir": "jsonnet/mixin"
192192
}
193193
},
194-
"version": "9053ec85f2d3684be1a2e1fc70f9df42bda48853",
194+
"version": "0ff52b38b82db983c210eae0147d7d675a23ca70",
195195
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
196196
"name": "prometheus-operator-mixin"
197197
},
@@ -202,8 +202,8 @@
202202
"subdir": "jsonnet/prometheus-operator"
203203
}
204204
},
205-
"version": "1df1605c3a70ca11ee038a1f268b5a6f61b5f1b4",
206-
"sum": "BVPjueUpOAhk8KcL2w+VhaCne06jbRvZuMaw6OCfJoo="
205+
"version": "0ff52b38b82db983c210eae0147d7d675a23ca70",
206+
"sum": "H2UtUOnr9WTkyyLPJL91T+mgmSjRh3yT0UBos4J3jsI="
207207
},
208208
{
209209
"source": {
@@ -212,7 +212,7 @@
212212
"subdir": "doc/alertmanager-mixin"
213213
}
214214
},
215-
"version": "64a7edfb4e18ce7245717786eb24738507414622",
215+
"version": "f7b4feffd3c8d4570e7daed234c4ba56b9ef8b05",
216216
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
217217
"name": "alertmanager"
218218
},
@@ -223,7 +223,7 @@
223223
"subdir": "docs/node-mixin"
224224
}
225225
},
226-
"version": "e62d5975cb13d21f7b6ce982323c0e47316f22b8",
226+
"version": "b306b639e1c81dfd6e142d5415a85b37c9f1c195",
227227
"sum": "t5lGWjS4xUmXbOaMg8BddbJrIJeglTIi8HkT3UBWtP4="
228228
},
229229
{
@@ -233,7 +233,7 @@
233233
"subdir": "documentation/prometheus-mixin"
234234
}
235235
},
236-
"version": "2605fc9984ec97abb6aa92b749f9a7ca4aad220e",
236+
"version": "d0d2699dc5f454ebca53e56247281447f8dd8c5a",
237237
"sum": "UuADJwhNploRwfJYGb0sr2mi+MvswKpumoOMXnGs0Dc=",
238238
"name": "prometheus"
239239
},
@@ -244,7 +244,7 @@
244244
"subdir": "jsonnet/controller-gen"
245245
}
246246
},
247-
"version": "08ddc80c9137708249d665a16f6869923864bd27",
247+
"version": "6f16e091a98c44792808d238f1b7db1a97ead23a",
248248
"sum": "xUGxDjMr7V/SpY21Xsr0X3ve/a04du3pRlbrA3I/Uk8=",
249249
"name": "pyrra"
250250
},
@@ -265,7 +265,7 @@
265265
"subdir": "mixin"
266266
}
267267
},
268-
"version": "1473450480ec2fd9485336dd7a460a7c86b87ff4",
268+
"version": "b3b08ef8d13538b603f0a7af917ccb6960a71b7e",
269269
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs="
270270
}
271271
],

‎manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.86.2
10+
operator.prometheus.io/version: 0.87.0
1111
service.beta.openshift.io/inject-cabundle: "true"
1212
labels:
1313
app.kubernetes.io/managed-by: cluster-version-operator
@@ -4835,6 +4835,11 @@ spec:
48354835
message defines the notification message content.
48364836
This is the main body text of the Pushover notification.
48374837
type: string
4838+
monospace:
4839+
description: |-
4840+
monospace optional HTML/monospace formatting for the message, see https://pushover.net/api#html
4841+
html and monospace formatting are mutually exclusive.
4842+
type: boolean
48384843
priority:
48394844
description: |-
48404845
priority defines the notification priority level.
@@ -7347,7 +7352,7 @@ spec:
73477352
x-kubernetes-map-type: atomic
73487353
useFIPSSTSEndpoint:
73497354
description: |-
7350-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
7355+
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
73517356
It requires Prometheus >= v2.54.0.
73527357
type: boolean
73537358
type: object
@@ -15626,6 +15631,11 @@ spec:
1562615631
message defines the notification message content.
1562715632
This is the main body text of the Pushover notification.
1562815633
type: string
15634+
monospace:
15635+
description: |-
15636+
monospace optional HTML/monospace formatting for the message, see https://pushover.net/api#html
15637+
html and monospace formatting are mutually exclusive.
15638+
type: boolean
1562915639
priority:
1563015640
description: |-
1563115641
priority defines the notification priority level.
@@ -18096,7 +18106,7 @@ spec:
1809618106
x-kubernetes-map-type: atomic
1809718107
useFIPSSTSEndpoint:
1809818108
description: |-
18099-
useFIPSSTSEndpoint defines FIPS mode for AWS STS endpoint.
18109+
useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
1810018110
It requires Prometheus >= v2.54.0.
1810118111
type: boolean
1810218112
type: object

‎manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.86.2
10+
operator.prometheus.io/version: 0.87.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring

‎manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.86.2
10+
operator.prometheus.io/version: 0.87.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -756,10 +756,29 @@ spec:
756756
description: |-
757757
port defines the `Pod` port name which exposes the endpoint.
758758
759+
If the pod doesn't expose a port with the same name, it will result
760+
in no targets being discovered.
761+
762+
If a `Pod` has multiple `Port`s with the same name (which is not
763+
recommended), one target instance per unique port number will be
764+
generated.
765+
759766
It takes precedence over the `portNumber` and `targetPort` fields.
760767
type: string
761768
portNumber:
762-
description: portNumber defines the `Pod` port number which exposes the endpoint.
769+
description: |-
770+
portNumber defines the `Pod` port number which exposes the endpoint.
771+
772+
The `Pod` must declare the specified `Port` in its spec or the
773+
target will be dropped by Prometheus.
774+
775+
This cannot be used to enable scraping of an undeclared port.
776+
To scrape targets on a port which isn't exposed, you need to use
777+
relabeling to override the `__address__` label (but beware of
778+
duplicate targets if the `Pod` has other declared ports).
779+
780+
In practice Prometheus will select targets for which the
781+
matches the target's __meta_kubernetes_pod_container_port_number.
763782
format: int32
764783
maximum: 65535
765784
minimum: 1
@@ -900,16 +919,12 @@ spec:
900919
type: object
901920
type: array
902921
scheme:
903-
description: |-
904-
scheme defines the HTTP scheme to use for scraping.
905-
906-
`http` and `https` are the expected values unless you rewrite the
907-
`__scheme__` label via relabeling.
908-
909-
If empty, Prometheus uses the default value `http`.
922+
description: scheme defines the HTTP scheme to use for scraping.
910923
enum:
911924
- http
912925
- https
926+
- HTTP
927+
- HTTPS
913928
type: string
914929
scrapeTimeout:
915930
description: |-

‎manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.86.2
10+
operator.prometheus.io/version: 0.87.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -719,16 +719,21 @@ spec:
719719
pattern: ^(http|https|socks5)://.+$
720720
type: string
721721
scheme:
722-
description: |-
723-
scheme defines the HTTP scheme to use for scraping.
724-
`http` and `https` are the expected values unless you rewrite the `__scheme__` label via relabeling.
725-
If empty, Prometheus uses the default value `http`.
722+
description: scheme defines the HTTP scheme to use when scraping the prober.
726723
enum:
727724
- http
728725
- https
726+
- HTTP
727+
- HTTPS
729728
type: string
730729
url:
731-
description: url defines the mandatory URL of the prober.
730+
description: |-
731+
url defines the address of the prober.
732+
733+
Unlike what the name indicates, the value should be in the form of
734+
`address:port` without any scheme which should be specified in the
735+
`scheme` field.
736+
minLength: 1
732737
type: string
733738
required:
734739
- url

0 commit comments

Comments
 (0)