Skip to content

Commit

Permalink
Bump github.com/containerd/containerd from 1.6.10 to 1.6.12 (#5783)
Browse files Browse the repository at this point in the history
Bumps
[github.com/containerd/containerd](https://github.com/containerd/containerd)
from 1.6.10 to 1.6.12.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/containerd/containerd/releases">github.com/containerd/containerd's
releases</a>.</em></p>
<blockquote>
<h2>containerd 1.6.12</h2>
<p>Welcome to the v1.6.12 release of containerd!</p>
<p>The twelfth patch release for containerd 1.6 contains a fix for
CVE-2022-23471.</p>
<h3>Notable Updates</h3>
<ul>
<li><strong>Fix goroutine leak during Exec in CRI plugin</strong> (<a
href="https://github.com/containerd/containerd/security/advisories/GHSA-2qjp-425j-52j9">GHSA-2qjp-425j-52j9</a>)</li>
</ul>
<p>See the changelog for complete list of changes</p>
<p>Please try out the release binaries and report any issues at
<a
href="https://github.com/containerd/containerd/issues">https://github.com/containerd/containerd/issues</a>.</p>
<h3>Contributors</h3>
<ul>
<li>Derek McGowan</li>
<li>Danny Canter</li>
<li>Phil Estes</li>
<li>Sebastiaan van Stijn</li>
</ul>
<h3>Changes</h3>
<!-- raw HTML omitted -->
<ul>
<li>Github Security Advisory <a
href="https://github.com/containerd/containerd/security/advisories/GHSA-2qjp-425j-52j9">GHSA-2qjp-425j-52j9</a>
<ul>
<li>Prepare release notes for v1.6.12</li>
<li>CRI stream server: Fix goroutine leak in Exec</li>
</ul>
</li>
<li>[release/1.6] update to go1.18.9 (<a
href="https://github-redirect.dependabot.com/containerd/containerd/pull/7766">#7766</a>)
<ul>
<li>[release/1.6] update to go1.18.9</li>
</ul>
</li>
</ul>
<!-- raw HTML omitted -->
<h3>Dependency Changes</h3>
<p>This release has no dependency changes</p>
<p>Previous release can be found at <a
href="https://github.com/containerd/containerd/releases/tag/v1.6.11">v1.6.11</a></p>
<h2>containerd 1.6.11</h2>
<p>Welcome to the v1.6.11 release of containerd!</p>
<p>The eleventh patch release for containerd 1.6 contains a various
fixes and updates.</p>
<h3>Notable Updates</h3>
<ul>
<li><strong>Add pod UID annotation in CRI plugin</strong> (<a
href="https://github-redirect.dependabot.com/containerd/containerd/pull/7735">#7735</a>)</li>
<li><strong>Fix nil pointer deference for Windows containers in CRI
plugin</strong> (<a
href="https://github-redirect.dependabot.com/containerd/containerd/pull/7737">#7737</a>)</li>
<li><strong>Fix lease labels unexpectedly overwriting
expiration</strong> (<a
href="https://github-redirect.dependabot.com/containerd/containerd/pull/7745">#7745</a>)</li>
<li><strong>Fix for simultaneous diff creation using the same parent
snapshot</strong> (<a
href="https://github-redirect.dependabot.com/containerd/containerd/pull/7756">#7756</a>)</li>
</ul>
<p>See the changelog for complete list of changes</p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/containerd/containerd/commit/a05d175400b1145e5e6a735a6710579d181e7fb0"><code>a05d175</code></a>
Merge pull request from GHSA-2qjp-425j-52j9</li>
<li><a
href="https://github.com/containerd/containerd/commit/1899ebcd8aa5d534d830c1b28008749351f0c92c"><code>1899ebc</code></a>
Prepare release notes for v1.6.12</li>
<li><a
href="https://github.com/containerd/containerd/commit/ec5acd4c15e87be6af97a33b78e3fdb77c555ad4"><code>ec5acd4</code></a>
CRI stream server: Fix goroutine leak in Exec</li>
<li><a
href="https://github.com/containerd/containerd/commit/52a4492e28275c0b2e490828b37404b77c181375"><code>52a4492</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/containerd/containerd/issues/7766">#7766</a>
from thaJeztah/1.6_update_go_1.18.9</li>
<li><a
href="https://github.com/containerd/containerd/commit/9743dbae8b442527647a387b61f5fe52742992c6"><code>9743dba</code></a>
[release/1.6] update to go1.18.9</li>
<li><a
href="https://github.com/containerd/containerd/commit/d986545181c905378b0f90faa9c5eae3cbfa3755"><code>d986545</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/containerd/containerd/issues/7760">#7760</a>
from dmcgowan/prepare-1.6.11</li>
<li><a
href="https://github.com/containerd/containerd/commit/3d24d97ba0487f3279a3c2d05e99ae190a7f95a9"><code>3d24d97</code></a>
Prepare release notes for v1.6.11</li>
<li><a
href="https://github.com/containerd/containerd/commit/864cce9ef0d68f2f15802d4c9fef89a3b6711cb5"><code>864cce9</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/containerd/containerd/issues/7756">#7756</a>
from vvoland/rootfs-diff-multiple</li>
<li><a
href="https://github.com/containerd/containerd/commit/bb96b21e59dcc92b7ed116447dfe17317c3597a8"><code>bb96b21</code></a>
fix: support simultaneous create diff for same parent snapshot</li>
<li><a
href="https://github.com/containerd/containerd/commit/92ee9264c364466e86c42fc18d02c02a072a373e"><code>92ee926</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/containerd/containerd/issues/7745">#7745</a>
from austinvazquez/cherry-pick-c4dee237f57a7f7895aaa...</li>
<li>Additional commits viewable in <a
href="https://github.com/containerd/containerd/compare/v1.6.10...v1.6.12">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/containerd/containerd&package-manager=go_modules&previous-version=1.6.10&new-version=1.6.12)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/vmware-tanzu/kubeapps/network/alerts).

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
dependabot[bot] authored Dec 13, 2022
1 parent 6cb85d4 commit 1df35e9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ require (
github.com/Masterminds/semver/v3 v3.2.0
github.com/adhocore/gronx v1.1.2
github.com/ahmetb/go-linq/v3 v3.2.0
github.com/containerd/containerd v1.6.10
github.com/containerd/containerd v1.6.12
github.com/cppforlife/go-cli-ui v0.0.0-20220622150351-995494831c6c
github.com/disintegration/imaging v1.6.2
github.com/distribution/distribution v2.8.1+incompatible
Expand Down Expand Up @@ -190,7 +190,7 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8a
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
github.com/containerd/containerd v1.4.12/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
github.com/containerd/containerd v1.6.10 h1:8aiav7I2ZyQLbTlNMcBXyAU1FtFvp6VuyuW13qSd6Hk=
github.com/containerd/containerd v1.6.10/go.mod h1:CVqfxdJ95PDgORwA219AwwLrREZgrTFybXu2HfMKRG0=
github.com/containerd/containerd v1.6.12 h1:kJ9b3mOFKf8yqo05Ob+tMoxvt1pbVWhnB0re9Y+k+8c=
github.com/containerd/containerd v1.6.12/go.mod h1:K4Bw7gjgh4TnkmQY+py/PYQGp4e7xgnHAeg87VeWb3A=
github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM=
github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok=
Expand Down Expand Up @@ -801,8 +801,8 @@ github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4
github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM=
github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
Expand Down

0 comments on commit 1df35e9

Please sign in to comment.