Skip to content

Latest commit

 

History

History
162 lines (111 loc) · 8.2 KB

dependency_management.md

File metadata and controls

162 lines (111 loc) · 8.2 KB

Dependency management

Table of Contents

Main branch

The dependabot is enabled & configured to manage dependencies for etcd main branch. But dependabot doesn't work well for multi-module repository like etcd, see dependabot-core/issues/6678. Usually, human intervention is required each time when dependabot automatically opens some PRs to bump dependencies. Please see the guidance below.

Dependencies used in workflows

The PRs that automatically bump dependencies (see examples below) used in workflows are fine and can be approved & merged directly as long as all checks are successful.

Bumping order

When multiple etcd modules depend on the same package, please bump the package version for all the modules in the correct order. The rule is simple: if module A depends on module B, then bump the dependency for module B before module A. If the two modules do not depend on each other, then it doesn't matter to bump which module first. For example, multiple modules depend on github.com/spf13/cobra, so we need to bump the dependency in the following order,

  • go.etcd.io/etcd/pkg/v3
  • go.etcd.io/etcd/server/v3
  • go.etcd.io/etcd/etcdctl/v3
  • go.etcd.io/etcd/etcdutl/v3
  • go.etcd.io/etcd/tests/v3
  • go.etcd.io/etcd/v3
  • go.etcd.io/etcd/tools/v3 For more details about etcd Golang modules, please check https://etcd.io/docs/next/dev-internal/modules

Note the module go.etcd.io/etcd/tools/v3 doesn't depend on any other modules, nor by any other modules, so it doesn't matter when to bump dependencies for it.

Steps to bump a dependency

Use the github.com/spf13/cobra as an example, follow the steps below to bump it from 1.6.1 to 1.7.0 for module go.etcd.io/etcd/etcdctl/v3,

cd ${ETCD_ROOT_DIR}/etcdctl
go get github.com/spf13/[email protected]
go mod tidy
cd ..
./scripts/fix.sh

Execute the same steps for all other modules. When you finish bumping the dependency for all modules, then commit the change,

git add .
git commit --signoff -m "dependency: bump github.com/spf13/cobra from 1.6.1 to 1.7.0"

Please close the related PRs which were automatically opened by dependabot.

When you bump multiple dependencies in one PR, it's recommended to create a separate commit for each dependency. But it isn't a must; for example, you can get all dependencies bumping for the module go.etcd.io/etcd/tools/v3 included in one commit.

Troubleshooting

In an event of bumping the version of protoc, protoc plugins or grpc-gateway, it might change *.proto file which can result in the following error:

[0;31mFAIL: 'genproto' FAILED at Wed Jul 31 07:09:08 UTC 2024
make: *** [Makefile:134: verify-genproto] Error 255

To fix the above error, run the following script from the root of etcd repository:

./scripts/genproto.sh

Indirect dependencies

Usually, we don't bump a dependency if all modules just indirectly depend on it, such as github.com/go-logr/logr.

If an indirect dependency (e.g. D1) causes any CVE or bugs that affect etcd, usually the module (e.g. M1, not part of etcd, but used by etcd) which depends on it should bump the dependency (D1), and then etcd just needs to bump M1. However, if the module (M1) somehow doesn't bump the problematic dependency, then etcd can still bump it (D1) directly following the same steps above. But as a long-term solution, etcd should try to remove the dependency on such module (M1) that lack maintenance.

For mixed cases, in which some modules directly while others indirectly depend on a dependency, we have multiple options,

  • Bump the dependency for all modules, no matter it's direct or indirect dependency.
  • Bump the dependency only for modules that directly depend on it.

We should try to follow the first way, and temporarily fall back to the second one if we run into any issue on the first way. Eventually we should fix the issue and ensure all modules depend on the same version of the dependency.

Known incompatible dependency updates

arduino/setup-protoc

Please refer to build(deps): bump arduino/setup-protoc from 1.3.0 to 2.0.0

Rotation worksheet

The dependabot scheduling interval is weekly; it means dependabot will automatically raise a bunch of PRs per week. Usually, human intervention is required each time. We have a rotation worksheet, and everyone is welcome to participate; you just need to register your name in the worksheet.

Stable branches

Usually, we don't proactively bump dependencies for stable releases unless there are any CVEs or bugs that affect etcd.

If we have to do it, then follow the same guidance above. Note that there is no ./scripts/fix.sh in release-3.4, so no need to execute it for 3.4.

Golang versions

The etcd project aims to maintain a development branch that is on the latest Go version, ideally, this will align with the Go version in use for Kubernetes project development. For an example of how to update etcd to a new minor release of Go refer to issue #16393 and the linked pull requests.

Suggested steps for performing a minor version upgrade for the etcd development branch:

  1. Carefully review new Go version release notes and potentially related blog posts for any deprecations, performance impacts, or other considerations.
  2. Create a GitHub issue to signal intent to upgrade and invite discussion, for example, #16393.
  3. Complete the upgrade locally in your development environment by editing .go-version and running make fix.
  4. Run performance benchmarks locally to compare before and after.
  5. Raise a pull request for the changes, for example, #16394.

Stable etcd release branches will be maintained to stay on the latest patch release of a supported Go version. Upgrading minor versions will be completed before the minor version in use currently is no longer supported. Refer to the Go release policy.

For an example of how to update etcd to a new patch release of Go refer to issue #16343 and the linked pull requests.

References:

Core dependencies mappings

bbolt and raft are two core dependencies of etcd.

Both etcd 3.4.x and 3.5.x depend on bbolt 1.3.x, and etcd 3.6.x (main branch) depends on bbolt 1.4.x.

raft is included in the etcd repository for release-3.4 and release-3.5 branches, so etcd 3.4.x and 3.5.x do not depend on any external raft module. We moved raft into a separate repository starting from 3.6 (main branch), and the first raft release will be v3.6.0, so etcd 3.6.x will depend on raft 3.6.x.

Please see the table below:

etcd versions bbolt versions raft versions
3.4.x v1.3.x N/A
3.5.x v1.3.x N/A
3.6.x v1.4.x v3.6.x