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.

Sign up for GitHub

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

Jump to bottom

[prometheus] Bump chart dependencies #3422

Merged
merged 13 commits into from
Jul 6, 2023
Merged

[prometheus] Bump chart dependencies #3422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
46362be
Bump chart dependencies
zeritti Apr 29, 2023
b3dd332
remove minor version changes
monotek Jun 21, 2023
c4fb8e1
Merge community/main
zeritti Jun 22, 2023
e5515df
Update dependencies with node exporter chart patch
zeritti Jun 22, 2023
fca1759
Merge branch 'main' into feat/prometheus-subcharts-bump
zeritti Jun 25, 2023
24ba4b5
Merge community/main into feat/prometheus-subcharts-bump
zeritti Jun 27, 2023
b45f0e6
Include the latest KSM release
zeritti Jun 27, 2023
57b42f6
Merge community/main into feat/prometheus-subcharts-bump
zeritti Jun 27, 2023
80c5161
Clear trailing whitespaces
zeritti Jun 27, 2023
9c0fe72
Merge branch 'main' into feat/prometheus-subcharts-bump
zanhsieh Jun 28, 2023
31d2efe
Update README file
zeritti Jun 30, 2023
b7c7e73
Merge branch 'main' into feat/prometheus-subcharts-bump
zeritti Jul 3, 2023
a3684b4
Merge branch 'main' into feat/prometheus-subcharts-bump
zanhsieh Jul 6, 2023
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
12 changes: 6 additions & 6 deletions charts/prometheus/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
dependencies:
- name: alertmanager
repository: https://prometheus-community.github.io/helm-charts
version: 0.30.1
version: 0.33.1
- name: kube-state-metrics
repository: https://prometheus-community.github.io/helm-charts
version: 4.30.0
version: 5.8.1
- name: prometheus-node-exporter
repository: https://prometheus-community.github.io/helm-charts
version: 4.8.1
version: 4.18.1
- name: prometheus-pushgateway
repository: https://prometheus-community.github.io/helm-charts
version: 2.0.4
digest: sha256:1a354a1b56ba502f254057bcf055e7add95c077100640716e976bfbfffa0fdd0
generated: "2023-05-03T12:23:06.523448751-07:00"
version: 2.3.0
digest: sha256:8d4f6a9def838e338d9abf528e3e45a35ea87ae2bf9d4cc8d96e4df6832c4278
generated: "2023-06-27T10:44:03.318233083Z"
10 changes: 5 additions & 5 deletions charts/prometheus/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: prometheus
appVersion: v2.45.0
version: 22.7.0
version: 23.0.0
kubeVersion: ">=1.16.0-0"
description: Prometheus is a monitoring system and time series database.
home: https://prometheus.io/
Expand All @@ -26,19 +26,19 @@ maintainers:
type: application
dependencies:
- name: alertmanager
version: "0.30.*"
version: "0.33.*"
repository: https://prometheus-community.github.io/helm-charts
condition: alertmanager.enabled
- name: kube-state-metrics
version: "4.30.*"
version: "5.8.*"
repository: https://prometheus-community.github.io/helm-charts
condition: kube-state-metrics.enabled
- name: prometheus-node-exporter
version: "4.8.*"
version: "4.18.*"
repository: https://prometheus-community.github.io/helm-charts
condition: prometheus-node-exporter.enabled
- name: prometheus-pushgateway
version: "2.0.*"
version: "2.3.*"
repository: https://prometheus-community.github.io/helm-charts
condition: prometheus-pushgateway.enabled
keywords:
Expand Down
34 changes: 16 additions & 18 deletions charts/prometheus/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ _See [helm repository](https://helm.sh/docs/helm/helm_repo/) for command documen

## Install Chart

Start from Version 16.0, Prometheus chart required Helm 3.7+ in order to install successfully. Please check your Helm chart version before installation.
Starting with version 16.0, the Prometheus chart requires Helm 3.7+ in order to install successfully. Please check your `helm` release before installation.

```console
helm install [RELEASE_NAME] prometheus-community/prometheus
Expand Down Expand Up @@ -60,32 +60,30 @@ A [`values.schema.json`](https://helm.sh/docs/topics/charts/#schema-files) file
## Upgrading Chart

```console
helm upgrade [RELEASE_NAME] [CHART] --install
helm upgrade [RELEASE_NAME] prometheus-community/prometheus --install
```

_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._

### To 22.7
### To 23.0
zeritti marked this conversation as resolved.
Show resolved Hide resolved

`commonMetaLabels` has been added. This can be used to set custom metadata labels to resources created by this chart, e.g. when you have policies requiring certain metadata labels.
Release 5.0.0 of the _kube-state-metrics_ chart introduced a separation of the `image.repository` value in two distinct values:

### To 22.6

Prometheus has been bumped to release [v2.44.0](https://github.com/prometheus/prometheus/releases/tag/v2.44.0).

### To 22.5

clusterRoleNameOverride has been added to deal with situations where there is a use-case to deploy Prometheus server per namespace and hence being able to set the names of ClusterRole and ClusterRoleBinding independently

### To 22.4
```console
image:
registry: registry.k8s.io
repository: kube-state-metrics/kube-state-metrics
```

Support for environment variables in the _prometheus-config-reloader_'s container has been added through `configmapReload.env`. These can be useful together with `configmapReload.reloadUrl` if basic authentication is set at Prometheus.
If a custom values file or CLI flags set `kube-state.metrics.image.repository`, please, set the new values accordingly.

_prometheus-config-reloader_ has been bumped to release [0.65.1](https://github.com/prometheus-operator/prometheus-operator/releases).
If you are upgrading _prometheus-pushgateway_ with the chart and _prometheus-pushgateway_ has been deployed as a statefulset with a persistent volume, the statefulset must be deleted before upgrading the chart, e.g.:

### To 22.3
```bash
kubectl delete sts -l app.kubernetes.io/name=prometheus-pushgateway -n monitoring --cascade=orphan
```

Prometheus has been bumped to release [v2.43.1](https://github.com/prometheus/prometheus/releases/tag/v2.43.1) which is a bugfix release.
Users are advised to review changes in the corresponding chart releases before upgrading.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zeritti
do we need to provide some way to tell how to export the user current data and import to the new version?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which data should that be?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@monotek
templates/pvc.yaml, in case the user enable PVC.

Copy link
Member Author

@zeritti zeritti Jun 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zanhsieh There is no issue related to the pushgateway's data stored in a persistent volume during the upgrade, the volume/its contents are not affected and no change on the pushgateway's side in this respect.

The same is true for Prometheus's PV - no side efects have come up in my tests.

However, whilst upgrading the pushgateway subchart with deployment and persistent volume enabled is straightforward, not so with statefulset and persistent volume - the latter cannot be patched due to changing labels and the upgrade fails. Fo this scenario, I'll have to add a note on upgrading - deleting the pushgateway's statefulset is needed before upgrading.

For prometheus-pushgateway, we should consider whether including the full label set from prometheus-pushgateway.defaultLabels (with app.kubernetes.io/version) in statefulset's spec.volmeClaimTemplates is reasonable as it leads to requiring manual intervention at an upgrade.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zeritti
Thank you for testing that out. I think put some warning text as for pushgateway subchart sts with pvc as you suggested should be fine. We only do due diligence since in that case the user decided to go with sts - that's their choice.

### To 22.0

Expand Down Expand Up @@ -269,7 +267,7 @@ See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_h
helm show values prometheus-community/prometheus
```

You may similarly use the above configuration commands on each chart [dependency](#dependencies) to see it's configurations.
You may similarly use the above configuration commands on each chart [dependency](#dependencies) to see its configurations.

### Scraping Pod Metrics via Annotations

Expand Down