From 34114d0f7e0b9fb35338fc6709f8694393f1cdc1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Feb 2023 21:56:10 +1100
Subject: [PATCH] Bump github.com/containerd/containerd from 1.6.17 to 1.6.18
 (#6000)

Bumps
[github.com/containerd/containerd](https://github.com/containerd/containerd)
from 1.6.17 to 1.6.18.
<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.18</h2>
<p>Welcome to the v1.6.18 release of containerd!</p>
<p>The eighteenth patch release for containerd 1.6 includes fixes for
CVE-2023-25153 and CVE-2023-25173
along with a security update for Go.</p>
<h3>Notable Updates</h3>
<ul>
<li><strong>Fix OCI image importer memory exhaustion</strong> (<a
href="https://github.com/containerd/containerd/security/advisories/GHSA-259w-8hf6-59c2">GHSA-259w-8hf6-59c2</a>)</li>
<li><strong>Fix supplementary groups not being set up properly</strong>
(<a
href="https://github.com/containerd/containerd/security/advisories/GHSA-hmfx-3pcx-653p">GHSA-hmfx-3pcx-653p</a>)</li>
<li><strong>Revert removal of <code>/sbin/apparmor_parser</code>
check</strong> (<a
href="https://github-redirect.dependabot.com/containerd/containerd/pull/8087">#8087</a>)</li>
<li><strong>Update Go to 1.19.6</strong> (<a
href="https://github-redirect.dependabot.com/containerd/containerd/pull/8111">#8111</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>Akihiro Suda</li>
<li>Derek McGowan</li>
<li>Ye Sijun</li>
<li>Samuel Karp</li>
<li>Bjorn Neergaard</li>
<li>Wei Fu</li>
<li>Brian Goff</li>
<li>Iceber Gu</li>
<li>Kazuyoshi Kato</li>
<li>Phil Estes</li>
<li>Swagat Bora</li>
</ul>
<h3>Changes</h3>
<!-- raw HTML omitted -->
<ul>
<li>[release/1.6] Prepare release notes for v1.6.18 (<a
href="https://github-redirect.dependabot.com/containerd/containerd/pull/8118">#8118</a>)
<ul>
<li><a
href="https://github.com/containerd/containerd/commit/44e61d7641f71f44353263306a4967276933173b"><code>44e61d764</code></a>
Add release notes for v1.6.18</li>
</ul>
</li>
<li>Github Security Advisory <a
href="https://github.com/containerd/containerd/security/advisories/GHSA-hmfx-3pcx-653p">GHSA-hmfx-3pcx-653p</a>
<ul>
<li><a
href="https://github.com/containerd/containerd/commit/286a01f350a2298b4fdd7e2a0b31c04db3937ea8"><code>286a01f35</code></a>
oci: fix additional GIDs</li>
<li><a
href="https://github.com/containerd/containerd/commit/301823453d788ce409e222e88a27d7faf2c2093d"><code>301823453</code></a>
oci: fix loop iterator aliasing</li>
<li><a
href="https://github.com/containerd/containerd/commit/0070ab70fa58045d25fc6ebab27edcae328e38f1"><code>0070ab70f</code></a>
oci: skip checking gid for WithAppendAdditionalGroups</li>
<li><a
href="https://github.com/containerd/containerd/commit/16d52de64d9b0b0e4bf7e11226199281561a3d96"><code>16d52de64</code></a>
refactor: reduce duplicate code</li>
<li><a
href="https://github.com/containerd/containerd/commit/b45e30292ce9b214158fa403a6165aabbf5b23f0"><code>b45e30292</code></a>
add WithAdditionalGIDs test</li>
<li><a
href="https://github.com/containerd/containerd/commit/0a06c284aec5860a58a803b5da83def3462dc3a0"><code>0a06c284a</code></a>
add WithAppendAdditionalGroups helper</li>
</ul>
</li>
<li>Github Security Advisory <a
href="https://github.com/containerd/containerd/security/advisories/GHSA-259w-8hf6-59c2">GHSA-259w-8hf6-59c2</a>
<ul>
<li><a
href="https://github.com/containerd/containerd/commit/84936fd1f6a0670ab8c7665cb87fae6b87b0b908"><code>84936fd1f</code></a>
importer: stream oci-layout and manifest.json</li>
</ul>
</li>
<li>[1.6] Add fallback for windows platforms without osversion (<a
href="https://github-redirect.dependabot.com/containerd/containerd/pull/8106">#8106</a>)
<ul>
<li><a
href="https://github.com/containerd/containerd/commit/b327af6a4f635611d8b59beec94db0beace48063"><code>b327af6a4</code></a>
Add fallback for windows platforms without osversion</li>
</ul>
</li>
<li>[release/1.6] Go 1.19.6 (<a
href="https://github-redirect.dependabot.com/containerd/containerd/pull/8111">#8111</a>)</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/containerd/containerd/commit/2456e983eb9e37e47538f59ea18f2043c9a73640"><code>2456e98</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/containerd/containerd/issues/8118">#8118</a>
from dmcgowan/prepare-v1.6.18</li>
<li><a
href="https://github.com/containerd/containerd/commit/44e61d7641f71f44353263306a4967276933173b"><code>44e61d7</code></a>
Add release notes for v1.6.18</li>
<li><a
href="https://github.com/containerd/containerd/commit/133f6bb6cd827ce35a5fb279c1ead12b9d21460a"><code>133f6bb</code></a>
Merge pull request from GHSA-hmfx-3pcx-653p</li>
<li><a
href="https://github.com/containerd/containerd/commit/0c314901076a74a7b797a545d2f462285fdbb8c4"><code>0c31490</code></a>
Merge pull request from GHSA-259w-8hf6-59c2</li>
<li><a
href="https://github.com/containerd/containerd/commit/9cec7a87c5537e7a02f83d0ae0a7af38f178c3d5"><code>9cec7a8</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/containerd/containerd/issues/8106">#8106</a>
from cpuguy83/1.6_loosen_windows_platform_matching</li>
<li><a
href="https://github.com/containerd/containerd/commit/47f1aad3b4de2a55739b83876f376b1a7b71da2a"><code>47f1aad</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/containerd/containerd/issues/8111">#8111</a>
from AkihiroSuda/cherrypick-8109-1.6</li>
<li><a
href="https://github.com/containerd/containerd/commit/54ead5b7b71a0f458566e42eac28eb274286af47"><code>54ead5b</code></a>
Go 1.19.6</li>
<li><a
href="https://github.com/containerd/containerd/commit/b327af6a4f635611d8b59beec94db0beace48063"><code>b327af6</code></a>
Add fallback for windows platforms without osversion</li>
<li><a
href="https://github.com/containerd/containerd/commit/4d724f66eb8733b2391becdfaf41360a03b6368c"><code>4d724f6</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/containerd/containerd/issues/8094">#8094</a>
from Iceber/ctr_run_1.6</li>
<li><a
href="https://github.com/containerd/containerd/commit/2b4b35ab49b0cea79f76c4f52923c74cfc26ccfb"><code>2b4b35a</code></a>
ctr/run: flags --detach and --rm cannot be specified together</li>
<li>Additional commits viewable in <a
href="https://github.com/containerd/containerd/compare/v1.6.17...v1.6.18">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.17&new-version=1.6.18)](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)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 3e91f5c2364..5686e34be06 100644
--- a/go.mod
+++ b/go.mod
@@ -42,7 +42,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.17
+	github.com/containerd/containerd v1.6.18
 	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
diff --git a/go.sum b/go.sum
index b340849811e..606408c4e08 100644
--- a/go.sum
+++ b/go.sum
@@ -185,8 +185,8 @@ github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWH
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA=
-github.com/containerd/containerd v1.6.17 h1:XDnJIeJW0cLf6v7/+N+6L9kGrChHeXekZp2VHu6OpiY=
-github.com/containerd/containerd v1.6.17/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw=
+github.com/containerd/containerd v1.6.18 h1:qZbsLvmyu+Vlty0/Ex5xc0z2YtKpIsb5n45mAMI+2Ns=
+github.com/containerd/containerd v1.6.18/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=