Skip to content

Commit 153c904

Browse files
sebastiangaisersebastiangaiser
authored
[prometheus-operator-crds] bump prometheus-operator to 'v0.80.0' (#5289)
Signed-off-by: Sebastian Gaiser <sebastian.gaiser@hetzner-cloud.de>
1 parent 35f1d80 commit 153c904

File tree

11 files changed

+2480
-1296
lines changed

11 files changed

+2480
-1296
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: 17.0.2
3+
version: 18.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.79.2
12+
appVersion: v0.80.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: 3 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.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
1+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.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.5
11-
operator.prometheus.io/version: 0.79.2
10+
controller-gen.kubebuilder.io/version: v0.17.1
11+
operator.prometheus.io/version: 0.80.0
1212
name: alertmanagerconfigs.monitoring.coreos.com
1313
spec:
1414
group: monitoring.coreos.com

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

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.79.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
1+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.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.5
11-
operator.prometheus.io/version: 0.79.2
10+
controller-gen.kubebuilder.io/version: v0.17.1
11+
operator.prometheus.io/version: 0.80.0
1212
name: alertmanagers.monitoring.coreos.com
1313
spec:
1414
group: monitoring.coreos.com
@@ -8430,7 +8430,12 @@ spec:
84308430
description: Defines the TLS parameters for HTTPS.
84318431
properties:
84328432
cert:
8433-
description: Contains the TLS certificate for the server.
8433+
description: |-
8434+
Secret or ConfigMap containing the TLS certificate for the web server.
8435+
8436+
Either `keySecret` or `keyFile` must be defined.
8437+
8438+
It is mutually exclusive with `certFile`.
84348439
properties:
84358440
configMap:
84368441
description: ConfigMap containing data to use for the
@@ -8483,20 +8488,28 @@ spec:
84838488
type: object
84848489
certFile:
84858490
description: |-
8486-
Path to the TLS certificate file in the Prometheus container for the server.
8487-
Mutually exclusive with `cert`.
8491+
Path to the TLS certificate file in the container for the web server.
8492+
8493+
Either `keySecret` or `keyFile` must be defined.
8494+
8495+
It is mutually exclusive with `cert`.
84888496
type: string
84898497
cipherSuites:
84908498
description: |-
8491-
List of supported cipher suites for TLS versions up to TLS 1.2. If empty,
8492-
Go default cipher suites are used. Available cipher suites are documented
8493-
in the go documentation: https://golang.org/pkg/crypto/tls/#pkg-constants
8499+
List of supported cipher suites for TLS versions up to TLS 1.2.
8500+
8501+
If not defined, the Go default cipher suites are used.
8502+
Available cipher suites are documented in the Go documentation:
8503+
https://golang.org/pkg/crypto/tls/#pkg-constants
84948504
items:
84958505
type: string
84968506
type: array
84978507
client_ca:
8498-
description: Contains the CA certificate for client certificate
8508+
description: |-
8509+
Secret or ConfigMap containing the CA certificate for client certificate
84998510
authentication to the server.
8511+
8512+
It is mutually exclusive with `clientCAFile`.
85008513
properties:
85018514
configMap:
85028515
description: ConfigMap containing data to use for the
@@ -8549,30 +8562,43 @@ spec:
85498562
type: object
85508563
clientAuthType:
85518564
description: |-
8552-
Server policy for client authentication. Maps to ClientAuth Policies.
8565+
The server policy for client TLS authentication.
8566+
85538567
For more detail on clientAuth options:
85548568
https://golang.org/pkg/crypto/tls/#ClientAuthType
85558569
type: string
85568570
clientCAFile:
85578571
description: |-
8558-
Path to the CA certificate file for client certificate authentication to the server.
8559-
Mutually exclusive with `client_ca`.
8572+
Path to the CA certificate file for client certificate authentication to
8573+
the server.
8574+
8575+
It is mutually exclusive with `client_ca`.
85608576
type: string
85618577
curvePreferences:
85628578
description: |-
85638579
Elliptic curves that will be used in an ECDHE handshake, in preference
8564-
order. Available curves are documented in the go documentation:
8580+
order.
8581+
8582+
Available curves are documented in the Go documentation:
85658583
https://golang.org/pkg/crypto/tls/#CurveID
85668584
items:
85678585
type: string
85688586
type: array
85698587
keyFile:
85708588
description: |-
8571-
Path to the TLS key file in the Prometheus container for the server.
8572-
Mutually exclusive with `keySecret`.
8589+
Path to the TLS private key file in the container for the web server.
8590+
8591+
If defined, either `cert` or `certFile` must be defined.
8592+
8593+
It is mutually exclusive with `keySecret`.
85738594
type: string
85748595
keySecret:
8575-
description: Secret containing the TLS key for the server.
8596+
description: |-
8597+
Secret containing the TLS private key for the web server.
8598+
8599+
Either `cert` or `certFile` must be defined.
8600+
8601+
It is mutually exclusive with `keyFile`.
85768602
properties:
85778603
key:
85788604
description: The key of the secret to select from. Must
@@ -8596,18 +8622,17 @@ spec:
85968622
type: object
85978623
x-kubernetes-map-type: atomic
85988624
maxVersion:
8599-
description: Maximum TLS version that is acceptable. Defaults
8600-
to TLS13.
8625+
description: Maximum TLS version that is acceptable.
86018626
type: string
86028627
minVersion:
8603-
description: Minimum TLS version that is acceptable. Defaults
8604-
to TLS12.
8628+
description: Minimum TLS version that is acceptable.
86058629
type: string
86068630
preferServerCipherSuites:
86078631
description: |-
8608-
Controls whether the server selects the
8609-
client's most preferred cipher suite, or the server's most preferred
8610-
cipher suite. If true then the server's preference, as expressed in
8632+
Controls whether the server selects the client's most preferred cipher
8633+
suite, or the server's most preferred cipher suite.
8634+
8635+
If true then the server's preference, as expressed in
86118636
the order of elements in cipherSuites, is used.
86128637
type: boolean
86138638
type: object

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

Lines changed: 4 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.79.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
1+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.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.5
11-
operator.prometheus.io/version: 0.79.2
10+
controller-gen.kubebuilder.io/version: v0.17.1
11+
operator.prometheus.io/version: 0.80.0
1212
name: podmonitors.monitoring.coreos.com
1313
spec:
1414
group: monitoring.coreos.com
@@ -903,6 +903,7 @@ spec:
903903
904904
If empty, Prometheus uses the global scrape timeout unless it is less
905905
than the target's scrape interval value in which the latter is used.
906+
The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
906907
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
907908
type: string
908909
targetPort:

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

Lines changed: 4 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.79.2/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
1+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.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.5
11-
operator.prometheus.io/version: 0.79.2
10+
controller-gen.kubebuilder.io/version: v0.17.1
11+
operator.prometheus.io/version: 0.80.0
1212
name: probes.monitoring.coreos.com
1313
spec:
1414
group: monitoring.coreos.com
@@ -728,6 +728,7 @@ spec:
728728
description: |-
729729
Timeout for scraping metrics from the Prometheus exporter.
730730
If not specified, the Prometheus global scrape timeout is used.
731+
The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
731732
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
732733
type: string
733734
targetLimit:

0 commit comments

Comments
 (0)