Skip to content

Commit 983556c

Browse files
[prometheus-operator-crds] Update dependency prometheus-operator/prometheus-operator to v0.88.0 (#6469)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: helm-charts-renovate-helper[bot] <203471071+helm-charts-renovate-helper[bot]@users.noreply.github.com>
1 parent dbcbba4 commit 983556c

File tree

11 files changed

+678
-65
lines changed

11 files changed

+678
-65
lines changed

charts/prometheus-operator-crds/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
type: application
3-
version: 25.0.1
3+
version: 26.0.0
44
name: prometheus-operator-crds
55
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
66
description: |
@@ -10,7 +10,7 @@ keywords:
1010
- prometheus
1111
- crds
1212
# renovate: github=prometheus-operator/prometheus-operator
13-
appVersion: v0.87.1
13+
appVersion: v0.88.0
1414
kubeVersion: ">=1.16.0-0"
1515
sources:
1616
- https://github.com/prometheus-community/helm-charts

charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml

Lines changed: 227 additions & 2 deletions
Large diffs are not rendered by default.

charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml

Lines changed: 70 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.alertmanagers.enabled -}}
2-
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.87.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
2+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.88.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
33
---
44
apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
@@ -9,7 +9,7 @@ metadata:
99
{{- toYaml . | nindent 4 }}
1010
{{- end }}
1111
controller-gen.kubebuilder.io/version: v0.19.0
12-
operator.prometheus.io/version: 0.87.1
12+
operator.prometheus.io/version: 0.88.0
1313
name: alertmanagers.monitoring.coreos.com
1414
spec:
1515
group: monitoring.coreos.com
@@ -2324,7 +2324,7 @@ spec:
23242324
type: string
23252325
type: object
23262326
webex:
2327-
description: webex defines the default configuration for Jira.
2327+
description: webex defines the default configuration for Webex.
23282328
properties:
23292329
apiURL:
23302330
description: |-
@@ -6146,10 +6146,18 @@ spec:
61466146
type: string
61476147
minReadySeconds:
61486148
description: |-
6149-
minReadySeconds defines the minimum number of seconds for which a newly created pod should be ready
6150-
without any of its container crashing for it to be considered available.
6149+
minReadySeconds defines the minimum number of seconds for which a newly
6150+
created pod should be ready without any of its container crashing for it
6151+
to be considered available.
61516152

61526153
If unset, pods will be considered available as soon as they are ready.
6154+
6155+
When the Alertmanager version is greater than or equal to v0.30.0, the
6156+
duration is also used to delay the first flush of the aggregation
6157+
groups. This delay helps ensuring that all alerts have been resent by
6158+
the Prometheus instances to Alertmanager after a roll-out. It is
6159+
possible to override this behavior passing a custom value via
6160+
`.spec.additionalArgs`.
61536161
format: int32
61546162
minimum: 0
61556163
type: integer
@@ -6187,6 +6195,21 @@ spec:
61876195
the replica count to be deleted.
61886196
type: string
61896197
type: object
6198+
podManagementPolicy:
6199+
description: |-
6200+
podManagementPolicy defines the policy for creating/deleting pods when
6201+
scaling up and down.
6202+
6203+
Unlike the default StatefulSet behavior, the default policy is
6204+
`Parallel` to avoid manual intervention in case a pod gets stuck during
6205+
a rollout.
6206+
6207+
Note that updating this value implies the recreation of the StatefulSet
6208+
which incurs a service outage.
6209+
enum:
6210+
- OrderedReady
6211+
- Parallel
6212+
type: string
61906213
podMetadata:
61916214
description: |-
61926215
podMetadata defines labels and annotations which are propagated to the Alertmanager pods.
@@ -7526,6 +7549,48 @@ spec:
75267549
- whenUnsatisfiable
75277550
type: object
75287551
type: array
7552+
updateStrategy:
7553+
description: |-
7554+
updateStrategy indicates the strategy that will be employed to update
7555+
Pods in the StatefulSet when a revision is made to statefulset's Pod
7556+
Template.
7557+
7558+
The default strategy is RollingUpdate.
7559+
properties:
7560+
rollingUpdate:
7561+
description: rollingUpdate is used to communicate parameters when
7562+
type is RollingUpdate.
7563+
properties:
7564+
maxUnavailable:
7565+
anyOf:
7566+
- type: integer
7567+
- type: string
7568+
description: |-
7569+
maxUnavailable is the maximum number of pods that can be unavailable
7570+
during the update. The value can be an absolute number (ex: 5) or a
7571+
percentage of desired pods (ex: 10%). Absolute number is calculated from
7572+
percentage by rounding up. This can not be 0. Defaults to 1. This field
7573+
is alpha-level and is only honored by servers that enable the
7574+
MaxUnavailableStatefulSet feature. The field applies to all pods in the
7575+
range 0 to Replicas-1. That means if there is any unavailable pod in
7576+
the range 0 to Replicas-1, it will be counted towards MaxUnavailable.
7577+
x-kubernetes-int-or-string: true
7578+
type: object
7579+
type:
7580+
description: |-
7581+
type indicates the type of the StatefulSetUpdateStrategy.
7582+
7583+
Default is RollingUpdate.
7584+
enum:
7585+
- OnDelete
7586+
- RollingUpdate
7587+
type: string
7588+
required:
7589+
- type
7590+
type: object
7591+
x-kubernetes-validations:
7592+
- message: rollingUpdate requires type to be RollingUpdate
7593+
rule: '!(self.type != ''RollingUpdate'' && has(self.rollingUpdate))'
75297594
version:
75307595
description: version the cluster should be on.
75317596
type: string

charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.podmonitors.enabled -}}
2-
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.87.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
2+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.88.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
33
---
44
apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
@@ -9,7 +9,7 @@ metadata:
99
{{- toYaml . | nindent 4 }}
1010
{{- end }}
1111
controller-gen.kubebuilder.io/version: v0.19.0
12-
operator.prometheus.io/version: 0.87.1
12+
operator.prometheus.io/version: 0.88.0
1313
name: podmonitors.monitoring.coreos.com
1414
spec:
1515
group: monitoring.coreos.com
@@ -1192,6 +1192,11 @@ spec:
11921192
11931193
Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
11941194
type: boolean
1195+
scrapeNativeHistograms:
1196+
description: |-
1197+
scrapeNativeHistograms defines whether to enable scraping of native histograms.
1198+
It requires Prometheus >= v3.8.0.
1199+
type: boolean
11951200
scrapeProtocols:
11961201
description: |-
11971202
scrapeProtocols defines the protocols to negotiate during a scrape. It tells clients the

charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.probes.enabled -}}
2-
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.87.1/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
2+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.88.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
33
---
44
apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
@@ -9,7 +9,7 @@ metadata:
99
{{- toYaml . | nindent 4 }}
1010
{{- end }}
1111
controller-gen.kubebuilder.io/version: v0.19.0
12-
operator.prometheus.io/version: 0.87.1
12+
operator.prometheus.io/version: 0.88.0
1313
name: probes.monitoring.coreos.com
1414
spec:
1515
group: monitoring.coreos.com
@@ -58,7 +58,11 @@ spec:
5858
for target discovery by Prometheus.
5959
properties:
6060
authorization:
61-
description: authorization section for this endpoint
61+
description: |-
62+
authorization configures the Authorization header credentials used by
63+
the client.
64+
65+
Cannot be set at the same time as `basicAuth`, `bearerTokenSecret` or `oauth2`.
6266
properties:
6367
credentials:
6468
description: credentials defines a key of a Secret in the namespace
@@ -96,8 +100,10 @@ spec:
96100
type: object
97101
basicAuth:
98102
description: |-
99-
basicAuth allow an endpoint to authenticate over basic authentication.
100-
More info: https://prometheus.io/docs/operating/configuration/#endpoint
103+
basicAuth defines the Basic Authentication credentials used by the
104+
client.
105+
106+
Cannot be set at the same time as `authorization`, `bearerTokenSecret` or `oauth2`.
101107
properties:
102108
password:
103109
description: |-
@@ -154,9 +160,14 @@ spec:
154160
type: object
155161
bearerTokenSecret:
156162
description: |-
157-
bearerTokenSecret defines the secret to mount to read bearer token for scraping targets. The secret
158-
needs to be in the same namespace as the probe and accessible by
159-
the Prometheus Operator.
163+
bearerTokenSecret defines a key of a Secret containing the bearer token
164+
used by the client for authentication. The secret needs to be in the
165+
same namespace as the custom resource and readable by the Prometheus
166+
Operator.
167+
168+
Cannot be set at the same time as `authorization`, `basicAuth` or `oauth2`.
169+
170+
Deprecated: use `authorization` instead.
160171
properties:
161172
key:
162173
description: The key of the secret to select from. Must be a
@@ -183,6 +194,9 @@ spec:
183194
convertClassicHistogramsToNHCB defines whether to convert all scraped classic histograms into a native histogram with custom buckets.
184195
It requires Prometheus >= v3.0.0.
185196
type: boolean
197+
enableHttp2:
198+
description: enableHttp2 can be used to disable HTTP2.
199+
type: boolean
186200
fallbackScrapeProtocol:
187201
description: |-
188202
fallbackScrapeProtocol defines the protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
@@ -195,6 +209,11 @@ spec:
195209
- PrometheusText0.0.4
196210
- PrometheusText1.0.0
197211
type: string
212+
followRedirects:
213+
description: |-
214+
followRedirects defines whether the client should follow HTTP 3xx
215+
redirects.
216+
type: boolean
198217
interval:
199218
description: |-
200219
interval at which targets are probed using the configured prober.
@@ -342,8 +361,12 @@ spec:
342361
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
343362
x-kubernetes-int-or-string: true
344363
oauth2:
345-
description: oauth2 for the URL. Only valid in Prometheus versions
346-
2.27.0 and newer.
364+
description: |-
365+
oauth2 defines the OAuth2 settings used by the client.
366+
367+
It requires Prometheus >= 2.27.0.
368+
369+
Cannot be set at the same time as `authorization`, `basicAuth` or `bearerTokenSecret`.
347370
properties:
348371
clientId:
349372
description: |-
@@ -797,6 +820,11 @@ spec:
797820
798821
Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
799822
type: boolean
823+
scrapeNativeHistograms:
824+
description: |-
825+
scrapeNativeHistograms defines whether to enable scraping of native histograms.
826+
It requires Prometheus >= v3.8.0.
827+
type: boolean
800828
scrapeProtocols:
801829
description: |-
802830
scrapeProtocols defines the protocols to negotiate during a scrape. It tells clients the
@@ -1113,8 +1141,7 @@ spec:
11131141
type: object
11141142
type: object
11151143
tlsConfig:
1116-
description: tlsConfig defines the TLS configuration to use when scraping
1117-
the endpoint.
1144+
description: tlsConfig defines the TLS configuration used by the client.
11181145
properties:
11191146
ca:
11201147
description: ca defines the Certificate authority used when verifying

0 commit comments

Comments
 (0)