[3.5] make: Include tools/mod when checking dependency versions #18284

thedtripp · 2024-07-04T22:45:11Z

Backport of ba4b2bf

Related issue: #18180

@ivanvc
I'm not sure how/if to do the version bump for genproto as in: ddfa70f.
Please advise on how/if to do this. Thanks!

Backport of etcd-io@ba4b2bf Related issue: etcd-io#18180 As tools/mod is not part of the test library's modules, the check to verify consistent dependency versions ignored it. Explicitly get the dependencies from this module when running verify-dep. Signed-off-by: D Tripp <[email protected]>

k8s-ci-robot · 2024-07-04T22:45:21Z

Hi @thedtripp. Thanks for your PR.

I'm waiting for a etcd-io 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-sigs/prow repository.

henrybear327 · 2024-07-04T23:10:15Z

/ok-to-test

ivanvc · 2024-07-04T23:18:45Z

@ivanvc
I'm not sure how/if to do the version bump for genproto as in: ddfa70f.
Please advise on how/if to do this. Thanks!

We need to update the following dependencies (refer to https://github.com/etcd-io/etcd/actions/runs/9800578072/job/27062635624):

FAIL: inconsistent versions for depencency: github.com/grpc-ecosystem/grpc-gateway
  ...
  - github.com/grpc-ecosystem/[email protected] from: go.etcd.io/etcd/tests/v3
  - github.com/grpc-ecosystem/[email protected] from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: github.com/mattn/go-colorable
  - github.com/mattn/[email protected] (indirect) from: go.etcd.io/etcd/v3
  - github.com/mattn/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: github.com/mattn/go-runewidth
  ...
  - github.com/mattn/[email protected] (indirect) from: go.etcd.io/etcd/v3
  - github.com/mattn/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: github.com/olekukonko/tablewriter
  ...
  - github.com/olekukonko/[email protected] from: go.etcd.io/etcd/etcdutl/v3
  - github.com/olekukonko/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: github.com/spf13/cobra
  ...
  - github.com/spf13/[email protected] from: go.etcd.io/etcd/v3
  - github.com/spf13/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: google.golang.org/genproto
  ...
  - google.golang.org/[email protected] (indirect) from: go.etcd.io/etcd/v3
  - google.golang.org/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: gopkg.in/yaml.v2
  ...
  - gopkg.in/[email protected] from: go.etcd.io/etcd/tests/v3
  - gopkg.in/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent dependencies

The versions specified in tools/mod need to match the versions used in the rest of the project.

i.e.,

bump tools/mod's github.com/grpc-ecosystem/grpc-gateway from v1.14.0 to v1.16.0
bump tools/mod's github.com/mattn/go-colorable from v0.1.7 to v0.1.11
bump tools/mod's google.golang.org/genproto to @v0.0.0-20230822172742-b8732ec3820d
etc

thedtripp · 2024-07-04T23:21:16Z

@ivanvc
I'm not sure how/if to do the version bump for genproto as in: ddfa70f.
Please advise on how/if to do this. Thanks!

We need to update the following dependencies (refer to https://github.com/etcd-io/etcd/actions/runs/9800578072/job/27062635624):

FAIL: inconsistent versions for depencency: github.com/grpc-ecosystem/grpc-gateway
  ...
  - github.com/grpc-ecosystem/[email protected] from: go.etcd.io/etcd/tests/v3
  - github.com/grpc-ecosystem/[email protected] from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: github.com/mattn/go-colorable
  - github.com/mattn/[email protected] (indirect) from: go.etcd.io/etcd/v3
  - github.com/mattn/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: github.com/mattn/go-runewidth
  ...
  - github.com/mattn/[email protected] (indirect) from: go.etcd.io/etcd/v3
  - github.com/mattn/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: github.com/olekukonko/tablewriter
  ...
  - github.com/olekukonko/[email protected] from: go.etcd.io/etcd/etcdutl/v3
  - github.com/olekukonko/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: github.com/spf13/cobra
  ...
  - github.com/spf13/[email protected] from: go.etcd.io/etcd/v3
  - github.com/spf13/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: google.golang.org/genproto
  ...
  - google.golang.org/[email protected] (indirect) from: go.etcd.io/etcd/v3
  - google.golang.org/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent versions for depencency: gopkg.in/yaml.v2
  ...
  - gopkg.in/[email protected] from: go.etcd.io/etcd/tests/v3
  - gopkg.in/[email protected] (indirect) from: go.etcd.io/etcd/tools/v3
FAIL: inconsistent dependencies

The versions specified in tools/mod need to match the versions used in the rest of the project.

i.e.,

* bump `tools/mod`'s `github.com/grpc-ecosystem/grpc-gateway` from v1.14.0 to v1.16.0

* bump `tools/mod`'s `github.com/mattn/go-colorable` from v0.1.7 to v0.1.11

* **bump `tools/mod`'s `google.golang.org/genproto` to `@v0.0.0-20230822172742-b8732ec3820d`**

* etc

Nice. I think I've got it working. Thanks!

ivanvc · 2024-07-04T23:23:59Z

I suggest not to squash the dependency bumps into a single commit but do one commit per dependency per our dependency management guide. Refer to https://github.com/etcd-io/etcd/pull/18205/commits, https://github.com/etcd-io/etcd/pull/18207/commits

thedtripp · 2024-07-04T23:25:47Z

I suggest not to squash the dependency bumps into a single commit but do one commit per dependency per our dependency management guide. Refer to https://github.com/etcd-io/etcd/pull/18205/commits, https://github.com/etcd-io/etcd/pull/18207/commits

Ok. I'll read those docs and split each dependency into a separate commit.

thedtripp · 2024-07-04T23:38:04Z

/retest

to v1.16.0. Use the same version across all the modules from the project. Signed-off-by: D Tripp <[email protected]>

to v0.1.11 github.com/mattn/go-isatty v0.0.12 to v0.0.14 Use the same version across all the modules from the project. Signed-off-by: D Tripp <[email protected]>

to v0.0.9. Use the same version across all the modules from the project. Signed-off-by: D Tripp <[email protected]>

Use the same version across all the modules from the project. Signed-off-by: D Tripp <[email protected]>

bump honnef.co/go/tools to v0.0.1-2019.2.3 bump gopkg.in/yaml.v2 to v2.4.0 Use the same version across all the modules from the project. Signed-off-by: D Tripp <[email protected]>

to v0.0.0-20230822172742-b8732ec3820d bump tools/mod google.golang.org/genproto/googleapis/api to v0.0.0-20230822172742-b8732ec3820d Use the same version across all the modules from the project. Signed-off-by: D Tripp <[email protected]>

thedtripp · 2024-07-08T20:40:38Z

/cc @ivanvc @ahrtr @jmhbnz

jmhbnz

LGTM - Thanks @thedtripp

ivanvc

LGTM. Thanks, @thedtripp

k8s-ci-robot · 2024-07-09T06:23:04Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ahrtr, ivanvc, jmhbnz, thedtripp

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

Needs approval from an approver in each of these files:

OWNERS

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

…rify-deps [3.5] make: Include tools/mod when checking dependency versions

k8s-ci-robot added the needs-ok-to-test label Jul 4, 2024

k8s-ci-robot added the size/XS label Jul 4, 2024

thedtripp marked this pull request as draft July 4, 2024 22:47

k8s-ci-robot added do-not-merge/work-in-progress size/L and removed size/XS labels Jul 4, 2024

k8s-ci-robot added ok-to-test and removed needs-ok-to-test labels Jul 4, 2024

thedtripp force-pushed the check-tools-mod-in-verify-deps branch from ebdca47 to 5727c64 Compare July 4, 2024 23:56

k8s-ci-robot added size/XS and removed size/L labels Jul 4, 2024

thedtripp added 5 commits July 5, 2024 00:00

dependency: bump tools/mod github.com/grpc-ecosystem/grpc-gateway

d15fbc6

to v1.16.0. Use the same version across all the modules from the project. Signed-off-by: D Tripp <[email protected]>

dependency: bump tools/mod github.com/mattn/go-colorable

cab6d1d

to v0.1.11 github.com/mattn/go-isatty v0.0.12 to v0.0.14 Use the same version across all the modules from the project. Signed-off-by: D Tripp <[email protected]>

dependency: bump tools/mod github.com/mattn/go-runewidth

a562815

to v0.0.9. Use the same version across all the modules from the project. Signed-off-by: D Tripp <[email protected]>

dependency: bump tools/mod github.com/olekukonko/tablewriter to v0.0.5

4420b55

Use the same version across all the modules from the project. Signed-off-by: D Tripp <[email protected]>

dependency: bump tools/mod github.com/spf13/cobra to v1.1.3

64d8a63

bump honnef.co/go/tools to v0.0.1-2019.2.3 bump gopkg.in/yaml.v2 to v2.4.0 Use the same version across all the modules from the project. Signed-off-by: D Tripp <[email protected]>

k8s-ci-robot added size/L and removed size/XS labels Jul 5, 2024

thedtripp force-pushed the check-tools-mod-in-verify-deps branch from 0531747 to 35a9140 Compare July 5, 2024 00:21

thedtripp marked this pull request as ready for review July 8, 2024 20:39

k8s-ci-robot removed the do-not-merge/work-in-progress label Jul 8, 2024

k8s-ci-robot requested review from ahrtr, ivanvc and jmhbnz July 8, 2024 20:40

jmhbnz approved these changes Jul 8, 2024

View reviewed changes

ivanvc approved these changes Jul 9, 2024

View reviewed changes

ahrtr approved these changes Jul 9, 2024

View reviewed changes

ahrtr merged commit 2b2473c into etcd-io:release-3.5 Jul 9, 2024
25 checks passed

thedtripp deleted the check-tools-mod-in-verify-deps branch July 10, 2024 00:32

ivanvc mentioned this pull request Jul 15, 2024

Plan to release etcd v3.5.15 #18247

Closed

4 tasks

aneesh1 pushed a commit to DataDog/etcd that referenced this pull request Sep 24, 2024

Merge pull request etcd-io#18284 from thedtripp/check-tools-mod-in-ve…

65f4a91

…rify-deps [3.5] make: Include tools/mod when checking dependency versions

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[3.5] make: Include tools/mod when checking dependency versions #18284

[3.5] make: Include tools/mod when checking dependency versions #18284

thedtripp commented Jul 4, 2024 •

edited

Loading

k8s-ci-robot commented Jul 4, 2024

henrybear327 commented Jul 4, 2024

ivanvc commented Jul 4, 2024 •

edited

Loading

thedtripp commented Jul 4, 2024

ivanvc commented Jul 4, 2024 •

edited

Loading

thedtripp commented Jul 4, 2024

thedtripp commented Jul 4, 2024

thedtripp commented Jul 8, 2024

jmhbnz left a comment

ivanvc left a comment

k8s-ci-robot commented Jul 9, 2024

[3.5] make: Include tools/mod when checking dependency versions #18284

[3.5] make: Include tools/mod when checking dependency versions #18284

Conversation

thedtripp commented Jul 4, 2024 • edited Loading

k8s-ci-robot commented Jul 4, 2024

henrybear327 commented Jul 4, 2024

ivanvc commented Jul 4, 2024 • edited Loading

thedtripp commented Jul 4, 2024

ivanvc commented Jul 4, 2024 • edited Loading

thedtripp commented Jul 4, 2024

thedtripp commented Jul 4, 2024

thedtripp commented Jul 8, 2024

jmhbnz left a comment

Choose a reason for hiding this comment

ivanvc left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Jul 9, 2024

thedtripp commented Jul 4, 2024 •

edited

Loading

ivanvc commented Jul 4, 2024 •

edited

Loading

ivanvc commented Jul 4, 2024 •

edited

Loading