Skip to content

Commit b0f1805

Browse files
authored
[prometheus-operator-crds] bump to 0.79.0 (#5065)
1 parent 9c2619e commit b0f1805

File tree

11 files changed

+1131
-442
lines changed

11 files changed

+1131
-442
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: 16.0.1
3+
version: 17.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: |
@@ -9,7 +9,7 @@ description: |
99
keywords:
1010
- prometheus
1111
- crds
12-
appVersion: v0.78.2
12+
appVersion: v0.79.0
1313
kubeVersion: ">=1.16.0-0"
1414
sources:
1515
- https://github.com/prometheus-community/helm-charts

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
1+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
22
---
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
@@ -7,8 +7,8 @@ metadata:
77
{{- with .Values.annotations }}
88
{{- toYaml . | nindent 4 }}
99
{{- end }}
10-
controller-gen.kubebuilder.io/version: v0.16.4
11-
operator.prometheus.io/version: 0.78.2
10+
controller-gen.kubebuilder.io/version: v0.16.5
11+
operator.prometheus.io/version: 0.79.0
1212
name: alertmanagerconfigs.monitoring.coreos.com
1313
spec:
1414
group: monitoring.coreos.com
@@ -6900,6 +6900,12 @@ spec:
69006900
message:
69016901
description: Message template
69026902
type: string
6903+
messageThreadID:
6904+
description: |-
6905+
The Telegram Group Topic ID.
6906+
It requires Alertmanager >= 0.26.0.
6907+
format: int64
6908+
type: integer
69036909
parseMode:
69046910
description: Parse mode for telegram message
69056911
enum:

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

Lines changed: 168 additions & 90 deletions
Large diffs are not rendered by default.

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

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
1+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
22
---
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
@@ -7,8 +7,8 @@ metadata:
77
{{- with .Values.annotations }}
88
{{- toYaml . | nindent 4 }}
99
{{- end }}
10-
controller-gen.kubebuilder.io/version: v0.16.4
11-
operator.prometheus.io/version: 0.78.2
10+
controller-gen.kubebuilder.io/version: v0.16.5
11+
operator.prometheus.io/version: 0.79.0
1212
name: podmonitors.monitoring.coreos.com
1313
spec:
1414
group: monitoring.coreos.com
@@ -763,10 +763,16 @@ spec:
763763
type: string
764764
port:
765765
description: |-
766-
Name of the Pod port which this endpoint refers to.
766+
The `Pod` port name which exposes the endpoint.
767767
768-
It takes precedence over `targetPort`.
768+
It takes precedence over the `portNumber` and `targetPort` fields.
769769
type: string
770+
portNumber:
771+
description: The `Pod` port number which exposes the endpoint.
772+
format: int32
773+
maximum: 65535
774+
minimum: 1
775+
type: integer
770776
proxyUrl:
771777
description: |-
772778
`proxyURL` configures the HTTP Proxy URL (e.g.
@@ -895,7 +901,7 @@ spec:
895901
Name or number of the target port of the `Pod` object behind the Service, the
896902
port must be specified with container port property.
897903
898-
Deprecated: use 'port' instead.
904+
Deprecated: use 'port' or 'portNumber' instead.
899905
x-kubernetes-int-or-string: true
900906
tlsConfig:
901907
description: TLS configuration to use when scraping the target.
@@ -1091,6 +1097,18 @@ spec:
10911097
Whether to scrape a classic histogram that is also exposed as a native histogram.
10921098
It requires Prometheus >= v2.45.0.
10931099
type: boolean
1100+
scrapeFallbackProtocol:
1101+
description: |-
1102+
The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
1103+
1104+
It requires Prometheus >= v3.0.0.
1105+
enum:
1106+
- PrometheusProto
1107+
- OpenMetricsText0.0.1
1108+
- OpenMetricsText1.0.0
1109+
- PrometheusText0.0.4
1110+
- PrometheusText1.0.0
1111+
type: string
10941112
scrapeProtocols:
10951113
description: |-
10961114
`scrapeProtocols` defines the protocols to negotiate during a scrape. It tells clients the
@@ -1107,11 +1125,13 @@ spec:
11071125
* `OpenMetricsText1.0.0`
11081126
* `PrometheusProto`
11091127
* `PrometheusText0.0.4`
1128+
* `PrometheusText1.0.0`
11101129
enum:
11111130
- PrometheusProto
11121131
- OpenMetricsText0.0.1
11131132
- OpenMetricsText1.0.0
11141133
- PrometheusText0.0.4
1134+
- PrometheusText1.0.0
11151135
type: string
11161136
type: array
11171137
x-kubernetes-list-type: set
@@ -1162,6 +1182,18 @@ spec:
11621182
type: object
11631183
type: object
11641184
x-kubernetes-map-type: atomic
1185+
selectorMechanism:
1186+
description: |-
1187+
Mechanism used to select the endpoints to scrape.
1188+
By default, the selection process relies on relabel configurations to filter the discovered targets.
1189+
Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
1190+
Which strategy is best for your use case needs to be carefully evaluated.
1191+
1192+
It requires Prometheus >= v2.17.0.
1193+
enum:
1194+
- RelabelConfig
1195+
- RoleSelector
1196+
type: string
11651197
targetLimit:
11661198
description: |-
11671199
`targetLimit` defines a limit on the number of scraped targets that will

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.78.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
1+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
22
---
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
@@ -7,8 +7,8 @@ metadata:
77
{{- with .Values.annotations }}
88
{{- toYaml . | nindent 4 }}
99
{{- end }}
10-
controller-gen.kubebuilder.io/version: v0.16.4
11-
operator.prometheus.io/version: 0.78.2
10+
controller-gen.kubebuilder.io/version: v0.16.5
11+
operator.prometheus.io/version: 0.79.0
1212
name: probes.monitoring.coreos.com
1313
spec:
1414
group: monitoring.coreos.com
@@ -686,6 +686,18 @@ spec:
686686
Whether to scrape a classic histogram that is also exposed as a native histogram.
687687
It requires Prometheus >= v2.45.0.
688688
type: boolean
689+
scrapeFallbackProtocol:
690+
description: |-
691+
The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
692+
693+
It requires Prometheus >= v3.0.0.
694+
enum:
695+
- PrometheusProto
696+
- OpenMetricsText0.0.1
697+
- OpenMetricsText1.0.0
698+
- PrometheusText0.0.4
699+
- PrometheusText1.0.0
700+
type: string
689701
scrapeProtocols:
690702
description: |-
691703
`scrapeProtocols` defines the protocols to negotiate during a scrape. It tells clients the
@@ -702,11 +714,13 @@ spec:
702714
* `OpenMetricsText1.0.0`
703715
* `PrometheusProto`
704716
* `PrometheusText0.0.4`
717+
* `PrometheusText1.0.0`
705718
enum:
706719
- PrometheusProto
707720
- OpenMetricsText0.0.1
708721
- OpenMetricsText1.0.0
709722
- PrometheusText0.0.4
723+
- PrometheusText1.0.0
710724
type: string
711725
type: array
712726
x-kubernetes-list-type: set

0 commit comments

Comments
 (0)