Skip to content

Commit 93c5ead

Browse files
[kube-prometheus-stack] bump operator to 0.80.0
Signed-off-by: Sebastian Gaiser <sebastiangaiser@users.noreply.github.com>
1 parent f4f38ef commit 93c5ead

File tree

13 files changed

+2499
-1296
lines changed

13 files changed

+2499
-1296
lines changed

charts/kube-prometheus-stack/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ name: kube-prometheus-stack
3131
sources:
3232
- https://github.com/prometheus-community/helm-charts
3333
- https://github.com/prometheus-operator/kube-prometheus
34-
version: 68.4.5
35-
appVersion: v0.79.2
34+
version: 69.0.0
35+
appVersion: v0.80.0
3636
kubeVersion: ">=1.19.0-0"
3737
home: https://github.com/prometheus-operator/kube-prometheus
3838
keywords:

charts/kube-prometheus-stack/README.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,25 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen
8585

8686
A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions.
8787

88+
### From 68.x to 69.x
89+
90+
This version upgrades Prometheus-Operator to v0.80.0
91+
Since [68.4.0](https://github.com/prometheus-community/helm-charts/pull/5175) it is also possible to use `crds.upgradeJob.enabled` for upgrading the CRDs.
92+
For traditional upgrades, please run these commands to update the CRDs before applying the upgrade.
93+
94+
```console
95+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
96+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
97+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
98+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
99+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
100+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
101+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
102+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
103+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
104+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.80.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
105+
```
106+
88107
### From 67.x to 68.x
89108

90109
This version drops several metrics by default in order to reduce unnecessary cardinality.

charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.16.5
8-
operator.prometheus.io/version: 0.79.2
7+
controller-gen.kubebuilder.io/version: v0.17.1
8+
operator.prometheus.io/version: 0.80.0
99
name: alertmanagerconfigs.monitoring.coreos.com
1010
spec:
1111
group: monitoring.coreos.com

charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagers.yaml

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.16.5
8-
operator.prometheus.io/version: 0.79.2
7+
controller-gen.kubebuilder.io/version: v0.17.1
8+
operator.prometheus.io/version: 0.80.0
99
name: alertmanagers.monitoring.coreos.com
1010
spec:
1111
group: monitoring.coreos.com
@@ -8427,7 +8427,12 @@ spec:
84278427
description: Defines the TLS parameters for HTTPS.
84288428
properties:
84298429
cert:
8430-
description: Contains the TLS certificate for the server.
8430+
description: |-
8431+
Secret or ConfigMap containing the TLS certificate for the web server.
8432+
8433+
Either `keySecret` or `keyFile` must be defined.
8434+
8435+
It is mutually exclusive with `certFile`.
84318436
properties:
84328437
configMap:
84338438
description: ConfigMap containing data to use for the
@@ -8480,20 +8485,28 @@ spec:
84808485
type: object
84818486
certFile:
84828487
description: |-
8483-
Path to the TLS certificate file in the Prometheus container for the server.
8484-
Mutually exclusive with `cert`.
8488+
Path to the TLS certificate file in the container for the web server.
8489+
8490+
Either `keySecret` or `keyFile` must be defined.
8491+
8492+
It is mutually exclusive with `cert`.
84858493
type: string
84868494
cipherSuites:
84878495
description: |-
8488-
List of supported cipher suites for TLS versions up to TLS 1.2. If empty,
8489-
Go default cipher suites are used. Available cipher suites are documented
8490-
in the go documentation: https://golang.org/pkg/crypto/tls/#pkg-constants
8496+
List of supported cipher suites for TLS versions up to TLS 1.2.
8497+
8498+
If not defined, the Go default cipher suites are used.
8499+
Available cipher suites are documented in the Go documentation:
8500+
https://golang.org/pkg/crypto/tls/#pkg-constants
84918501
items:
84928502
type: string
84938503
type: array
84948504
client_ca:
8495-
description: Contains the CA certificate for client certificate
8505+
description: |-
8506+
Secret or ConfigMap containing the CA certificate for client certificate
84968507
authentication to the server.
8508+
8509+
It is mutually exclusive with `clientCAFile`.
84978510
properties:
84988511
configMap:
84998512
description: ConfigMap containing data to use for the
@@ -8546,30 +8559,43 @@ spec:
85468559
type: object
85478560
clientAuthType:
85488561
description: |-
8549-
Server policy for client authentication. Maps to ClientAuth Policies.
8562+
The server policy for client TLS authentication.
8563+
85508564
For more detail on clientAuth options:
85518565
https://golang.org/pkg/crypto/tls/#ClientAuthType
85528566
type: string
85538567
clientCAFile:
85548568
description: |-
8555-
Path to the CA certificate file for client certificate authentication to the server.
8556-
Mutually exclusive with `client_ca`.
8569+
Path to the CA certificate file for client certificate authentication to
8570+
the server.
8571+
8572+
It is mutually exclusive with `client_ca`.
85578573
type: string
85588574
curvePreferences:
85598575
description: |-
85608576
Elliptic curves that will be used in an ECDHE handshake, in preference
8561-
order. Available curves are documented in the go documentation:
8577+
order.
8578+
8579+
Available curves are documented in the Go documentation:
85628580
https://golang.org/pkg/crypto/tls/#CurveID
85638581
items:
85648582
type: string
85658583
type: array
85668584
keyFile:
85678585
description: |-
8568-
Path to the TLS key file in the Prometheus container for the server.
8569-
Mutually exclusive with `keySecret`.
8586+
Path to the TLS private key file in the container for the web server.
8587+
8588+
If defined, either `cert` or `certFile` must be defined.
8589+
8590+
It is mutually exclusive with `keySecret`.
85708591
type: string
85718592
keySecret:
8572-
description: Secret containing the TLS key for the server.
8593+
description: |-
8594+
Secret containing the TLS private key for the web server.
8595+
8596+
Either `cert` or `certFile` must be defined.
8597+
8598+
It is mutually exclusive with `keyFile`.
85738599
properties:
85748600
key:
85758601
description: The key of the secret to select from. Must
@@ -8593,18 +8619,17 @@ spec:
85938619
type: object
85948620
x-kubernetes-map-type: atomic
85958621
maxVersion:
8596-
description: Maximum TLS version that is acceptable. Defaults
8597-
to TLS13.
8622+
description: Maximum TLS version that is acceptable.
85988623
type: string
85998624
minVersion:
8600-
description: Minimum TLS version that is acceptable. Defaults
8601-
to TLS12.
8625+
description: Minimum TLS version that is acceptable.
86028626
type: string
86038627
preferServerCipherSuites:
86048628
description: |-
8605-
Controls whether the server selects the
8606-
client's most preferred cipher suite, or the server's most preferred
8607-
cipher suite. If true then the server's preference, as expressed in
8629+
Controls whether the server selects the client's most preferred cipher
8630+
suite, or the server's most preferred cipher suite.
8631+
8632+
If true then the server's preference, as expressed in
86088633
the order of elements in cipherSuites, is used.
86098634
type: boolean
86108635
type: object

charts/kube-prometheus-stack/charts/crds/crds/crd-podmonitors.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.16.5
8-
operator.prometheus.io/version: 0.79.2
7+
controller-gen.kubebuilder.io/version: v0.17.1
8+
operator.prometheus.io/version: 0.80.0
99
name: podmonitors.monitoring.coreos.com
1010
spec:
1111
group: monitoring.coreos.com
@@ -900,6 +900,7 @@ spec:
900900
901901
If empty, Prometheus uses the global scrape timeout unless it is less
902902
than the target's scrape interval value in which the latter is used.
903+
The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
903904
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
904905
type: string
905906
targetPort:

charts/kube-prometheus-stack/charts/crds/crds/crd-probes.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.16.5
8-
operator.prometheus.io/version: 0.79.2
7+
controller-gen.kubebuilder.io/version: v0.17.1
8+
operator.prometheus.io/version: 0.80.0
99
name: probes.monitoring.coreos.com
1010
spec:
1111
group: monitoring.coreos.com
@@ -725,6 +725,7 @@ spec:
725725
description: |-
726726
Timeout for scraping metrics from the Prometheus exporter.
727727
If not specified, the Prometheus global scrape timeout is used.
728+
The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
728729
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
729730
type: string
730731
targetLimit:

0 commit comments

Comments
 (0)