Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INTEGRATION [PR#4365 > development/128.0] build: bump kube-prometheus-stack to 61.3.0 #4372

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 40 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,31 @@
(PR[#4363](https://github.com/scality/metalk8s/pull/4363))

- Bump kube-prometheus-stack chart version to
[57.2.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-57.2.0)
(PR[#4300](https://github.com/scality/metalk8s/pull/4300))
[61.3.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-61.3.0)
(PR[#4365](https://github.com/scality/metalk8s/pull/4365))

This change includes:

- Bump Prometheus container version to
[2.51.0](https://github.com/prometheus/prometheus/releases/tag/v2.51.0)
[2.53.0](https://github.com/prometheus/prometheus/releases/tag/v2.53.0)
- Bump Thanos container version to
[0.35.1](https://github.com/thanos-io/thanos/releases/tag/v0.35.1)
- Bump grafana chart version to
[7.3.7](https://github.com/grafana/helm-charts/releases/tag/grafana-7.3.7),
[8.3.2](https://github.com/grafana/helm-charts/releases/tag/grafana-8.3.2),
Grafana container version to
[10.4.0](https://github.com/grafana/grafana/releases/tag/v10.4.0),
[11.1.0](https://github.com/grafana/grafana/releases/tag/v11.1.0),
and kiwigrid/k8s-sidecar container version to
[1.26.1](https://github.com/kiwigrid/k8s-sidecar/releases/tag/1.26.1)
- Bump kube-state-metrics chart version to
[5.18.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-state-metrics-5.18.0)
[5.21.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-state-metrics-5.21.0)
and kube-state-metrics container version to
[2.11.0](https://github.com/kubernetes/kube-state-metrics/releases/tag/v2.11.0)
[2.12.0](https://github.com/kubernetes/kube-state-metrics/releases/tag/v2.12.0)
- Bump prometheus-node-exporter chart version to
[4.32.0](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-node-exporter-4.32.0)
[4.37.0](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-node-exporter-4.37.0)
and node-exporter container version to
[1.8.1](https://github.com/prometheus/node_exporter/releases/tag/v1.8.1)
- Bump prometheus-operator and prometheus-config-reloader containers version to
[0.72.0](https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.72.0)
[0.75.0](https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.75.0)

- Bump Prometheus Adapter chart version to
[4.10.0](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-adapter-4.10.0)
Expand Down Expand Up @@ -127,6 +131,33 @@
- Bump Calico version to [3.28.0](https://github.com/projectcalico/calico/releases/tag/v3.28.0)
(PR[#4363](https://github.com/scality/metalk8s/pull/4363))

- Bump kube-prometheus-stack chart version to
[61.3.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-61.3.0)
(PR[#4365](https://github.com/scality/metalk8s/pull/4365))

This change includes:

- Bump Prometheus container version to
[2.53.0](https://github.com/prometheus/prometheus/releases/tag/v2.53.0)
- Bump Thanos container version to
[0.35.1](https://github.com/thanos-io/thanos/releases/tag/v0.35.1)
- Bump grafana chart version to
[8.3.2](https://github.com/grafana/helm-charts/releases/tag/grafana-8.3.2),
Grafana container version to
[11.1.0](https://github.com/grafana/grafana/releases/tag/v11.1.0),
and kiwigrid/k8s-sidecar container version to
[1.26.1](https://github.com/kiwigrid/k8s-sidecar/releases/tag/1.26.1)
- Bump kube-state-metrics chart version to
[5.21.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-state-metrics-5.21.0)
and kube-state-metrics container version to
[2.12.0](https://github.com/kubernetes/kube-state-metrics/releases/tag/v2.12.0)
- Bump prometheus-node-exporter chart version to
[4.37.0](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-node-exporter-4.37.0)
and node-exporter container version to
[1.8.1](https://github.com/prometheus/node_exporter/releases/tag/v1.8.1)
- Bump prometheus-operator and prometheus-config-reloader containers version to
[0.75.0](https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.75.0)

## Release 127.0.3

### Enhancements
Expand Down
28 changes: 14 additions & 14 deletions buildchain/buildchain/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
),
Image(
name="grafana",
version="10.4.0",
digest="sha256:f9811e4e687ffecf1a43adb9b64096c50bc0d7a782f8608530f478b6542de7d5",
version="11.1.0",
digest="sha256:079600c9517b678c10cda6006b4487d3174512fd4c6cface37df7822756ed7a5",
),
Image(
name="k8s-sidecar",
Expand Down Expand Up @@ -170,8 +170,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
),
Image(
name="kube-state-metrics",
version="v2.11.0",
digest="sha256:11da79c0e80e9cc755f84a3fc0cd0269be57148aad2587059abe3296e84b67e9",
version="v2.12.0",
digest="sha256:b401fae262a5decf83c4311083f8efb4d6ca7b6a733e57b95344cb8dccd14e11",
),
Image(
name="nginx",
Expand All @@ -187,8 +187,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
),
Image(
name="node-exporter",
version="v1.7.0",
digest="sha256:4cb2b9019f1757be8482419002cb7afe028fdba35d47958829e4cfeaf6246d80",
version="v1.8.1",
digest="sha256:fa7fa12a57eff607176d5c363d8bb08dfbf636b36ac3cb5613a202f3c61a6631",
),
Image(
name="pause",
Expand All @@ -197,8 +197,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
),
Image(
name="prometheus",
version="v2.51.0",
digest="sha256:5ccad477d0057e62a7cd1981ffcc43785ac10c5a35522dc207466ff7e7ec845f",
version="v2.53.0",
digest="sha256:bc1794e85c9e00293351b967efa267ce6af1c824ac875a9d0c7ac84700a8b53e",
),
Image(
name="prometheus-adapter",
Expand All @@ -207,18 +207,18 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
),
Image(
name="prometheus-config-reloader",
version="v0.72.0",
digest="sha256:89a6c7d3fd614ee1ed556f515f5ecf2dba50eec9af418ac8cd129d5fcd2f5c18",
version="v0.75.0",
digest="sha256:536f5709c0d8db50188d02c89ba3dd1df7be79124a7f624159ca3564b6168828",
),
Image(
name="prometheus-operator",
version="v0.72.0",
digest="sha256:804d9569455dc278e378456106431a44a70b1342a0837dbacc85429c95cc72c6",
version="v0.75.0",
digest="sha256:f347f1b2445e486f1fb05c6ab0fa35adafc3b6510af66423d16da068b31a5dec",
),
Image(
name="thanos",
version="v0.34.1",
digest="sha256:3da22be605f29ddd83dd8b2daf98890fb5644717b778d9ca466bd68b706b742e",
version="v0.35.1",
digest="sha256:567346c3f6ff2927c2c6c0daad977b2213f62d45eca54d48afd19e6deb902181",
),
# Local images
Image(
Expand Down
10 changes: 5 additions & 5 deletions charts/kube-prometheus-stack/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ dependencies:
version: 0.0.0
- name: kube-state-metrics
repository: https://prometheus-community.github.io/helm-charts
version: 5.18.0
version: 5.21.0
- name: prometheus-node-exporter
repository: https://prometheus-community.github.io/helm-charts
version: 4.32.0
version: 4.37.0
- name: grafana
repository: https://grafana.github.io/helm-charts
version: 7.3.7
version: 8.3.2
- name: prometheus-windows-exporter
repository: https://prometheus-community.github.io/helm-charts
version: 0.3.1
digest: sha256:a4caa4290b104622838fc72e36bfa00bd2318ca7821ed2374585c6d8685737a9
generated: "2024-03-27T15:52:55.159606534Z"
digest: sha256:d0905cfd40198f6e7be6ac365c39f543dc51b13b59cfd5fb98c5308c2b2c59bc
generated: "2024-07-09T14:48:14.237627583Z"
10 changes: 5 additions & 5 deletions charts/kube-prometheus-stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ annotations:
url: https://github.com/prometheus-operator/kube-prometheus
artifacthub.io/operator: "true"
apiVersion: v2
appVersion: v0.72.0
appVersion: v0.75.0
dependencies:
- condition: crds.enabled
name: crds
Expand All @@ -16,15 +16,15 @@ dependencies:
- condition: kubeStateMetrics.enabled
name: kube-state-metrics
repository: https://prometheus-community.github.io/helm-charts
version: 5.18.*
version: 5.21.*
- condition: nodeExporter.enabled
name: prometheus-node-exporter
repository: https://prometheus-community.github.io/helm-charts
version: 4.32.*
version: 4.37.*
- condition: grafana.enabled
name: grafana
repository: https://grafana.github.io/helm-charts
version: 7.3.*
version: 8.3.*
- condition: windowsMonitoring.enabled
name: prometheus-windows-exporter
repository: https://prometheus-community.github.io/helm-charts
Expand Down Expand Up @@ -62,4 +62,4 @@ sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
type: application
version: 57.2.0
version: 61.3.0
61 changes: 61 additions & 0 deletions charts/kube-prometheus-stack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,67 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen

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

### From 60.x to 61.x

This version upgrades Prometheus-Operator to v0.75.0

Run these commands to update the CRDs before applying the upgrade.

```console
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.75.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.75.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.75.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.75.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.75.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.75.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.75.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.75.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.75.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.75.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
```

### From 59.x to 60.x

This version upgrades the Grafana chart to v8.0.x which introduces Grafana 11. This new major version of Grafana contains some breaking changes described in [Breaking changes in Grafana v11.0](https://grafana.com/docs/grafana/latest/breaking-changes/breaking-changes-v11-0/).

### From 58.x to 59.x

This version upgrades Prometheus-Operator to v0.74.0

Run these commands to update the CRDs before applying the upgrade.

```console
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.74.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
```

### From 57.x to 58.x

This version upgrades Prometheus-Operator to v0.73.0

Run these commands to update the CRDs before applying the upgrade.

```console
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.73.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
```

### From 56.x to 57.x

This version upgrades Prometheus-Operator to v0.72.0
Expand Down
Loading
Loading