Skip to content

[release/1.4] vendor: update kubernetes and dependencies to v1.19.10#5387

Merged
AkihiroSuda merged 5 commits intocontainerd:release/1.4from
thaJeztah:1.4_update_k8s
Apr 19, 2021
Merged

[release/1.4] vendor: update kubernetes and dependencies to v1.19.10#5387
AkihiroSuda merged 5 commits intocontainerd:release/1.4from
thaJeztah:1.4_update_k8s

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

vendor: update kubernetes to v1.19.10

Includes updated protos with the gogo/protobuf fixes for CVE-2021-3121

follow-up to / similar as #5018 / #4974

vendor: sigs.k8s.io/structured-merge-diff/v4 v4.0.3

Fixes a panic on pointer to embedded struct
full diff: kubernetes-sigs/structured-merge-diff@v4.0.1...v4.0.3

vendor: golang.org/x/net 69a78807bb2bb6d1599c68698c6b009505012083

full diff: golang/net@ab34263...69a7880

vendor: golang.org/x/sync 67f06af15bc961c363a7260195bcd53487529a21

full diff: golang/sync@42b3178...67f06af

vendor: golang.org/x/sys 5cba982894dd4e8879e3ef0a0c308ceff39f6154

full diff: golang/sys@ed371f2...5cba982

@thaJeztah thaJeztah changed the title vendor: update kubernetes and dependencies to v1.19.10 [release/1.4] vendor: update kubernetes and dependencies to v1.19.10 Apr 19, 2021
@thaJeztah
Copy link
Copy Markdown
Member Author

I kept the golang.org/x/ updates in separate commits, in case we don't need those here (I can remove them in that case, or move them separate)

@thaJeztah thaJeztah added the area/cri Container Runtime Interface (CRI) label Apr 19, 2021
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 19, 2021

Build succeeded.

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 6ca7441 into containerd:release/1.4 Apr 19, 2021
@thaJeztah thaJeztah deleted the 1.4_update_k8s 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