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

[v1.10] Backport 19153 #19637

Merged
merged 1 commit into from
May 3, 2022
Merged

Conversation

christarazi
Copy link
Member

@christarazi christarazi commented Apr 29, 2022

[ upstream commit 6c5e2d6 ]

[ Backporter's notes: Needed to bump the Prometheus module in order to
make the upstream commit pass Go's mod checks. ]

Prometheus provides metrics collectors that expose go runtime and go build
information, which can be useful to server administrators, lets expose
them.

Signed-off-by: Chance Zibolski chance.zibolski@gmail.com
Signed-off-by: Chris Tarazi chris@isovalent.com

Backport of #19153

Once this PR is merged, you can update the PR labels via:

$ for pr in 19153; do contrib/backporting/set-labels.py $pr done 1.10; done

[ upstream commit 6c5e2d6 ]

[ Backporter's notes: Needed to bump the Prometheus module in order to
                      make the upstream commit pass Go's mod checks. ]

Prometheus provides metrics collectors that expose go runtime and go build
information, which can be useful to server administrators, lets expose
them.

Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.10 kind/backports This PR provides functionality previously merged into master. labels Apr 29, 2022
@christarazi christarazi changed the title metrics: Add go_* metrics and go_build_info metrics [v1.10] Backport 19153 Apr 29, 2022
@christarazi
Copy link
Member Author

christarazi commented Apr 29, 2022

/test-backport-1.10

Edit:

  • test-1.20-4.19 failed to provision
  • AWS CNI failed unzipping the helm chart

@christarazi christarazi marked this pull request as ready for review April 29, 2022 01:02
@christarazi christarazi requested a review from a team as a code owner April 29, 2022 01:02
@christarazi
Copy link
Member Author

/test-1.20-4.19

@christarazi
Copy link
Member Author

Marking ready to merge as we have approvals and CI has passed except for ci-awscni-1.10 which is broken for v1.10.x runs with the CLI due to the Helm-based install incompatibility.

@christarazi christarazi added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 3, 2022
@aanm
Copy link
Member

aanm commented May 3, 2022

/ci-awscni-1.10

@aanm aanm removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 3, 2022
@aanm
Copy link
Member

aanm commented May 3, 2022

@christarazi I've removed the ready-to-merge label since it has been fixed by #19635

@christarazi
Copy link
Member Author

@aanm It passed. Ready to merge now?

@aditighag
Copy link
Member

@christarazi The PR needs to be rebased.

@aditighag aditighag added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label May 3, 2022
@aanm
Copy link
Member

aanm commented May 3, 2022

@aditighag it's not required at this moment as we have a couple backport PRs open. We can merge all of them, if the CI is green, and them run a CI on a draft PR for the stable branch to double check if everything passes before doing a release.

@aanm aanm merged commit 3e1c673 into cilium:v1.10 May 3, 2022
@christarazi christarazi deleted the pr/v1.10-backport-2022-04-28 branch May 3, 2022 22:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants