Fixes: #15266 All docker images of Architecture show amd64 #15270

zhangguanzhang · 2023-02-09T10:39:26Z

Fixes: #15266
Signed-off-by: zhangguanzhang zhangguanzhang@qq.com

Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.

serathius · 2023-02-09T12:09:00Z

scripts/release.sh

@@ -261,8 +261,15 @@ main() {
    for TARGET_ARCH in "amd64" "arm64" "ppc64le" "s390x"; do
      log_callout "Pushing container images to quay.io ${RELEASE_VERSION}-${TARGET_ARCH}"
      maybe_run docker push "quay.io/coreos/etcd:${RELEASE_VERSION}-${TARGET_ARCH}"
+      maybe_run docker manifest create "quay.io/coreos/etcd:${RELEASE_VERSION}-${TARGET_ARCH}" "quay.io/coreos/etcd:${RELEASE_VERSION}-${TARGET_ARCH}"


Please integrate it with existing block for creating manifest list on line 275.

Please integrate it with existing block for creating manifest list on line 275.

Done, PTAL

@serathius Why do you think the new place is better ?
I actually liked the previous version more:

The loop in 261 is responsible for preparing the arch-specific images and pushing them.

The loop in 275 is preparing a single multi-arch image.

After the modification the code got mixed and in my opinion is more confusing.

I was thinking that separating image vs manifest operation will make it cleaner. However I'm not sure after seeing it.
Delegating to @ptabor and @justinsb to review.

geetasg · 2023-02-17T20:09:41Z

@serathius @ptabor can you please comment on how did this work alright earlier? thanks

output for 3.5.6
docker image inspect quay.io/coreos/etcd:v3.5.6-arm64 --format '{{.Architecture}}'
arm64

zhangguanzhang · 2023-02-20T03:26:05Z

Is there anyone here who can take a look? 😘

ahrtr · 2023-02-21T07:33:06Z

It seems that the issue was introduced by #15016, but did not get time to dig into the root cause yet.

I would suggest to add a new workflow test to do some sanity test on the images firstly (See #15139), and then apply this PR so as to confirm that it indeed fixes the issue.

ahrtr · 2023-02-21T08:10:05Z

The multi-arch manifest looks good.

# docker manifest inspect quay.io/coreos/etcd:v3.5.7
{
   "schemaVersion": 2,
   "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
   "manifests": [
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 1781,
         "digest": "sha256:ed53908abf741f2f29e7cb1fc7f53cd41b9ecea1d85308d5f1b51dae07decd2a",
         "platform": {
            "architecture": "amd64",
            "os": "linux"
         }
      },
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 1574,
         "digest": "sha256:82aa51752864de767380d9d5770f5628d2f68a561f7c98c65ae13f69cd4440af",
         "platform": {
            "architecture": "arm64",
            "os": "linux"
         }
      },
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 1574,
         "digest": "sha256:ad17d68dbb8fd05e9a3d5da131f8b83796ee9ef9a1a4f43127a7c79ef96fec2a",
         "platform": {
            "architecture": "ppc64le",
            "os": "linux"
         }
      },
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 1574,
         "digest": "sha256:b287e2b298faea9a05ede6284498b7cf79c9cb3bb89a9840fbbf222cad8f0c8e",
         "platform": {
            "architecture": "s390x",
            "os": "linux"
         }
      }
   ]
}

ahrtr · 2023-03-30T13:18:43Z

Please add a test case. You can follow #15505

serathius · 2023-03-30T13:26:11Z

Instead fixing all images, should we stop publishing tags other than multi-arch? There is no benefits to publishing single-arch image tags, and k8s doesn't do that.

zhangguanzhang · 2023-03-30T14:22:12Z

Please add a test case. You can follow #15505

Done

jmhbnz

Changes look good to me, thanks @zhangguanzhang .

Agree that it might simplify things to just publish the multi arch images in future. I've created #15594 to discuss that further.

ahrtr · 2023-03-31T01:25:57Z

Please resolve the workflow failures before I take a look.

zhangguanzhang · 2023-03-31T02:14:46Z

Using buildkit seems to be a simple solution to this problem 🤦‍♂️， @ahrtr @serathius PATL

Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>

ahrtr · 2023-03-31T05:02:45Z

Instead fixing all images, should we stop publishing tags other than multi-arch? There is no benefits to publishing single-arch image tags, and k8s doesn't do that.

Agreed. But let's make the change on main branch only. Thanks @jmhbnz for raising #15594 to track it.

ahrtr · 2023-03-31T05:04:31Z

It seems that the issue was introduced by #15016, but did not get time to dig into the root cause yet.

The root cause turned out to be that builtkit wasn't enabled. Thanks @zhangguanzhang

ahrtr

LGTM

cc @ptabor @serathius @spzala

serathius

Ah, good old docker quirks.

This solution looks much better. Thanks for diving in and finding the root issue!

ahrtr · 2023-03-31T10:01:17Z

@zhangguanzhang could you please backport this PR to 3.5 and 3.4? thx

zhangguanzhang · 2023-03-31T13:40:33Z

@zhangguanzhang could you please backport this PR to 3.5 and 3.4? thx

There is no test_image.sh in 3.5，so don't cherry-pick just commit?

ahrtr · 2023-03-31T23:22:29Z

@zhangguanzhang could you please backport this PR to 3.5 and 3.4? thx

There is no test_image.sh in 3.5，so don't cherry-pick just commit?

Yes, we need to backport #15505 firstly. Could you or @pchan finish it? It's a priority to me, so as to unblock releasing 3.5.8.

pchan · 2023-04-01T10:18:32Z

Yes, we need to backport #15505 firstly. Could you or @pchan finish it? It's a priority to me, so as to unblock releasing 3.5.8.

I have created the cherry-pick #15608 to backport #15505

ahrtr · 2023-04-01T10:35:05Z

Thanks @pchan

ahrtr · 2023-04-01T12:12:27Z

@zhangguanzhang The test_image.sh file was just added into release-3.5, please go ahead to backport this PR to 3.5, thx.

zhangguanzhang force-pushed the main branch 2 times, most recently from 5bf9517 to b3a6f98 Compare February 9, 2023 10:42

serathius reviewed Feb 9, 2023

View reviewed changes

zhangguanzhang force-pushed the main branch 2 times, most recently from 42dfb39 to 329a61c Compare February 9, 2023 14:48

zhangguanzhang requested a review from ptabor February 14, 2023 04:36

ahrtr mentioned this pull request Feb 21, 2023

Test etcd container in K8s cluster #15139

Closed

ahrtr added backport/v3.4 backport/v3.5 labels Feb 21, 2023

zhangguanzhang requested review from serathius and ptabor and removed request for ptabor and serathius February 22, 2023 07:23

ahrtr mentioned this pull request Mar 15, 2023

scripts: Add testing of etcd in local image as part of the release wo… #15350

Closed

ahrtr mentioned this pull request Mar 30, 2023

Plans for v3.5.8 release #15585

Closed

zhangguanzhang force-pushed the main branch from 329a61c to 5c085f9 Compare March 30, 2023 14:20

jmhbnz approved these changes Mar 30, 2023

View reviewed changes

zhangguanzhang force-pushed the main branch from 5c085f9 to b040473 Compare March 31, 2023 01:34

zhangguanzhang requested a review from jmhbnz March 31, 2023 01:36

zhangguanzhang force-pushed the main branch 5 times, most recently from 836ec16 to 426be57 Compare March 31, 2023 03:07

Fixes: etcd-io#15266 All docker images of Architecture show amd64

7ac443f

Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>

zhangguanzhang force-pushed the main branch from 426be57 to 7ac443f Compare March 31, 2023 03:50

ahrtr approved these changes Mar 31, 2023

View reviewed changes

serathius approved these changes Mar 31, 2023

View reviewed changes

serathius merged commit 7c626e0 into etcd-io:main Mar 31, 2023

jmhbnz mentioned this pull request Mar 31, 2023

Simplify etcd image release process #15594

Open

zhangguanzhang mentioned this pull request Apr 1, 2023

[3.5] Backport fixes all docker images of Architecture show amd64 #15612

Merged

This was referenced Apr 10, 2023

Plans for v3.4.25 #15680

Closed

[3.4] Backport fix for all docker images showing amd64 architecture #15681

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes: #15266 All docker images of Architecture show amd64 #15270

Fixes: #15266 All docker images of Architecture show amd64 #15270

zhangguanzhang commented Feb 9, 2023

serathius Feb 9, 2023

zhangguanzhang Feb 9, 2023

ptabor Feb 10, 2023

serathius Feb 10, 2023

geetasg commented Feb 17, 2023

zhangguanzhang commented Feb 20, 2023

ahrtr commented Feb 21, 2023 •

edited

Loading

ahrtr commented Feb 21, 2023

ahrtr commented Mar 30, 2023

serathius commented Mar 30, 2023 •

edited

Loading

zhangguanzhang commented Mar 30, 2023

jmhbnz left a comment

ahrtr commented Mar 31, 2023

zhangguanzhang commented Mar 31, 2023 •

edited

Loading

ahrtr commented Mar 31, 2023

ahrtr commented Mar 31, 2023

ahrtr left a comment

serathius left a comment •

edited

Loading

ahrtr commented Mar 31, 2023

zhangguanzhang commented Mar 31, 2023

ahrtr commented Mar 31, 2023

pchan commented Apr 1, 2023

ahrtr commented Apr 1, 2023

ahrtr commented Apr 1, 2023

Fixes: #15266 All docker images of Architecture show amd64 #15270

Fixes: #15266 All docker images of Architecture show amd64 #15270

Conversation

zhangguanzhang commented Feb 9, 2023

serathius Feb 9, 2023

Choose a reason for hiding this comment

zhangguanzhang Feb 9, 2023

Choose a reason for hiding this comment

ptabor Feb 10, 2023

Choose a reason for hiding this comment

serathius Feb 10, 2023

Choose a reason for hiding this comment

geetasg commented Feb 17, 2023

zhangguanzhang commented Feb 20, 2023

ahrtr commented Feb 21, 2023 • edited Loading

ahrtr commented Feb 21, 2023

ahrtr commented Mar 30, 2023

serathius commented Mar 30, 2023 • edited Loading

zhangguanzhang commented Mar 30, 2023

jmhbnz left a comment

Choose a reason for hiding this comment

ahrtr commented Mar 31, 2023

zhangguanzhang commented Mar 31, 2023 • edited Loading

ahrtr commented Mar 31, 2023

ahrtr commented Mar 31, 2023

ahrtr left a comment

Choose a reason for hiding this comment

serathius left a comment • edited Loading

Choose a reason for hiding this comment

ahrtr commented Mar 31, 2023

zhangguanzhang commented Mar 31, 2023

ahrtr commented Mar 31, 2023

pchan commented Apr 1, 2023

ahrtr commented Apr 1, 2023

ahrtr commented Apr 1, 2023

ahrtr commented Feb 21, 2023 •

edited

Loading

serathius commented Mar 30, 2023 •

edited

Loading

zhangguanzhang commented Mar 31, 2023 •

edited

Loading

serathius left a comment •

edited

Loading