s390x: fix image mislabel in cni, typha and kube-controllers

[huoqifeng]

Signed-off-by: Qi Feng Huo huoqif@cn.ibm.com

Description

Related issues/PRs

Todos

• Tests
• Documentation
• Release note

Release Note

s390x: fix image mislabel in cni, typha and kube-controllers

Reminder for the reviewer

Make sure that this PR has the correct labels and milestone set.

Every PR needs one docs-* label.

• docs-pr-required: This change requires a change to the documentation that has not been completed yet.
• docs-completed: This change has all necessary documentation completed.
• docs-not-required: This change has no user-facing impact and requires no docs.

Every PR needs one release-note-* label.

• release-note-required: This PR has user-facing changes. Most PRs should have this label.
• release-note-not-required: This PR has no user-facing changes.

Other optional labels:

• cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.
• needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.

[netlify]

✅ Deploy Preview for calico-tigera canceled.

Name	Link
🔨 Latest commit	928df44
🔍 Latest deploy log	https://app.netlify.com/sites/calico-tigera/deploys/63e44f87663f770009e6eddb

[netlify]

✅ Deploy Preview for calico-v3-25 canceled.

Name	Link
🔨 Latest commit	928df44
🔍 Latest deploy log	https://app.netlify.com/sites/calico-v3-25/deploys/63e44f873b29fa00081670ea

[huoqifeng]

@mgleung @caseydavenport may you help check it? thanks!

[tumberino]

I checked this for cni

$ git clone -b release-v3.25 https://github.com/projectcalico/calico.git
$ cd calico/cni-plugin
$ make sub-image-s390x
$ docker inspect calico/cni:latest-s390x | jq -r '.[].Architecture'
amd64
$ git remote add qifeng https://github.com/huoqifeng/calico.git
$ git fetch qifeng fixmislabel
$ git checkout qifeng/fixmislabel
$ make sub-image-s390x
$ docker inspect calico/cni:latest-s390x | jq -r '.[].Architecture'
s390x

[caseydavenport]

LGTM! Good catch.

Wonder why node wasn't having trouble.

[caseydavenport]

/sem-approve

[tumberino]

LGTM! Good catch.

Wonder why node wasn't having trouble.

I believe node is okay because it build on-top of {arch}/alpine:3.8 whereas the others use scratch as the final base-image

[iv1111]

@tumberino @caseydavenport @huoqifeng
Please see this issue #8784 as it seems that the problem persists for s390x.