From ffa7370752b0613888123db9e4ca2b3c85441692 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Nov 2023 14:02:51 +1100
Subject: [PATCH] Bump github.com/containerd/containerd from 1.7.9 to 1.7.10
 (#7145)

Bumps
[github.com/containerd/containerd](https://github.com/containerd/containerd)
from 1.7.9 to 1.7.10.
<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.7.10</h2>
<p>Welcome to the v1.7.10 release of containerd!</p>
<p>The tenth patch release for containerd 1.7 contains various fixes and
updates.</p>
<h3>Notable Updates</h3>
<ul>
<li><strong>Enhance container image unpack client logs</strong> (<a
href="https://redirect.github.com/containerd/containerd/pull/9379">#9379</a>)</li>
<li><strong>cri: fix using the pinned label to pin image</strong> (<a
href="https://redirect.github.com/containerd/containerd/pull/9381">#9381</a>)</li>
<li><strong>fix: ImagePull should close http connection if there is no
available data to read.</strong> (<a
href="https://redirect.github.com/containerd/containerd/pull/9409">#9409</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>Wei Fu</li>
<li>Iceber Gu</li>
<li>Austin Vazquez</li>
<li>Derek McGowan</li>
<li>Phil Estes</li>
<li>Samuel Karp</li>
<li>ruiwen-zhao</li>
</ul>
<h3>Changes</h3>
<!-- raw HTML omitted -->
<ul>
<li>Add release notes for v1.7.10 (<a
href="https://redirect.github.com/containerd/containerd/pull/9426">#9426</a>)
<ul>
<li><a
href="https://github.com/containerd/containerd/commit/a995fe3a81a933c984ba13dc8bef0271d1aca171"><code>a995fe3a8</code></a>
Add release notes for v1.7.10</li>
</ul>
</li>
<li>[release/1.7] fix: ImagePull should close http connection if there
is no available data to read. (<a
href="https://redirect.github.com/containerd/containerd/pull/9409">#9409</a>)
<ul>
<li><a
href="https://github.com/containerd/containerd/commit/206806128917276994f0949dc599e4c8b8ad8f14"><code>206806128</code></a>
remotes/docker: close connection if no more data</li>
<li><a
href="https://github.com/containerd/containerd/commit/32849396263f9c68f7c4f43a2abc1319488546de"><code>328493962</code></a>
integration: reproduce <a
href="https://redirect.github.com/containerd/containerd/issues/9347">#9347</a></li>
<li><a
href="https://github.com/containerd/containerd/commit/d1aab27cbd8ae75d90ad962a256d6af092dcf451"><code>d1aab27cb</code></a>
fix: deflake TestCRIImagePullTimeout/HoldingContentOpenWriter</li>
</ul>
</li>
<li>[release/1.7] cri: fix using the pinned label to pin image (<a
href="https://redirect.github.com/containerd/containerd/pull/9381">#9381</a>)
<ul>
<li><a
href="https://github.com/containerd/containerd/commit/a2b16d7f9cd44f81ebdcffe92dee107b2ebdca8a"><code>a2b16d7f9</code></a>
cri: fix update of pinned label for images</li>
<li><a
href="https://github.com/containerd/containerd/commit/8dc8618442ad99a254de79200c89eb12284dac6e"><code>8dc861844</code></a>
cri: fix using the pinned label to pin image</li>
</ul>
</li>
<li>[release/1.7] Enhance container image unpack client logs (<a
href="https://redirect.github.com/containerd/containerd/pull/9379">#9379</a>)
<ul>
<li><a
href="https://github.com/containerd/containerd/commit/5930a3750c5db69abf7668e4df003aae8f0beace"><code>5930a3750</code></a>
Enhance container image unpack client logs</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.7.9">v1.7.9</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/containerd/containerd/commit/4e1fe7492b9df85914c389d1f15a3ceedbb280ac"><code>4e1fe74</code></a>
Merge pull request <a
href="https://redirect.github.com/containerd/containerd/issues/9426">#9426</a>
from ruiwen-zhao/1.7.10</li>
<li><a
href="https://github.com/containerd/containerd/commit/a995fe3a81a933c984ba13dc8bef0271d1aca171"><code>a995fe3</code></a>
Add release notes for v1.7.10</li>
<li><a
href="https://github.com/containerd/containerd/commit/21b85e9b176cada83c8fc1cc2e55ac8e5af79087"><code>21b85e9</code></a>
Merge pull request <a
href="https://redirect.github.com/containerd/containerd/issues/9409">#9409</a>
from ruiwen-zhao/progress-fix-1.7</li>
<li><a
href="https://github.com/containerd/containerd/commit/206806128917276994f0949dc599e4c8b8ad8f14"><code>2068061</code></a>
remotes/docker: close connection if no more data</li>
<li><a
href="https://github.com/containerd/containerd/commit/32849396263f9c68f7c4f43a2abc1319488546de"><code>3284939</code></a>
integration: reproduce <a
href="https://redirect.github.com/containerd/containerd/issues/9347">#9347</a></li>
<li><a
href="https://github.com/containerd/containerd/commit/d1aab27cbd8ae75d90ad962a256d6af092dcf451"><code>d1aab27</code></a>
fix: deflake TestCRIImagePullTimeout/HoldingContentOpenWriter</li>
<li><a
href="https://github.com/containerd/containerd/commit/b1c6f01cec3d7d8fefa78b85d74df970b688dd0b"><code>b1c6f01</code></a>
Merge pull request <a
href="https://redirect.github.com/containerd/containerd/issues/9381">#9381</a>
from Iceber/fix_pin_image_1.7</li>
<li><a
href="https://github.com/containerd/containerd/commit/bb0e42aea809dea1968965dad7163a57c3ee73f3"><code>bb0e42a</code></a>
Merge pull request <a
href="https://redirect.github.com/containerd/containerd/issues/9379">#9379</a>
from austinvazquez/cherry-pick-v1.7-01c442147fd084cc...</li>
<li><a
href="https://github.com/containerd/containerd/commit/a2b16d7f9cd44f81ebdcffe92dee107b2ebdca8a"><code>a2b16d7</code></a>
cri: fix update of pinned label for images</li>
<li><a
href="https://github.com/containerd/containerd/commit/8dc8618442ad99a254de79200c89eb12284dac6e"><code>8dc8618</code></a>
cri: fix using the pinned label to pin image</li>
<li>Additional commits viewable in <a
href="https://github.com/containerd/containerd/compare/v1.7.9...v1.7.10">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.7.9&new-version=1.7.10)](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 show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@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 e9275e108b7..f7f1e25cc03 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/ahmetb/go-linq/v3 v3.2.0
 	github.com/bufbuild/connect-go v1.10.0
 	github.com/bufbuild/connect-grpchealth-go v1.1.1
-	github.com/containerd/containerd v1.7.9
+	github.com/containerd/containerd v1.7.10
 	github.com/cppforlife/go-cli-ui v0.0.0-20220622150351-995494831c6c
 	github.com/disintegration/imaging v1.6.2
 	github.com/distribution/reference v0.5.0
diff --git a/go.sum b/go.sum
index c241d26be12..44b925a3b31 100644
--- a/go.sum
+++ b/go.sum
@@ -178,8 +178,8 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
 github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
-github.com/containerd/containerd v1.7.9 h1:KOhK01szQbM80YfW1H6RZKh85PHGqY/9OcEZ35Je8sc=
-github.com/containerd/containerd v1.7.9/go.mod h1:0/W44LWEYfSHoxBtsHIiNU/duEkgpMokemafHVCpq9Y=
+github.com/containerd/containerd v1.7.10 h1:2nfZyT8BV0C3iKu/SsGxKVAf9dp5W7l9nA8JmWmDGuo=
+github.com/containerd/containerd v1.7.10/go.mod h1:0/W44LWEYfSHoxBtsHIiNU/duEkgpMokemafHVCpq9Y=
 github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
 github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=