Skip to content

Prepare for google.golang.org/protobuf#6835

Merged
estesp merged 3 commits intocontainerd:mainfrom
kzys:proto-upgrade-5
Apr 21, 2022
Merged

Prepare for google.golang.org/protobuf#6835
estesp merged 3 commits intocontainerd:mainfrom
kzys:proto-upgrade-5

Conversation

@kzys
Copy link
Copy Markdown
Member

@kzys kzys commented Apr 20, 2022

These changes are coming from my private google.golang.org/protobuf branch and could be applied before the migration.

Kazuyoshi Kato added 2 commits April 20, 2022 17:14
Embedding these structs will be mandatory after migratring off from
gogo/protobuf (see containerd#6564).

Signed-off-by: Kazuyoshi Kato <[email protected]>
With google.golang.org/protobuf, proto-generated objects only have
ProtoReflect(). They don't have Marshal() anymore (see containerd#6564).

Signed-off-by: Kazuyoshi Kato <[email protected]>
@k8s-ci-robot
Copy link
Copy Markdown

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Seems it is no longer optional after migratring off from
gogo/protobuf (see containerd#6564).

Signed-off-by: Kazuyoshi Kato <[email protected]>
@kzys kzys marked this pull request as ready for review April 20, 2022 17:38
@dmcgowan dmcgowan added this to the 1.7 milestone Apr 20, 2022
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 20, 2022

Build succeeded.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit 320ef91 into containerd:main Apr 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

5 participants