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

charts,salt,build: Bump kube-prometheus-stack chart to 35.3.1 #3763

Merged
merged 1 commit into from
May 24, 2022
Merged

charts,salt,build: Bump kube-prometheus-stack chart to 35.3.1 #3763

merged 1 commit into from
May 24, 2022

Conversation

TeddyAndrieux
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux commented May 6, 2022 •
edited
Loading

Bump the kube-prometheus-stack chart to 35.3.1 and also bump images:

  • alertmanager to v0.24.0
  • grafana to 8.5.0-ubuntu
  • k8s-sidecar to 1.15.6
  • kube-state-metrics to v2.4.1
  • prometheus to v2.35.0
  • prometheus-config-reloader to v0.56.2
  • prometheus-operator to v0.56.2
  • thanos to v0.25.2

@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner May 6, 2022 20:25
@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-k8s-prom-stack branch 2 times, most recently from fd46e25 to 6525d3f Compare May 17, 2022 12:55
gdemonet
gdemonet reviewed May 20, 2022
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@bert-e
Copy link
Contributor

bert-e commented May 20, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-k8s-prom-stack branch from 6525d3f to d256a64 Compare May 23, 2022 06:58
@bert-e
Copy link
Contributor

bert-e commented May 23, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-k8s-prom-stack branch 6 times, most recently from 1669f5c to 11e78ba Compare May 23, 2022 13:41
@TeddyAndrieux TeddyAndrieux changed the title charts,salt,build: Bump kube-prometheus-stack chart to 35.0.3 charts,salt,build: Bump kube-prometheus-stack chart to 35.3.1 May 23, 2022
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-k8s-prom-stack branch from 11e78ba to 02cc86b Compare May 23, 2022 14:48
@TeddyAndrieux
charts,salt,build: Bump kube-prometheus-stack chart to 35.3.1
9b15525 
Bump the kube-prometheus-stack chart to 35.0.3 and also bump images:
- alertmanager to v0.24.0
- grafana to 8.5.0-ubuntu
- k8s-sidecar to 1.15.6
- kube-state-metrics to v2.4.1
- prometheus to v2.35.0
- prometheus-config-reloader to v0.56.2
- prometheus-operator to v0.56.2
- thanos to v0.25.2

Upgrade the kube-prometheus-stack chart using:
```
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
```

Re-render prometheus-operator salt state using:
```
./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.j2 \
  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 \
  --drop-prometheus-rules charts/drop-prometheus-rules.yaml \
  --patch 'PrometheusRule,metalk8s-monitoring,prometheus-operator-kubernetes-system-kubelet,spec:groups:0:rules:1:for,"5m"' \
  --remove-manifest ConfigMap prometheus-operator-grafana \
  > salt/metalk8s/addons/prometheus-operator/deployed/chart.sls
```

We also bump the thanos image in thanos chart and re-render the chart
with the following command:
```
./charts/render.py thanos charts/thanos.yaml \
  charts/thanos/ --namespace metalk8s-monitoring \
  > salt/metalk8s/addons/prometheus-operator/deployed/thanos-chart.sls
```

Extract again all Prometheus rules using:
```
./tools/rule_extractor/rule_extractor.py \
  -i <control-plane-ip> -p 8443 -t rules
```
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-k8s-prom-stack branch from 02cc86b to 9b15525 Compare May 23, 2022 14:49
@bert-e
Copy link
Contributor

bert-e commented May 24, 2022

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/123.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 24, 2022

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/123.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 4318f95 into development/123.0 May 24, 2022
@bert-e bert-e deleted the improvement/bump-k8s-prom-stack branch May 24, 2022 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TeddyAndrieux @bert-e @gdemonet