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 56.6.2 #4234

Merged
merged 3 commits into from
Feb 8, 2024
Merged

charts,salt,build: Bump kube-prometheus-stack chart to 56.6.2 #4234

merged 3 commits into from
Feb 8, 2024

Conversation

ezekiel-alexrod
Copy link
Contributor

@ezekiel-alexrod ezekiel-alexrod commented Feb 6, 2024 •
edited
Loading

Bump the kube-prometheus-stack chart to 56.6.2 and also bump grafana image to 10.3.1

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:

./doit.sh codegen:chart_kube-prometheus-stack

@ezekiel-alexrod ezekiel-alexrod requested a review from a team as a code owner February 6, 2024 23:29
@bert-e
Copy link
Contributor

bert-e commented Feb 6, 2024

Hello ezekiel-alexrod,

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 Feb 6, 2024

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:

@ezekiel-alexrod ezekiel-alexrod force-pushed the improvement/bump-kube-prometheus-stack-56.6.2 branch from c7a9f33 to 468a854 Compare February 7, 2024 13:47
@bert-e
Copy link
Contributor

bert-e commented Feb 7, 2024

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
TeddyAndrieux reviewed Feb 7, 2024
View reviewed changes
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux left a comment

Choose a reason for hiding this comment

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

From salt changes it seems there is some other images that also need to be bumped including Thanos, so I suggest to also bump Thanos helm chart

You will also need to include the new extract of alerts rules since there is quite some changes there

salt/metalk8s/addons/prometheus-operator/deployed/chart.sls Show resolved Hide resolved
@ezekiel-alexrod ezekiel-alexrod force-pushed the improvement/bump-kube-prometheus-stack-56.6.2 branch from 468a854 to f888759 Compare February 8, 2024 10:16
@bert-e
Copy link
Contributor

bert-e commented Feb 8, 2024

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:

@ezekiel-alexrod ezekiel-alexrod force-pushed the improvement/bump-kube-prometheus-stack-56.6.2 branch from f888759 to 985c002 Compare February 8, 2024 10:39
@ezekiel-alexrod
charts,salt,build: Bump kube-prometheus-stack chart to 56.6.2
2c691e0 
Bump the kube-prometheus-stack chart to 56.6.2 and also bump bump images:
- prometheus to 2.49.1
- thanos to 0.34.0
- grafana to 10.3.1
- prometheus-config-reloader to v0.71.2
- prometheus-operator to v0.71.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:
```
./doit.sh codegen:chart_kube-prometheus-stack
```

We also bump the thanos image and thanos chart using:
```
rm -rf charts/thanos
helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com
helm repo update
helm fetch -d charts --untar banzaicloud-stable/thanos
```

And re-render the salt state with the following command:
```
./doit.sh codegen:chart_thanos
```

Update also the extracted Prometheus rules
@ezekiel-alexrod
.github: Bump Terraform tag. Force chrony to sync on bastion
311ab1a
@ezekiel-alexrod
.gitignore: Update for temporary files of doit
f5a05df
@ezekiel-alexrod ezekiel-alexrod force-pushed the improvement/bump-kube-prometheus-stack-56.6.2 branch from 985c002 to f5a05df Compare February 8, 2024 13:34
@ezekiel-alexrod
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Feb 8, 2024

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/127.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • 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 Feb 8, 2024

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

  • ✔️ development/127.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • 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 ezekiel-alexrod.

@bert-e bert-e merged commit f5a05df into development/127.0 Feb 8, 2024
38 of 47 checks passed
@bert-e bert-e deleted the improvement/bump-kube-prometheus-stack-56.6.2 branch February 8, 2024 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TeddyAndrieux TeddyAndrieux TeddyAndrieux 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
@ezekiel-alexrod @bert-e @TeddyAndrieux