Skip to content

go.mod: update kubernetes to v1.20.6#5385

Merged
AkihiroSuda merged 1 commit intocontainerd:masterfrom
thaJeztah:bump_kubernetes_1.20.6
Apr 19, 2021
Merged

go.mod: update kubernetes to v1.20.6#5385
AkihiroSuda merged 1 commit intocontainerd:masterfrom
thaJeztah:bump_kubernetes_1.20.6

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Includes updated protos with the gogo/protobuf fixes forCVE-2021-3121 (similar to #4974)

see #5332 (comment)

@thaJeztah
Copy link
Copy Markdown
Member Author

@AkihiroSuda @dims @mikebrow ptal

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 19, 2021

Build succeeded.

@AkihiroSuda AkihiroSuda added cherry-pick/1.4.x area/cri Container Runtime Interface (CRI) labels Apr 19, 2021
@thaJeztah
Copy link
Copy Markdown
Member Author

@AkihiroSuda I don't think this should be cherry-picked for 1.4, as 1.4 is still on Kubernetes 1.19;

containerd/vendor.conf

Lines 78 to 82 in cbcb2f5

k8s.io/api v0.19.4
k8s.io/apimachinery v0.19.4
k8s.io/apiserver v0.19.4
k8s.io/client-go v0.19.4
k8s.io/cri-api v0.19.4

We could update that branch to latest patch release for 1.19 though

@thaJeztah
Copy link
Copy Markdown
Member Author

/test pull-containerd-node-e2e

@thaJeztah
Copy link
Copy Markdown
Member Author

@AkihiroSuda opened #5387 to update 1.4

Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@AkihiroSuda AkihiroSuda merged commit d2d0afa into containerd:master Apr 19, 2021
@thaJeztah thaJeztah deleted the bump_kubernetes_1.20.6 branch April 19, 2021 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/cri Container Runtime Interface (CRI)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants