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

Bump prometheus/common to v0.55.0 #125759

Merged
merged 1 commit into from
Jun 28, 2024
Merged

Bump prometheus/common to v0.55.0 #125759

merged 1 commit into from
Jun 28, 2024

Conversation

dims
Copy link
Member

@dims dims commented Jun 27, 2024 •
edited
Loading

I was catching up on golang/go#19307 and realized that we have 2 goautoneg forks in our dependencies.

Checking on the one that prometheus forked internally, they ended up standardizing on what we use already namely the one maintained by @munnerz here:
prometheus/common#625

So let's switch to the latest prometheus/common to drop the extra copy.

BONUS: one less transitive dependency on google.golang.org/appengine ( see prometheus/common@v0.48.0...v0.55.0 )

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kube-proxy area/kubectl area/kubelet sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 27, 2024
@k8s-ci-robot k8s-ci-robot requested review from andrewsykim, aramase and a team June 27, 2024 12:00
@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Jun 27, 2024
@dims dims changed the title [WIP] Bump prometheus/common to v0.55.0 Bump prometheus/common to v0.55.0 Jun 27, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 27, 2024
@dims dims changed the title Bump prometheus/common to v0.55.0 Bump prometheus/common to v0.55.0 Jun 27, 2024
@mrueg
Copy link
Member

mrueg commented Jun 27, 2024

@dims fyi that there might be a future change coming once we're aligned: prometheus/common#652

@dims
Copy link
Member Author

dims commented Jun 27, 2024

@mrueg ACK!

@dims
Copy link
Member Author

dims commented Jun 27, 2024

/retest

@dgrisonnet
Copy link
Member

/assign
/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jun 27, 2024
@dims
Copy link
Member Author

dims commented Jun 27, 2024

/skip

@BenTheElder
Copy link
Member

/priority important-longterm
working through the diff ...

@k8s-ci-robot k8s-ci-robot added priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jun 27, 2024
@BenTheElder
Copy link
Member

Got through most of it, github has been really slow to expand the diffs ... will come back to this soon.

BenTheElder
BenTheElder reviewed Jun 27, 2024
View reviewed changes
Copy link
Member

@BenTheElder BenTheElder left a comment

Choose a reason for hiding this comment

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

noting binary in vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb

/lgtm
/approve

vendor/github.com/stretchr/testify/mock/mock.go
@@ -18,6 +18,9 @@ import (
"github.com/stretchr/testify/assert"
)

// regex for GCCGO functions
var gccgoRE = regexp.MustCompile(`\.pN\d+_`)
Copy link
Member

Choose a reason for hiding this comment

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

not ideal in runtime code but should be fine in a mock package.

Copy link
Member

Choose a reason for hiding this comment

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

I guess we don't have any way to ensure it's test-import only? something to investigate in the future.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 27, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 89a0ba9ba6d7e8640a329b357c33ad6c333b1b3e

@dims
Copy link
Member Author

dims commented Jun 27, 2024

/assign @liggitt @thockin

(for go.mod/sum changes, needs staging/src/k8s.io/api/OWNERS approval)

thockin
thockin reviewed Jun 27, 2024
View reviewed changes
Copy link
Member

@thockin thockin left a comment

Choose a reason for hiding this comment

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

Thanks!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 27, 2024
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jun 28, 2024 •
edited
Loading

@dims: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kubernetes-e2e-capz-windows-master 35ccdc8 link false /test pull-kubernetes-e2e-capz-windows-master

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@dims
Copy link
Member Author

dims commented Jun 28, 2024

/retest

@liggitt
Copy link
Member

liggitt commented Jun 28, 2024

/lgtm
/approve
/retest

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, dims, liggitt, thockin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 4c44efe into kubernetes:master Jun 28, 2024
21 of 22 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.31 milestone Jun 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thockin thockin thockin left review comments

@BenTheElder BenTheElder BenTheElder left review comments

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@aramase aramase Awaiting requested review from aramase

Assignees

@BenTheElder BenTheElder

@liggitt liggitt

@thockin thockin

@dgrisonnet dgrisonnet

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kube-proxy area/kubectl area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Auth
Archived in project
SIG CLI
Archived in project
SIG Node: code and documentation PRs
Archived in project
Milestone
v1.31
Development

Successfully merging this pull request may close these issues.
7 participants
@dims @mrueg @dgrisonnet @BenTheElder @k8s-ci-robot @liggitt @thockin