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

Updated containerd1.7; google.golang.org/protobuf #1706

Merged
merged 2 commits into from
Jul 10, 2023
Merged

Updated containerd1.7; google.golang.org/protobuf #1706

merged 2 commits into from
Jul 10, 2023

Commits on Jul 6, 2023

  1. Update containerd1.7; google.golang.org/protobuf 

    Update to containerd 1.7 and move to `google.golang.org/protobuf`
from `github.com/gogo/protobuf/gogoproto`.

These two changes are intertwined, since containerd 1.7 changes its
ttrpc task server definitions and protobuff generation (as well as some
other API changes).
Additionally, the task server gRPC code is imported from containerd
directly, rather than being generated here, and that code now explicitly
imports `google.golang.org/protobuf` instead of
`github.com/gogo/protobuf/gogoproto`.
Upgrading to `google.golang.org/protobuf` also requires updating
the `containerd/cgroups` dependency to v3
(`github.com/containerd/cgroups/v3/cgroup1/stats/`).

The new `protoc-gen-go-grpc` generators do not allow directives such as
`gogoproto.customname`, so the `go-fix-acronym` command is used to
update acronym customization (which is what containerd does).

Updated `Protobuild.toml` to specify new generators.

Added an `Update-Proto.ps1` script to re-generate protobuf files locally
and in GitHub CI.

Add `protobuild` and protobuff `grpc` and `ttrpc` generators to
`tools.go` so they are tracked and vendored, and can be trivially
installed via `go install`.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
    @helsaawy
    helsaawy committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    adfe978 View commit details
    Browse the repository at this point in the history

  2. Vendor protobuf import changes 

    Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
    @helsaawy
    helsaawy committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    f60f498 View commit details
    Browse the repository at this point in the history