[release/1.6] Fix cpu architecture detection issue on emulated ARM platform #8533

fangn2 · 2023-05-18T21:08:41Z

The PR #7636 to fix cpu architecture detection issue on emulated ARM platform was part of release 1.7, but not in 1.6.

Since docker cli and many others utilize containerd/platforms to parse platform info and depends on containerd 1.6, we should backport it to the long term support release.

This PR is to cherry pick #7636 into release 1.6.

k8s-ci-robot · 2023-05-18T21:08:51Z

Hi @fangn2. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

fangn2 · 2023-05-18T22:14:17Z

CI is failing on Windows Integration test not related to the change

=== Failed
=== FAIL: metadata TestContainersCreateUpdateDelete/DeleteLabel (0.09s)
    containers_test.go:696: timestamp for updatedat not after createdat: 2023-05-18 21:25:52.3553981 +0000 UTC <= 2023-05-18 21:25:52.3553981 +0000 UTC
    --- FAIL: TestContainersCreateUpdateDelete/DeleteLabel (0.09s)

=== FAIL: metadata TestContainersCreateUpdateDelete (0.34s)

DONE 666 tests, 8 skipped, 2 failures in 487.400s
mingw32-make: *** [Makefile:206: test] Error 1
Error: Process completed with exit code 2.

https://github.com/containerd/containerd/actions/runs/5018286183/jobs/8997603727#step:10:221

dcantah · 2023-05-19T00:15:10Z

Please prefix the pr title with [release/1.6]. This makes it simple to see a backport on the pr list.

dcantah · 2023-05-19T00:17:25Z

For cherry-picks as well, prefer to use -x to include information on what commit is being cherry-picked.

samuelkarp · 2023-05-19T00:20:12Z

/ok-to-test

thaJeztah · 2023-05-19T00:21:18Z

I wonder if this is needed for the LTS release, as the original issue was mostly for a corner-case (running containerd in a QEMU (docker-in-docker) environment.

When images/containers in ARM arch were built/executed on x86 host, getCPUVariant will fail as it tries to look for /proc/cpuinfo, whose content is from the host. Adding a new method as fallback to check uname machine when it happens. Signed-off-by: Tony Fang <[email protected]> (cherry picked from commit 8d5c045)

Add unit test to function GetCPUVariantFromArch Fix import issue on non-linux platforms Fix some style issue Signed-off-by: Tony Fang <[email protected]> (cherry picked from commit 6e55234)

fangn2 · 2023-05-19T02:32:00Z

@dcantah Thanks for the suggestion, cherry-picked with -x option.

fangn2 · 2023-05-19T02:49:14Z

@thaJeztah Yeah, the original issue is about running containers in QEMU environment. It has impact for those who want to build/test ARM binaries in a container but without actual ARM hardware.
That's the case for all projects using github actions as CI who only has x86 runner. The backport can help those senarios.
I am not sure when moby, docker/cli will pickup containerd 1.7, if that's happening soon, I am ok not to backport this fix to 1.6.

fangn2 · 2023-05-19T15:21:03Z

/retest

fangn2 · 2023-05-19T15:31:33Z

Hmm, k8s-ci-robot said he understands those commands.
/retest is on the list, but apparently didn't work as expected.

/retest	/retest	Rerun test jobs that have failed.	Anyone can trigger this command on a trusted PR.

Anyway pushed new commits with -x option to include cherry-picked commit hash in the git message.
CI is failing on Vagrant tests not related to the change.

    default: === Failed
    default: === FAIL: . TestContentClient/ResumeTruncate (6.77s)
    default:     testsuite.go:675: ref ContentClient-n1/1/ref-2-3 locked for 520.357533ms (since 2023-05-19 02:30:39.702926127 +0000 UTC m=+4.077182710): unavailable
    default:     helpers.go:66: drwx------         40 /tmp/content-suite-ContentClient-3937161635
    default:     --- FAIL: TestContentClient/ResumeTruncate (6.77s)
    default: 
    default: === FAIL: . TestContentClient (27.77s)

sparr · 2023-05-19T15:45:49Z

awslabs/soci-snapshotter#620 encountered this bug and was effectively blocked due to the complexity of getting new containerd and docker built from source in the github actions environment. Having the fix backported to 1.6 should make it available in packaged versions of containerd and docker much sooner.

thaJeztah · 2023-05-19T16:20:59Z

@thaJeztah Yeah, the original issue is about running containers in QEMU environment. It has impact for those who want to build/test ARM binaries in a container but without actual ARM hardware.
That's the case for all projects using github actions as CI who only has x86 runner. The backport can help those senarios.
I am not sure when moby, docker/cli will pickup containerd 1.7, if that's happening soon, I am ok not to backport this fix to 1.6.

In that scenario, all of docker (CLI), dockerd, containerd, and runc would also be running with QEMU emulation, which I definitely would not recommend.

A better solution for that would be to either set --platform when running/pulling images, or to use the DOCKER_DEFAULT_PLATFORM env-var, which sets a default for those flags. That environment variable could probably be set on the docker-in-docker container, in which case docker (and containerd) itself won't have the overhead / potential issues (QEMU is really a best-effort emulation; there's many known issues where it has issues), and only the containers are started with the emulated architecture; here's doing so on my m1 apple (so native architecture is arm64)

docker run -d --privileged -e DOCKER_DEFAULT_PLATFORM=linux/amd64 docker:dind
caafbc99d853f0781160b6ef2cf6d7ee2781f10ef9fb8b716311c1984d5a1ca7

docker exec -it caafbc99d853f0781160b6ef2cf6d7ee2781f10ef9fb8b716311c1984d5a1ca7 sh

# inside the docker-in-docker container:
docker run --rm --quiet alpine uname -a
Linux 55521666be9a 5.15.49-linuxkit #1 SMP PREEMPT Tue Sep 13 07:51:32 UTC 2022 x86_64 Linux

thovikeerthi · 2023-06-09T04:59:01Z

Hi, Please inform when can this fix be expected in 1.6 release - any tentative time frame.

dmcgowan · 2023-06-09T05:52:17Z

@thaJeztah is there a risk taking this in though? The change itself looks straightforward to me

thaJeztah · 2023-06-09T13:01:08Z

I recall the discussion at the time because it was in the "hot path"; overall it seems fairly low-risk (and there's a sync.Once, so probably won't cause overhead), so happy to remove my rejection.

dmcgowan · 2023-06-11T03:43:15Z

@thaJeztah understood, agreed the sync.Once lowers the risk.

thovikeerthi · 2023-06-15T11:25:13Z

Hi, Please inform in which release-version of Containerd-1.6, we can expect this update & any tentative time frame ? Plz suggest.

thaJeztah · 2023-06-15T11:30:20Z

Next 1.6.x patch release; current patch release for 1.6 is https://github.com/containerd/containerd/releases/tag/v1.6.21, so it'll be 1.6.22

thovikeerthi · 2023-06-15T12:20:32Z

Next 1.6.x patch release; current patch release for 1.6 is https://github.com/containerd/containerd/releases/tag/v1.6.21, so it'll be 1.6.22
Thank you for the update. Awaiting for this patch release. Thanks.

fangn2 · 2023-06-15T12:42:15Z

@thovikeerthi
Depends on your use case, if you use docker(since docker uses containerd/platforms lib to determine image platform), you need to wait for docker(moby, cli) to take the to-be-released containerd 1.6.22.

containerd 1.6.22 Welcome to the v1.6.22 release of containerd! The twenty-second patch release for containerd 1.6 contains various fixes and updates. * **RunC: Update runc binary to v1.1.8** ([containerd#8842](containerd#8842)) * **CRI: Fix additionalGids: it should fallback to imageConfig.User when securityContext.RunAsUser,RunAsUsername are empty** ([containerd#8823](containerd#8823)) * **CRI: Write generated CNI config atomically** ([containerd#8826](containerd#8826)) * **Fix concurrent writes for `UpdateContainerStats`** ([containerd#8819](containerd#8819)) * **Make checkContainerTimestamps less strict on Windows** ([containerd#8827](containerd#8827)) * **Port-Forward: Correctly handle known errors** ([containerd#8805](containerd#8805)) * **Resolve docker.NewResolver race condition** ([containerd#8800](containerd#8800)) * **SecComp: Always allow `name_to_handle_at`** ([containerd#8754](containerd#8754)) * **Adding support to run hcsshim from local clone** ([containerd#8713](containerd#8713)) * **Pinned image support** ([containerd#8720](containerd#8720)) * **Runtime/V2/RunC: Handle early exits w/o big locks** ([containerd#8695](containerd#8695)) * **CRITool: Move up to CRI-TOOLS v1.27.0** ([containerd#7997](containerd#7997)) * **Fix cpu architecture detection issue on emulated ARM platform** ([containerd#8533](containerd#8533)) * **Task: Don't `close()` io before `cancel()`** ([containerd#8659](containerd#8659)) * **Fix panic when remote differ returns empty result** ([containerd#8640](containerd#8640)) * **Plugins: Notify readiness when registered plugins are ready** ([containerd#8583](containerd#8583)) * **Unwrap io errors in server connection receive error handling** ([ttrpc#143](containerd/ttrpc#143)) See the changelog for complete list of changes Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues. * Akihiro Suda * Phil Estes * Sebastiaan van Stijn * Derek McGowan * Wei Fu * Kazuyoshi Kato * Austin Vazquez * Samuel Karp * dependabot[bot] * Jin Dong * Maksym Pavlenko * Mike Brown * Shingo Omura * Akhil Mohan * Bjorn Neergaard * Laura Brehm * Tony Fang * Aditi Sharma * Andrey Epifanov * Benjamin Wang * Brian Goff * Cory Snider * Daniel Canter * Daniel Lenar * Henry Wang * Luca Comellini * Madhav Jivrajani * Mahamed Ali * Mohit Sharma * Oliver Radwell * Priyanka Saggu * Qasim Sarfraz * Takumasa Sakao * wangxiang * zounengren <details><summary>95 commits</summary> * [release/1.6] Prepare release notes for v1.6.22 ([containerd#8863](containerd#8863)) * [`0770a4601`](containerd@0770a46) [release/1.6] Add release notes for v1.6.22 * [release/1.6] migrate to community owned bucket for node e2e tests ([containerd#8876](containerd#8876)) * [`512a672af`](containerd@512a672) migrate to community owned bucket * [release/1.6] cri: memory.memsw.limit_in_bytes: no such file or directory ([containerd#8870](containerd#8870)) * [`b585ff155`](containerd@b585ff1) cri: memory.memsw.limit_in_bytes: no such file or directory * [release/1.6] Update go-restful to v3.10.1 ([containerd#8412](containerd#8412)) * [`a322077bf`](containerd@a322077) go.mod: github.com/emicklei/go-restful/v3 v3.10.1 * [release/1.6 backport] update runc binary to v1.1.8 ([containerd#8842](containerd#8842)) * [`b3ac068eb`](containerd@b3ac068) update runc binary to v1.1.8 * [release/1.6 backport] ci: remove libseccomp-dev installation for nightly ([containerd#8773](containerd#8773)) * [`6e2bcb6dd`](containerd@6e2bcb6) ci: remove libseccomp-dev installation for nightly * [release/1.6 backport] [CRI] fix additionalGids: it should fallback to imageConfig.User when securityContext.RunAsUser,RunAsUsername are empty ([containerd#8823](containerd#8823)) * [`cd06f23af`](containerd@cd06f23) capture desc variable in range variable just in case that it run in parallel mode * [`30f5c6a1f`](containerd@30f5c6a) Use t.TempDir instead of os.MkdirTemp * [`59d8363ef`](containerd@59d8363) fix userstr for dditionalGids on Linux * [release/1.6 backport] cri: write generated CNI config atomically ([containerd#8826](containerd#8826)) * [`d75bf78c2`](containerd@d75bf78) ctr: update WritePidFile to use atomicfile * [`5f70b23c1`](containerd@5f70b23) shim: WritePidFile & WriteAddress use atomicfile * [`505d444b0`](containerd@505d444) cri: write generated CNI config atomically on Unix * [`b2d2d3829`](containerd@b2d2d38) atomicfile: new package for atomic file writes * [release/1.6 backport] Fix concurrent writes for UpdateContainerStats ([containerd#8819](containerd#8819)) * [`9f650143f`](containerd@9f65014) Fix concurrent writes for UpdateContainerStats * [release/1.6 backport] Make checkContainerTimestamps less strict on Windows ([containerd#8827](containerd#8827)) * [`568ce91ca`](containerd@568ce91) Make checkContainerTimestamps less strict on Windows * [release/1.6 backport] dependency: bump go.etcd.io/bbolt to v1.3.7 ([containerd#8817](containerd#8817)) * [`d2f47192a`](containerd@d2f4719) dependency: bump go.etcd.io/bbolt to v1.3.7 * [`fb56dc245`](containerd@fb56dc2) [release/1.6] vendor: github.com/stretchr/testify v1.8.1 * [release/1.6 backport] Move logrus setup code to log package ([containerd#8832](containerd#8832)) * [`7fbd5dc89`](containerd@7fbd5dc) Move logrus setup code to log package * [release/1.6 backport] release: Add "cri-containerd.DEPRECATED.txt" in the deprecated cri-containerd-* bundles ([containerd#8820](containerd#8820)) * [`59a143670`](containerd@59a1436) release: Add "cri-containerd.DEPRECATED.txt" in the deprecated cri-containerd-* bundles * [release/1.6 backport] Use version 2 configuration format in docs ([containerd#8821](containerd#8821)) * [`5b51b79e2`](containerd@5b51b79) [release/1.6] fix remaining "v1 config" plugin IDs * [`b7cf26d8d`](containerd@b7cf26d) docs: Fix sample config.toml syntax * [`fcdaf0966`](containerd@fcdaf09) docs: migrate config v1 to v2 * [`728d5c5f0`](containerd@728d5c5) Use version 2 config and mention containerd config command * [release/1.6] update go to go1.19.11 ([containerd#8816](containerd#8816)) * [`81aa14718`](containerd@81aa147) [release/1.6] update go to go1.19.11 * [release/1.6] update go to go1.19.10 ([containerd#8715](containerd#8715)) * [`17cd86629`](containerd@17cd866) [release/1.6] update go to go1.19.10 * [release/1.6 backport] bugfix(port-forward): Correctly handle known errors ([containerd#8805](containerd#8805)) * [`fdb65f214`](containerd@fdb65f2) bugfix(port-forward): Correctly handle known errors * [release/1.6] Resolve docker.NewResolver race condition ([containerd#8800](containerd#8800)) * [`b5784af66`](containerd@b5784af) Change http.Header copy to builtin Clone * [`31c466f82`](containerd@31c466f) Resolve docker.NewResolver race condition * [release/1.6 backport] vendor: github.com/containerd/zfs v1.1.0 ([containerd#8781](containerd#8781)) * [`be6406ca6`](containerd@be6406c) vendor: github.com/containerd/zfs v1.1.0 * [`9f1260074`](containerd@9f12600) [release/1.6] vendor gotest.tools/v3 v3.5.0 * [`526e9e0ce`](containerd@526e9e0) Bump grpc to v1.50.1 * [`0e7d2d121`](containerd@0e7d2d1) go.mod: github.com/sirupsen/logrus v1.9.0 * [`5b153c621`](containerd@5b153c6) go.mod: github.com/moby/sys/mountinfo v0.6.2 * [`9dee60960`](containerd@9dee609) go.mod: github.com/moby/sys/mountinfo v0.6.0 * [release/1.6 backport] seccomp: always allow name_to_handle_at ([containerd#8754](containerd#8754)) * [`07ea7b9e7`](containerd@07ea7b9) seccomp: always allow name_to_handle_at * [release/1.6 backport] Update ginkgo to match cri-tools' version ([containerd#8759](containerd#8759)) * [`1dae51fed`](containerd@1dae51f) Update ginkgo to match cri-tools' version * [release/1.6 backport] integration/client: add timeout to `TestShimOOMScore` ([containerd#8749](containerd#8749)) * [`bd76ab978`](containerd@bd76ab9) integration/client: add timeout to `TestShimOOMScore` * [release/1.6 backport] Adding support to run hcsshim from local clone ([containerd#8713](containerd#8713)) * [`8e14eccb2`](containerd@8e14ecc) Adding support to run hcsshim from local clone * [1.6] Add Fields type alias to log package ([containerd#8739](containerd#8739)) * [`9f2cdd589`](containerd@9f2cdd5) Add Fields type alias to log package * [release/1.6] Pinned image support ([containerd#8720](containerd#8720)) * [`f4713aad0`](containerd@f4713aa) Pinned image support * [release/1.6 backport] runtime/v2/runc: handle early exits w/o big locks ([containerd#8695](containerd#8695)) * [`dbeec47b4`](containerd@dbeec47) runtime/v2/runc: handle early exits w/o big locks * [release/1.6 backport] move up to CRI-TOOLS v1.27.0 ([containerd#7997](containerd#7997)) * [`a8e01e40a`](containerd@a8e01e4) move to CRI-TOOLS v1.27.0 * [`755f80698`](containerd@755f806) move up to CRI-TOOLS v1.26.0 * [`b29cc035f`](containerd@b29cc03) bump critools into ca1571e6edd116b2c95f52e3dfa0b4779b74223a * [`9138999f5`](containerd@9138999) Upgrade critools from 1.24.1 to 1.25.0 * [release/1.6] cherry-pick: No more nondistributable layers in MS registry ([containerd#8691](containerd#8691)) * [`712ff8eb3`](containerd@712ff8e) No more nondistributable layers in MS registry * [release/1.6] Fix cpu architecture detection issue on emulated ARM platform ([containerd#8533](containerd#8533)) * [`2b16e4bfa`](containerd@2b16e4b) Add unit test to function GetCPUVariantFromArch * [`106e36ec3`](containerd@106e36e) Use uname machine field to get CPU variant if fails at /proc/cpuinfo * [release/1.6] Update lint timeout ([containerd#8679](containerd#8679)) * [`287fdfea6`](containerd@287fdfe) Update linter timeout to match main branch * [release/1.6 backport] task: don't `close()` io before `cancel()` ([containerd#8659](containerd#8659)) * [`b27f7daa5`](containerd@b27f7da) task: don't `close()` io before `cancel()` * [release/1.6] update test box to fedora 37 ([containerd#8660](containerd#8660)) * [`8b4c69248`](containerd@8b4c692) update test box to fedora 37 * [release/1.6] Revert "Downgrade MinGW to version 10.2.0" ([containerd#8668](containerd#8668)) * [`81d6085af`](containerd@81d6085) Revert "Downgrade MinGW to version 10.2.0" * [release/1.6 backport] Fix panic when remote differ returns empty result ([containerd#8640](containerd#8640)) * [`f98122378`](containerd@f981223) Fix panic when remote differ returns empty result * [1.6] Bump x/net to 0.8 ([containerd#8642](containerd#8642)) * [`aa53f272d`](containerd@aa53f27) Bump x/net to 0.8 * [release/1.6 backport] remotes/docker: ResolverOptions: fix deprecation comments ([containerd#8620](containerd#8620)) * [`56ff20839`](containerd@56ff208) remotes/docker: ResolverOptions: fix deprecation comments * [release/1.6] notify readiness when registered plugins are ready ([containerd#8583](containerd#8583)) * [`bccaf68b7`](containerd@bccaf68) notify readiness when registered plugins are ready * [release/1.6] Update ttrpc to 1.1.2 ([containerd#8528](containerd#8528)) * [`1cdbbe76b`](containerd@1cdbbe7) Update ttrpc to 1.1.2 </details> <details><summary>2 commits</summary> * [release/1.1] Unwrap io errors in server connection receive error handling ([containerd#143](containerd/ttrpc#143)) * [`d5f7eed`](containerd/ttrpc@d5f7eed) Unwrap io errors in server connection receive error handling </details> <details><summary>49 commits</summary> * gofumpt and update status badges ([containerd#75](containerd/zfs#75)) * [`5e3457b`](containerd/zfs@5e3457b) TestZFSUsage: use t.TempDir() * [`6e9c675`](containerd/zfs@6e9c675) README: update badges * [`ff17a79`](containerd/zfs@ff17a79) gofmt code * go.mod: github.com/mistifyio/go-zfs/v3 v3.0.1 ([containerd#73](containerd/zfs#73)) * [`d3485b9`](containerd/zfs@d3485b9) go.mod: github.com/mistifyio/go-zfs/v3 v3.0.1 * gha: fix golangci-lint, and upgrade to v1.52.2 ([containerd#74](containerd/zfs#74)) * [`23c831a`](containerd/zfs@23c831a) remove pre-go1.17 build-tags, and fix missing build-tags in plugin * [`e5acd95`](containerd/zfs@e5acd95) gha: fix golangci-lint, upgrade to v1.52.2 * Bump github.com/containerd/containerd from 1.6.12 to 1.6.18 ([containerd#72](containerd/zfs#72)) * [`00b96c2`](containerd/zfs@00b96c2) Bump github.com/containerd/containerd from 1.6.12 to 1.6.18 * Bump github.com/containerd/containerd from 1.6.9 to 1.6.12 ([containerd#69](containerd/zfs#69)) * [`a099def`](containerd/zfs@a099def) Bump github.com/containerd/containerd from 1.6.9 to 1.6.12 * Add CodeQL analysis workflow ([containerd#67](containerd/zfs#67)) * [`fee1db7`](containerd/zfs@fee1db7) Add CodeQL analysis workflow * Update GitHub actions CI workflow ([containerd#66](containerd/zfs#66)) * [`b8b7ab2`](containerd/zfs@b8b7ab2) Update GitHub actions CI workflow * Upgrade compiler to Go 1.19 and update dependencies ([containerd#68](containerd/zfs#68)) * [`3e729b3`](containerd/zfs@3e729b3) Update dependencies * [`3c003f8`](containerd/zfs@3c003f8) Upgrade compiler to Go 1.19 * Remove references to io/ioutil package ([containerd#65](containerd/zfs#65)) * [`d700762`](containerd/zfs@d700762) Remove references to io/ioutil package * Update go.mod and move to supported Go version ([containerd#62](containerd/zfs#62)) * [`f52906e`](containerd/zfs@f52906e) Update Go version to supported version * [`79ca2cb`](containerd/zfs@79ca2cb) Update containerd depedency to latest * go.mod: github.com/mistifyio/go-zfs v3.0.0 ([containerd#59](containerd/zfs#59)) * [`2e3db29`](containerd/zfs@2e3db29) go.mod: github.com/mistifyio/go-zfs v3.0.0 * go.mod: github.com/mistifyio/go-zfs/v3 v3.0.0-20220217145925-d014733a5309 ([containerd#58](containerd/zfs#58)) * [`d904e63`](containerd/zfs@d904e63) go.mod: github.com/mistifyio/go-zfs/v3 v3.0.0-20220217145925-d014733a5309 * Update vendoring to containerd 1.6.x ([containerd#57](containerd/zfs#57)) * [`e021180`](containerd/zfs@e021180) Update vendoring to containerd 1.6.x * Bump github.com/containerd/containerd from 1.5.8 to 1.5.9 ([containerd#55](containerd/zfs#55)) * [`fc0c9a9`](containerd/zfs@fc0c9a9) Bump github.com/containerd/containerd from 1.5.8 to 1.5.9 * Bump github.com/containerd/containerd from 1.5.5 to 1.5.8 ([containerd#54](containerd/zfs#54)) * [`5d2f28c`](containerd/zfs@5d2f28c) Bump github.com/containerd/containerd from 1.5.5 to 1.5.8 * follow-up-containerd#52: fix the order of cause in fmt.Errorf ([containerd#53](containerd/zfs#53)) * [`b3f193d`](containerd/zfs@b3f193d) follow-up-containerd#52: fix the order of cause in fmt.Errorf * replace pkg/errors ([containerd#52](containerd/zfs#52)) * [`d5b0a2f`](containerd/zfs@d5b0a2f) replace pkg/errors * Bump github.com/containerd/containerd from 1.5.2 to 1.5.4 ([containerd#51](containerd/zfs#51)) * [`fd6afa5`](containerd/zfs@fd6afa5) Bump github.com/containerd/containerd from 1.5.2 to 1.5.4 * Bump containerd to 1.5.2 ([containerd#50](containerd/zfs#50)) * [`aef875e`](containerd/zfs@aef875e) bump containerd to 1.5.2 * Rename branches from master to main ([containerd#49](containerd/zfs#49)) * [`35c6af7`](containerd/zfs@35c6af7) Rename branches from master to main * sync up with containerd 1.5 GA ([containerd#47](containerd/zfs#47)) * [`3d5efef`](containerd/zfs@3d5efef) vendor sync up with containerd 1.5 ga * README.md: fix CI badge ([containerd#46](containerd/zfs#46)) * [`0977d81`](containerd/zfs@0977d81) README.md: fix CI badge </details> * **github.com/containerd/ttrpc** v1.1.1 -> v1.1.2 * **github.com/containerd/zfs** v1.0.0 -> v1.1.0 * **github.com/emicklei/go-restful/v3** v3.7.3 -> v3.10.1 * **github.com/google/go-cmp** v0.5.6 -> v0.5.9 * **github.com/google/uuid** v1.2.0 -> v1.3.0 * **github.com/mistifyio/go-zfs/v3** v3.0.1 **_new_** * **github.com/moby/sys/mountinfo** v0.5.0 -> v0.6.2 * **github.com/sirupsen/logrus** v1.8.1 -> v1.9.0 * **github.com/stretchr/testify** v1.7.0 -> v1.8.1 * **go.etcd.io/bbolt** v1.3.6 -> v1.3.7 * **golang.org/x/net** a158d28d115b -> v0.8.0 * **golang.org/x/sys** 8c9f86f7a55f -> v0.6.0 * **golang.org/x/term** 03fcf44c2211 -> v0.6.0 * **golang.org/x/text** v0.3.7 -> v0.8.0 * **google.golang.org/grpc** v1.47.0 -> v1.50.1 * **google.golang.org/protobuf** v1.28.0 -> v1.28.1 * **gotest.tools/v3** v3.0.3 -> v3.5.0 Previous release can be found at [v1.6.21](https://github.com/containerd/containerd/releases/tag/v1.6.21)

thovikeerthi · 2023-11-15T12:01:32Z

Hi Team,
I have docker version '24.0.6, build ed223bc' & containerd version '1.6.24 61f9fd8' installed in my host PC (ubuntu 18.04.6 LTS).

But still seeing the same error when I try to cross-compile (host is X86 and cross-compiling source for ARM64 platform) my project code i.e. error snippet is,
""time="2023-11-15T10:27:45Z" level=error msg="failure getting variant" error="getCPUInfo for pattern: Cpu architecture: not found""

Please suggest, is there any way to confirm that fix for the original 'CPU Arch detection' issue in ContainerD is available in my host PC & working as per expectations. Thanks.

thaJeztah · 2023-11-15T12:37:51Z

@thovikeerthi It might be better to open a ticket in the docker / moby issue tracker (https://github.com/moby/mobv/issues), with details, and a minimal example to reproduce the issue. Note that this change was merged for cases where containerd (and docker) itself are running through QEMU userland emulation; not sure if that is directly related to your issue, but if you have steps to reproduce, that may help to get a better understanding.

Depending on that case; note that docker 24.0.6 and 24.0.7 use containerd v1.6.22 module (build-time dependency);

Similarly, the BuildKit front-end (dockerfile parser / interpreter) is on a version of containerd that also does not have this patch; https://github.com/moby/buildkit/blob/dockerfile/1.6.0/go.mod#L19

So if the warning printed originates from code elsewhere using this package, that could be related.

thovikeerthi · 2023-11-16T05:25:13Z

@thovikeerthi It might be better to open a ticket in the docker / moby issue tracker (https://github.com/moby/mobv/issues), with details, and a minimal example to reproduce the issue. Note that this change was merged for cases where containerd (and docker) itself are running through QEMU userland emulation; not sure if that is directly related to your issue, but if you have steps to reproduce, that may help to get a better understanding.

Depending on that case; note that docker 24.0.6 and 24.0.7 use containerd v1.6.22 module (build-time dependency);

https://github.com/moby/moby/blob/v24.0.6/vendor.mod#L28

https://github.com/moby/moby/blob/v24.0.7/vendor.mod#L28

Similarly, the BuildKit front-end (dockerfile parser / interpreter) is on a version of containerd that also does not have this patch; https://github.com/moby/buildkit/blob/dockerfile/1.6.0/go.mod#L19

So if the warning printed originates from code elsewhere using this package, that could be related.

Okay thanks

k8s-ci-robot added the needs-ok-to-test label May 18, 2023

samuelkarp changed the title ~~Fix cpu architecture detection issue on emulated ARM platform~~ [release/1.6] Fix cpu architecture detection issue on emulated ARM platform May 19, 2023

k8s-ci-robot added ok-to-test and removed needs-ok-to-test labels May 19, 2023

fangn2 added 2 commits May 19, 2023 02:09

Add unit test to function GetCPUVariantFromArch

2b16e4b

Add unit test to function GetCPUVariantFromArch Fix import issue on non-linux platforms Fix some style issue Signed-off-by: Tony Fang <[email protected]> (cherry picked from commit 6e55234)

fangn2 force-pushed the release/1.6 branch from 6c37a7c to 2b16e4b Compare May 19, 2023 02:10

sparr mentioned this pull request May 19, 2023

[FEATURE] Run integration tests against ARM64 awslabs/soci-snapshotter#394

Closed

thaJeztah mentioned this pull request Jun 6, 2023

Running docker-in-docker with QEMU emulation produces some noisy errors moby/moby#43355

Open

thaJeztah mentioned this pull request Jun 9, 2023

Docker Desktop 4.16.0 Run x86_64 dind image fails to pull images docker/for-mac#6678

Open

dmcgowan approved these changes Jun 11, 2023

View reviewed changes

estesp approved these changes Jun 13, 2023

View reviewed changes

estesp merged commit 55cacec into containerd:release/1.6 Jun 13, 2023

thaJeztah mentioned this pull request Jul 25, 2023

[release/1.6] Prepare release notes for v1.6.22 #8863

Merged

sheiun-xu mentioned this pull request Nov 30, 2023

Error(s) while compiling buildimage for Marvel-arm64 platform sonic-net/sonic-buildimage#15225

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[release/1.6] Fix cpu architecture detection issue on emulated ARM platform #8533

[release/1.6] Fix cpu architecture detection issue on emulated ARM platform #8533

fangn2 commented May 18, 2023

k8s-ci-robot commented May 18, 2023

fangn2 commented May 18, 2023

dcantah commented May 19, 2023 •

edited

Loading

dcantah commented May 19, 2023

samuelkarp commented May 19, 2023

thaJeztah commented May 19, 2023

fangn2 commented May 19, 2023

fangn2 commented May 19, 2023

fangn2 commented May 19, 2023

fangn2 commented May 19, 2023 •

edited

Loading

sparr commented May 19, 2023

thaJeztah commented May 19, 2023 •

edited

Loading

thovikeerthi commented Jun 9, 2023

dmcgowan commented Jun 9, 2023

thaJeztah commented Jun 9, 2023

dmcgowan commented Jun 11, 2023

thovikeerthi commented Jun 15, 2023

thaJeztah commented Jun 15, 2023

thovikeerthi commented Jun 15, 2023

fangn2 commented Jun 15, 2023

thovikeerthi commented Nov 15, 2023

thaJeztah commented Nov 15, 2023

thovikeerthi commented Nov 16, 2023 •

edited

Loading

[release/1.6] Fix cpu architecture detection issue on emulated ARM platform #8533

[release/1.6] Fix cpu architecture detection issue on emulated ARM platform #8533

Conversation

fangn2 commented May 18, 2023

k8s-ci-robot commented May 18, 2023

fangn2 commented May 18, 2023

dcantah commented May 19, 2023 • edited Loading

dcantah commented May 19, 2023

samuelkarp commented May 19, 2023

thaJeztah commented May 19, 2023

fangn2 commented May 19, 2023

fangn2 commented May 19, 2023

fangn2 commented May 19, 2023

fangn2 commented May 19, 2023 • edited Loading

sparr commented May 19, 2023

thaJeztah commented May 19, 2023 • edited Loading

thovikeerthi commented Jun 9, 2023

dmcgowan commented Jun 9, 2023

thaJeztah commented Jun 9, 2023

dmcgowan commented Jun 11, 2023

thovikeerthi commented Jun 15, 2023

thaJeztah commented Jun 15, 2023

thovikeerthi commented Jun 15, 2023

fangn2 commented Jun 15, 2023

thovikeerthi commented Nov 15, 2023

thaJeztah commented Nov 15, 2023

thovikeerthi commented Nov 16, 2023 • edited Loading

dcantah commented May 19, 2023 •

edited

Loading

fangn2 commented May 19, 2023 •

edited

Loading

thaJeztah commented May 19, 2023 •

edited

Loading

thovikeerthi commented Nov 16, 2023 •

edited

Loading