Skip to content

Commit 19b2a31

Browse files
authored
[kube-prometheus-stack] bump to 0.84.1 (#6025)
1 parent 1c5eb8f commit 19b2a31

13 files changed

+632
-56
lines changed

charts/kube-prometheus-stack/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ name: kube-prometheus-stack
3131
sources:
3232
- https://github.com/prometheus-community/helm-charts
3333
- https://github.com/prometheus-operator/kube-prometheus
34-
version: 75.18.1
34+
version: 76.0.0
3535
# renovate: github=prometheus-operator/prometheus-operator
36-
appVersion: v0.83.0
36+
appVersion: v0.84.1
3737
kubeVersion: ">=1.25.0-0"
3838
home: https://github.com/prometheus-operator/kube-prometheus
3939
keywords:

charts/kube-prometheus-stack/UPGRADE.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# Upgrade
22

3+
## From 75.x to 76.x
4+
5+
This version upgrades Prometheus-Operator to v0.84.1
6+
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.
7+
For traditional upgrades, please run these commands to update the CRDs before applying the upgrade.
8+
9+
```console
10+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
11+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
12+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
13+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
14+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
15+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
16+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
17+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
18+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
19+
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
20+
```
21+
322
## From 74.x to 75.x
423

524
This version renames objects created under `additionalPrometheusRules` and `additionalPrometheusRulesMap`. They used to be prefixed with `{{ template "kube-prometheus-stack.name" $ }}`; they are now prefixed with `{{ template "kube-prometheus-stack.fullname" $ }}` so as to make the object names unique across multiple releases.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.83.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
1+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
22
---
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.18.0
8-
operator.prometheus.io/version: 0.83.0
8+
operator.prometheus.io/version: 0.84.1
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: 178 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.83.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
1+
# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.84.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
22
---
33
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
77
controller-gen.kubebuilder.io/version: v0.18.0
8-
operator.prometheus.io/version: 0.83.0
8+
operator.prometheus.io/version: 0.84.1
99
name: alertmanagers.monitoring.coreos.com
1010
spec:
1111
group: monitoring.coreos.com
@@ -1034,6 +1034,7 @@ spec:
10341034
The default value is `OnNamespace`.
10351035
enum:
10361036
- OnNamespace
1037+
- OnNamespaceExceptForAlertmanagerNamespace
10371038
- None
10381039
type: string
10391040
type: object
@@ -1829,6 +1830,17 @@ spec:
18291830
type: string
18301831
type: object
18311832
type: object
1833+
jira:
1834+
description: The default configuration for Jira.
1835+
properties:
1836+
apiURL:
1837+
description: |-
1838+
The default Jira API URL.
1839+
1840+
It requires Alertmanager >= v0.28.0.
1841+
pattern: ^(http|https)://.+$
1842+
type: string
1843+
type: object
18321844
opsGenieApiKey:
18331845
description: The default OpsGenie API Key.
18341846
properties:
@@ -1887,6 +1899,71 @@ spec:
18871899
This has no impact on alerts from Prometheus, as they always include EndsAt.
18881900
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
18891901
type: string
1902+
rocketChat:
1903+
description: The default configuration for Rocket Chat.
1904+
properties:
1905+
apiURL:
1906+
description: |-
1907+
The default Rocket Chat API URL.
1908+
1909+
It requires Alertmanager >= v0.28.0.
1910+
pattern: ^(http|https)://.+$
1911+
type: string
1912+
token:
1913+
description: |-
1914+
The default Rocket Chat token.
1915+
1916+
It requires Alertmanager >= v0.28.0.
1917+
properties:
1918+
key:
1919+
description: The key of the secret to select from. Must
1920+
be a valid secret key.
1921+
type: string
1922+
name:
1923+
default: ""
1924+
description: |-
1925+
Name of the referent.
1926+
This field is effectively required, but due to backwards compatibility is
1927+
allowed to be empty. Instances of this type with an empty value here are
1928+
almost certainly wrong.
1929+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1930+
type: string
1931+
optional:
1932+
description: Specify whether the Secret or its key
1933+
must be defined
1934+
type: boolean
1935+
required:
1936+
- key
1937+
type: object
1938+
x-kubernetes-map-type: atomic
1939+
tokenID:
1940+
description: |-
1941+
The default Rocket Chat Token ID.
1942+
1943+
It requires Alertmanager >= v0.28.0.
1944+
properties:
1945+
key:
1946+
description: The key of the secret to select from. Must
1947+
be a valid secret key.
1948+
type: string
1949+
name:
1950+
default: ""
1951+
description: |-
1952+
Name of the referent.
1953+
This field is effectively required, but due to backwards compatibility is
1954+
allowed to be empty. Instances of this type with an empty value here are
1955+
almost certainly wrong.
1956+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1957+
type: string
1958+
optional:
1959+
description: Specify whether the Secret or its key
1960+
must be defined
1961+
type: boolean
1962+
required:
1963+
- key
1964+
type: object
1965+
x-kubernetes-map-type: atomic
1966+
type: object
18901967
slackApiUrl:
18911968
description: The default Slack API URL.
18921969
properties:
@@ -2166,6 +2243,98 @@ spec:
21662243
type: string
21672244
type: object
21682245
type: object
2246+
telegram:
2247+
description: The default Telegram config
2248+
properties:
2249+
apiURL:
2250+
description: |-
2251+
The default Telegram API URL.
2252+
2253+
It requires Alertmanager >= v0.24.0.
2254+
pattern: ^(http|https)://.+$
2255+
type: string
2256+
type: object
2257+
victorops:
2258+
description: The default configuration for VictorOps.
2259+
properties:
2260+
apiKey:
2261+
description: The default VictorOps API Key.
2262+
properties:
2263+
key:
2264+
description: The key of the secret to select from. Must
2265+
be a valid secret key.
2266+
type: string
2267+
name:
2268+
default: ""
2269+
description: |-
2270+
Name of the referent.
2271+
This field is effectively required, but due to backwards compatibility is
2272+
allowed to be empty. Instances of this type with an empty value here are
2273+
almost certainly wrong.
2274+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
2275+
type: string
2276+
optional:
2277+
description: Specify whether the Secret or its key
2278+
must be defined
2279+
type: boolean
2280+
required:
2281+
- key
2282+
type: object
2283+
x-kubernetes-map-type: atomic
2284+
apiURL:
2285+
description: The default VictorOps API URL.
2286+
pattern: ^(http|https)://.+$
2287+
type: string
2288+
type: object
2289+
webex:
2290+
description: The default configuration for Jira.
2291+
properties:
2292+
apiURL:
2293+
description: |-
2294+
The default Webex API URL.
2295+
2296+
It requires Alertmanager >= v0.25.0.
2297+
pattern: ^(http|https)://.+$
2298+
type: string
2299+
type: object
2300+
wechat:
2301+
description: The default WeChat Config
2302+
properties:
2303+
apiCorpID:
2304+
description: The default WeChat API Corporate ID.
2305+
minLength: 1
2306+
type: string
2307+
apiSecret:
2308+
description: The default WeChat API Secret.
2309+
properties:
2310+
key:
2311+
description: The key of the secret to select from. Must
2312+
be a valid secret key.
2313+
type: string
2314+
name:
2315+
default: ""
2316+
description: |-
2317+
Name of the referent.
2318+
This field is effectively required, but due to backwards compatibility is
2319+
allowed to be empty. Instances of this type with an empty value here are
2320+
almost certainly wrong.
2321+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
2322+
type: string
2323+
optional:
2324+
description: Specify whether the Secret or its key
2325+
must be defined
2326+
type: boolean
2327+
required:
2328+
- key
2329+
type: object
2330+
x-kubernetes-map-type: atomic
2331+
apiURL:
2332+
description: |-
2333+
The default WeChat API URL.
2334+
The default value is "https://qyapi.weixin.qq.com/cgi-bin/"
2335+
pattern: ^(http|https)://.+$
2336+
type: string
2337+
type: object
21692338
type: object
21702339
name:
21712340
description: |-
@@ -4230,7 +4399,7 @@ spec:
42304399
description: |-
42314400
An optional list of references to secrets in the same namespace
42324401
to use for pulling prometheus and alertmanager images from registries
4233-
see http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod
4402+
see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
42344403
items:
42354404
description: |-
42364405
LocalObjectReference contains enough information to let you locate the
@@ -5787,7 +5956,7 @@ spec:
57875956
Annotations is an unstructured key value map stored with a resource that may be
57885957
set by external tools to store and retrieve arbitrary metadata. They are not
57895958
queryable and should be preserved when modifying objects.
5790-
More info: http://kubernetes.io/docs/user-guide/annotations
5959+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
57915960
type: object
57925961
labels:
57935962
additionalProperties:
@@ -5796,7 +5965,7 @@ spec:
57965965
Map of string keys and values that can be used to organize and categorize
57975966
(scope and select) objects. May match selectors of replication controllers
57985967
and services.
5799-
More info: http://kubernetes.io/docs/user-guide/labels
5968+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
58005969
type: object
58015970
name:
58025971
description: |-
@@ -5805,7 +5974,7 @@ spec:
58055974
automatically. Name is primarily intended for creation idempotence and configuration
58065975
definition.
58075976
Cannot be updated.
5808-
More info: http://kubernetes.io/docs/user-guide/identifiers#names
5977+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
58095978
type: string
58105979
type: object
58115980
portName:
@@ -6476,7 +6645,7 @@ spec:
64766645
Annotations is an unstructured key value map stored with a resource that may be
64776646
set by external tools to store and retrieve arbitrary metadata. They are not
64786647
queryable and should be preserved when modifying objects.
6479-
More info: http://kubernetes.io/docs/user-guide/annotations
6648+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
64806649
type: object
64816650
labels:
64826651
additionalProperties:
@@ -6485,7 +6654,7 @@ spec:
64856654
Map of string keys and values that can be used to organize and categorize
64866655
(scope and select) objects. May match selectors of replication controllers
64876656
and services.
6488-
More info: http://kubernetes.io/docs/user-guide/labels
6657+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
64896658
type: object
64906659
name:
64916660
description: |-
@@ -6494,7 +6663,7 @@ spec:
64946663
automatically. Name is primarily intended for creation idempotence and configuration
64956664
definition.
64966665
Cannot be updated.
6497-
More info: http://kubernetes.io/docs/user-guide/identifiers#names
6666+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
64986667
type: string
64996668
type: object
65006669
spec:

0 commit comments

Comments
 (0)