Skip to content

Commit 3a979ac

Browse files
committed
Bump prometheus-operator version to 0.88.0
In order to help address the ec2-master-scale-performance job failing in https://testgrid.k8s.io/amazon-ec2-release\#ec2-master-scale-performance, this PR upgrades the prometheus-operator version to 0.88.0. As a result, it will help address the job (https://prow.k8s.io/view/gs/kubernetes-ci-logs/logs/ci-kubernetes-e2e-kops-aws-scale-amazonvpc-using-cl2/2013507147345694720) failing due to <prometheus no endpoints available for service ServiceUnavailable error> observed in the build logs. Signed-off-by: Ronald Ngounou <rngounou@amazon.com>
1 parent d7fdcd0 commit 3a979ac

18 files changed

+33805
-3530
lines changed

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml

Lines changed: 3770 additions & 1514 deletions
Large diffs are not rendered by default.

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml

Lines changed: 1155 additions & 360 deletions
Large diffs are not rendered by default.

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0podmonitorCustomResourceDefinition.yaml

Lines changed: 343 additions & 152 deletions
Large diffs are not rendered by default.

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0probeCustomResourceDefinition.yaml

Lines changed: 377 additions & 136 deletions
Large diffs are not rendered by default.

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml

Lines changed: 1461 additions & 855 deletions
Large diffs are not rendered by default.

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0prometheusagentCustomResourceDefinition.yaml

Lines changed: 11422 additions & 0 deletions
Large diffs are not rendered by default.

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml

Lines changed: 130 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.2
6-
operator.prometheus.io/version: 0.81.0
5+
controller-gen.kubebuilder.io/version: v0.19.0
6+
operator.prometheus.io/version: 0.88.0
77
name: prometheusrules.monitoring.coreos.com
88
spec:
99
group: monitoring.coreos.com
@@ -44,99 +44,101 @@ spec:
4444
metadata:
4545
type: object
4646
spec:
47-
description: Specification of desired alerting rule definitions for Prometheus.
47+
description: spec defines the specification of desired alerting rule definitions
48+
for Prometheus.
4849
properties:
4950
groups:
50-
description: Content of Prometheus rule file
51+
description: groups defines the content of Prometheus rule file
5152
items:
5253
description: RuleGroup is a list of sequentially evaluated recording
5354
and alerting rules.
5455
properties:
5556
interval:
56-
description: Interval determines how often rules in the group
57-
are evaluated.
57+
description: interval defines how often rules in the group are
58+
evaluated.
5859
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
5960
type: string
6061
labels:
6162
additionalProperties:
6263
type: string
6364
description: |-
64-
Labels to add or overwrite before storing the result for its rules.
65+
labels define the labels to add or overwrite before storing the result for its rules.
6566
The labels defined at the rule level take precedence.
6667
6768
It requires Prometheus >= 3.0.0.
6869
The field is ignored for Thanos Ruler.
6970
type: object
7071
limit:
7172
description: |-
72-
Limit the number of alerts an alerting rule and series a recording
73+
limit defines the number of alerts an alerting rule and series a recording
7374
rule can produce.
7475
Limit is supported starting with Prometheus >= 2.31 and Thanos Ruler >= 0.24.
7576
type: integer
7677
name:
77-
description: Name of the rule group.
78+
description: name defines the name of the rule group.
7879
minLength: 1
7980
type: string
8081
partial_response_strategy:
8182
description: |-
82-
PartialResponseStrategy is only used by ThanosRuler and will
83+
partial_response_strategy is only used by ThanosRuler and will
8384
be ignored by Prometheus instances.
8485
More info: https://github.com/thanos-io/thanos/blob/main/docs/components/rule.md#partial-response
8586
pattern: ^(?i)(abort|warn)?$
8687
type: string
8788
query_offset:
8889
description: |-
89-
Defines the offset the rule evaluation timestamp of this particular group by the specified duration into the past.
90+
query_offset defines the offset the rule evaluation timestamp of this particular group by the specified duration into the past.
9091
9192
It requires Prometheus >= v2.53.0.
9293
It is not supported for ThanosRuler.
9394
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
9495
type: string
9596
rules:
96-
description: List of alerting and recording rules.
97+
description: rules defines the list of alerting and recording
98+
rules.
9799
items:
98100
description: |-
99101
Rule describes an alerting or recording rule
100102
See Prometheus documentation: [alerting](https://www.prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) or [recording](https://www.prometheus.io/docs/prometheus/latest/configuration/recording_rules/#recording-rules) rule
101103
properties:
102104
alert:
103105
description: |-
104-
Name of the alert. Must be a valid label value.
106+
alert defines the name of the alert. Must be a valid label value.
105107
Only one of `record` and `alert` must be set.
106108
type: string
107109
annotations:
108110
additionalProperties:
109111
type: string
110112
description: |-
111-
Annotations to add to each alert.
113+
annotations defines annotations to add to each alert.
112114
Only valid for alerting rules.
113115
type: object
114116
expr:
115117
anyOf:
116118
- type: integer
117119
- type: string
118-
description: PromQL expression to evaluate.
120+
description: expr defines the PromQL expression to evaluate.
119121
x-kubernetes-int-or-string: true
120122
for:
121-
description: Alerts are considered firing once they have
122-
been returned for this long.
123+
description: for defines how alerts are considered firing
124+
once they have been returned for this long.
123125
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
124126
type: string
125127
keep_firing_for:
126-
description: KeepFiringFor defines how long an alert will
127-
continue firing after the condition that triggered it
128-
has cleared.
128+
description: keep_firing_for defines how long an alert
129+
will continue firing after the condition that triggered
130+
it has cleared.
129131
minLength: 1
130132
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
131133
type: string
132134
labels:
133135
additionalProperties:
134136
type: string
135-
description: Labels to add or overwrite.
137+
description: labels defines labels to add or overwrite.
136138
type: object
137139
record:
138140
description: |-
139-
Name of the time series to output to. Must be a valid metric name.
141+
record defines the name of the time series to output to. Must be a valid metric name.
140142
Only one of `record` and `alert` must be set.
141143
type: string
142144
required:
@@ -151,8 +153,113 @@ spec:
151153
- name
152154
x-kubernetes-list-type: map
153155
type: object
156+
status:
157+
description: |-
158+
status defines the status subresource. It is under active development and is updated only when the
159+
"StatusForConfigurationResources" feature gate is enabled.
160+
161+
Most recent observed status of the PrometheusRule. Read-only.
162+
More info:
163+
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
164+
properties:
165+
bindings:
166+
description: bindings defines the list of workload resources (Prometheus,
167+
PrometheusAgent, ThanosRuler or Alertmanager) which select the configuration
168+
resource.
169+
items:
170+
description: WorkloadBinding is a link between a configuration resource
171+
and a workload resource.
172+
properties:
173+
conditions:
174+
description: conditions defines the current state of the configuration
175+
resource when bound to the referenced Workload object.
176+
items:
177+
description: ConfigResourceCondition describes the status
178+
of configuration resources linked to Prometheus, PrometheusAgent,
179+
Alertmanager or ThanosRuler.
180+
properties:
181+
lastTransitionTime:
182+
description: lastTransitionTime defines the time of the
183+
last update to the current status property.
184+
format: date-time
185+
type: string
186+
message:
187+
description: message defines the human-readable message
188+
indicating details for the condition's last transition.
189+
type: string
190+
observedGeneration:
191+
description: |-
192+
observedGeneration defines the .metadata.generation that the
193+
condition was set based upon. For instance, if `.metadata.generation` is
194+
currently 12, but the `.status.conditions[].observedGeneration` is 9, the
195+
condition is out of date with respect to the current state of the object.
196+
format: int64
197+
type: integer
198+
reason:
199+
description: reason for the condition's last transition.
200+
type: string
201+
status:
202+
description: status of the condition.
203+
minLength: 1
204+
type: string
205+
type:
206+
description: |-
207+
type of the condition being reported.
208+
Currently, only "Accepted" is supported.
209+
enum:
210+
- Accepted
211+
minLength: 1
212+
type: string
213+
required:
214+
- lastTransitionTime
215+
- status
216+
- type
217+
type: object
218+
type: array
219+
x-kubernetes-list-map-keys:
220+
- type
221+
x-kubernetes-list-type: map
222+
group:
223+
description: group defines the group of the referenced resource.
224+
enum:
225+
- monitoring.coreos.com
226+
type: string
227+
name:
228+
description: name defines the name of the referenced object.
229+
minLength: 1
230+
type: string
231+
namespace:
232+
description: namespace defines the namespace of the referenced
233+
object.
234+
minLength: 1
235+
type: string
236+
resource:
237+
description: resource defines the type of resource being referenced
238+
(e.g. Prometheus, PrometheusAgent, ThanosRuler or Alertmanager).
239+
enum:
240+
- prometheuses
241+
- prometheusagents
242+
- thanosrulers
243+
- alertmanagers
244+
type: string
245+
required:
246+
- group
247+
- name
248+
- namespace
249+
- resource
250+
type: object
251+
type: array
252+
x-kubernetes-list-map-keys:
253+
- group
254+
- resource
255+
- name
256+
- namespace
257+
x-kubernetes-list-type: map
258+
type: object
154259
required:
155260
- spec
156261
type: object
157262
served: true
158-
storage: true
263+
storage: true
264+
subresources:
265+
status: {}

0 commit comments

Comments
 (0)