Skip to content

Conversation

jwcesign
Copy link
Contributor

@jwcesign jwcesign commented Apr 17, 2024

…est version

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

I import go lib A, it needs github.com/prometheus/common@v0.48.0
And I also import k8s.io/component-base@v0.29.3(which asks for github.com/prometheus/common@v0.44.0), and the API is not compatible(0.44 ~ 0.48).

We upgrade it to solve the conflicts.

Which issue(s) this PR fixes:

Fixes #none

Special notes for your reviewer:

Realted PR: https://github.com/prometheus/common/pull/576/files#r1506321128

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 release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Apr 17, 2024
@k8s-ci-robot
Copy link
Contributor

Please note that we're already in Test Freeze for the release-1.30 branch. This means every merged PR will be automatically fast-forwarded via the periodic ci-fast-forward job to the release branch of the upcoming v1.30.0 release.

Fast forwards are scheduled to happen every 6 hours, whereas the most recent run was: Wed Apr 17 07:56:14 UTC 2024.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. 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-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 17, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @jwcesign. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-priority Indicates a PR lacks a `priority/foo` label and requires one. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 17, 2024
@k8s-ci-robot k8s-ci-robot requested review from dims, RainbowMango and a team April 17, 2024 10:11
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 17, 2024
@jwcesign jwcesign changed the title upgrade: upgrade dependencies github.com/prometheus/common to the new… upgrade: upgrade dependencies github.com/prometheus/common to the newest version Apr 17, 2024
@jwcesign
Copy link
Contributor Author

/cc @liggitt

Can you please take a look? Thank you.

@k8s-ci-robot k8s-ci-robot requested a review from liggitt April 17, 2024 11:50
@jwcesign
Copy link
Contributor Author

@dims Hi, can you help take a look about this?

@pacoxu
Copy link
Member

pacoxu commented Apr 18, 2024

like #119312, you need run

hack/pin-dependency.sh github.com/prometheus/common v0.48.0
hack//update-vendor.sh
hack//lint-dependencies.sh

@jwcesign
Copy link
Contributor Author

jwcesign commented Apr 18, 2024

@pacoxu Thanks for helping!

Should I do something with this Note?

root@play [21:56:01] [~/git/kubernetes] [master *]
-> # hack/update-vendor.sh
+++ [0418 21:56:50] logfile at /tmp/update-vendor.7OL2/update-vendor.log
+++ [0418 21:56:50] go.mod: update staging references
+++ [0418 21:57:11] go.mod: propagate to staging modules
+++ [0418 21:57:17] go.mod: sorting staging modules
+++ [0418 21:57:57] go.mod: tidying
+++ [0418 21:59:53] go.mod: adding generated comments
+++ [0418 21:59:55] vendor: updating internal modules
+++ [0418 22:00:47] vendor: running 'go work vendor'
+++ [0418 22:00:53] vendor: updating vendor/LICENSES
+++ [0418 22:01:03] vendor: creating OWNERS file
+++ [0418 22:01:03] NOTE: don't forget to handle vendor/* and LICENSE/* files that were added or removed

@pacoxu
Copy link
Member

pacoxu commented Apr 18, 2024

https://github.com/kubernetes/kubernetes/blob/e6efba3380c87503f918053c0511587485a2f828/hack/update-vendor.sh#L433-L434

As the note say, you can ignore it if you do not add a new dep or remove one.
You can just run hack/update-vendor-licenses.sh to confirm(there should be no change after running it).

BTW, code block using ``` is preferred than screenshot. It's not convenient to copy-paste from a screenshot.

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 18, 2024
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 19, 2024
@dashpole
Copy link
Contributor

/lgtm
/approve
for sig-instrumentation

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

LGTM label has been added.

Git tree hash: 10288b778cb8c80a7060888453e32a687770463c

@jwcesign
Copy link
Contributor Author

/test pull-kubernetes-e2e-kind-ipv6

…est version

Signed-off-by: jwcesign <jwcesign@gmail.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 20, 2024
@k8s-ci-robot k8s-ci-robot requested a review from dashpole April 20, 2024 01:53
@jwcesign
Copy link
Contributor Author

/cc @smarterclayton @alexzielenski
Hi, can you help checking about the e2e modification, thanks!

@pacoxu
Copy link
Member

pacoxu commented Apr 22, 2024

/lgtm
after rebase
/assign @dims @liggitt

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

LGTM label has been added.

Git tree hash: 14fa2bacdbaf1fb6f8b22383872598b8520a678b

@dims
Copy link
Member

dims commented Apr 22, 2024

One library down :) checked the diffs, looks good to me.

/approve
/lgtm

--- /logs/artifacts/stats-base.txt	2024-04-20 01:56:06.203450224 +0000
+++ /logs/artifacts/stats.txt	2024-04-20 01:55:59.953379917 +0000
@@ -1,4 +1,4 @@
-Direct Dependencies: 199 
+Direct Dependencies: 198 
 Transitive Dependencies: 332 
 Total Dependencies: 377 
 Max Depth Of Dependencies: 24 

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dashpole, dims, jwcesign, logicalhan

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 22, 2024
@k8s-ci-robot k8s-ci-robot merged commit 76de052 into kubernetes:master Apr 22, 2024
@k8s-ci-robot k8s-ci-robot added this to the v1.31 milestone Apr 22, 2024
@alculquicondor
Copy link
Member

Any chance this will be cherry-picked to v1.30?

@liggitt
Copy link
Member

liggitt commented May 13, 2024

Any chance this will be cherry-picked to v1.30?

likely not... we don't generally bump dependencies on release branches unless required for security fixes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/test 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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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/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/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
Archived in project
Archived in project
Development

Successfully merging this pull request may close these issues.

8 participants