Bump kube-prometheus-stack chart version #3360
Conversation
Hello alexandre-allard-scality,My role is to assist you with the merge of this Status report is not available. |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
|
alexandre-allard
force-pushed
the
improvement/3279-bump-dependencies-2-10
branch
from
24e0050 to
db408c7
Compare
ConflictThere is a conflict between your branch Please resolve the conflict on the feature branch ( $ git fetch
$ git checkout origin/improvement/3279-bump-dependencies-2-10
$ git merge origin/development/2.10
$ # <intense conflict resolution>
$ git commit
$ git push origin HEAD:improvement/3279-bump-dependencies-2-10 |
We update the chart to the version 15.4.4 ``` rm -rf charts/kube-prometheus-stack helm repo add prometheus-community https://prometheus-community.github.io/helm-charts helm repo update helm fetch -d charts --untar prometheus-community/kube-prometheus-stack ``` Refs: #3279
We are using Jinja templated strings for some values to be then rendered at runtime by Salt, but it seems that helm templating is also interpreting these tags, so we now escape them. Refs: #3279
This was necessary because of a bug in the version (7.3.1) shipped in the kube-prometheus-stack charts we were using until now. The Grafana version is now 7.5.5 Refs: #3279
This was used by previous kube-prometheus-stack but it is no longer the case, so we remove it. Refs: #3279
Bump images to reflect what is used in kube-prometheus-stack chart in version 15.4.4 Refs: #3279
Version of the chart has been bump to 15.4.4, so we need to regenerate this formula as follows: ``` ./charts/render.py prometheus-operator \ charts/kube-prometheus-stack.yaml \ charts/kube-prometheus-stack/ \ --namespace metalk8s-monitoring \ --service-config grafana \ metalk8s-grafana-config \ metalk8s/addons/prometheus-operator/config/grafana.yaml \ metalk8s-monitoring \ --service-config prometheus \ metalk8s-prometheus-config \ metalk8s/addons/prometheus-operator/config/prometheus.yaml \ metalk8s-monitoring \ --service-config alertmanager \ metalk8s-alertmanager-config \ metalk8s/addons/prometheus-operator/config/alertmanager.yaml \ metalk8s-monitoring \ --service-config dex \ metalk8s-dex-config \ metalk8s/addons/dex/config/dex.yaml.j2 metalk8s-auth \ --drop-prometheus-rules charts/drop-prometheus-rules.yaml \ > salt/metalk8s/addons/prometheus-operator/deployed/chart.sls ``` Refs: #3279
We need to regenerate these files as we bumped the
Prometheus Operator version.
The alerting & recording rules are generated using:
```
$ ./tools/rule_extractor/rule_extractor.py \
-i <control-plane-ip> -p 8443 -t rules
```
Refs: #3279
alexandre-allard
force-pushed
the
improvement/3279-bump-dependencies-2-10
branch
from
db408c7 to
5a8f8e2
Compare
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
|
|
/approve |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
The following options are set: approve |
In the queueThe changeset has received all authorizations and has been added to the The changeset will be merged in:
The following branches will NOT be impacted:
There is no action required on your side. You will be notified here once IMPORTANT Please do not attempt to modify this pull request.
If you need this pull request to be removed from the queue, please contact a The following options are set: approve |
|
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue None. Goodbye alexandre-allard-scality. |
Component: charts, salt, build
Context:
Summary:
Bump kube-prometheus-stack chart version to the latest
Acceptance criteria:
See: #3279