Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

images: fix Archs expansion in makefile #1865

Merged
merged 1 commit into from
Jan 21, 2021

Conversation

cpanato
Copy link
Member

@cpanato cpanato commented Jan 21, 2021

What type of PR is this?

/kind bug

What this PR does / why we need it:

When we start the new build for kube-cross image we got this error

docker manifest create --amend gcr.io/k8s-staging-build-image/kube-cross:v1.15.7-canary-1 gcr.io/k8s-staging-build-image/kube-cross-amd64:v1.15.7-canary-1
Created manifest list gcr.io/k8s-staging-build-image/kube-cross:v1.15.7-canary-1
manifest for image gcr.io/k8s-staging-build-image/kube-cross-arm64:v1.15.7-canary-1 does not exist in gcr.io/k8s-staging-build-image/kube-cross:v1.15.7-canary-1
manifest for image gcr.io/k8s-staging-build-image/kube-cross-ppc64le:v1.15.7-canary-1 does not exist in gcr.io/k8s-staging-build-image/kube-cross:v1.15.7-canary-1
make: *** [/workspace/images/build/cross/../../Makefile.common-image:60: manifest] Error 1
ERROR

which looks like when we run the docker manifest create --amend we need to add all the images for the archs we built.

This piece of the make file https://github.com/kubernetes/release/blob/master/images/Makefile.common-image#L59 add the images to the command, but now we have more platforms and the command subst just replace one entry and not all entries in the PLATFORMS variable

for kube-cross we used to have just one platform and that works fine, but now we introduce more (can see in this PR: https://github.com/kubernetes/release/pull/1853/files) and the command broke.

this PR fix this issue by parsing the PLATFORMS and removing the linux/ from the PLATFORMS variable.

before:

docker manifest create --amend gcr.io/k8s-staging-build-image/kube-cross:v1.15.7-canary-1 gcr.io/k8s-staging-build-image/kube-cross-amd64:v1.15.7-canary-1

after the fix:

docker manifest create --amend gcr.io/k8s-staging-build-image/kube-cross:v1.15.7-canary-1 gcr.io/k8s-staging-build-image/kube-cross-amd64:v1.15.7-canary-1 gcr.io/k8s-staging-build-image/kube-cross-arm64:v1.15.7-canary-1 gcr.io/k8s-staging-build-image/kube-cross-ppc64le:v1.15.7-canary-1

/assign @justaugustus @saschagrunert @hasheddan @ameukam

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

Does this PR introduce a user-facing change?

images: fix Archs expansion in makefile

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jan 21, 2021
@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Jan 21, 2021
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. area/release-eng Issues or PRs related to the Release Engineering subproject labels Jan 21, 2021
@k8s-ci-robot k8s-ci-robot added sig/release Categorizes an issue or PR as relevant to SIG Release. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 21, 2021
@cpanato
Copy link
Member Author

cpanato commented Jan 21, 2021

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority labels Jan 21, 2021
@ameukam
Copy link
Member

ameukam commented Jan 21, 2021

/lgtm

@cpanato
Copy link
Member Author

cpanato commented Jan 21, 2021

/hold for more eyes

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Jan 21, 2021
Copy link
Contributor

@hasheddan hasheddan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks reasonable to me, thanks @cpanato 👍

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ameukam, cpanato, hasheddan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@cpanato
Copy link
Member Author

cpanato commented Jan 21, 2021

will lift the hold since got a review from a sig-release TL 🚀

/hold cancel

will observe the kube-cross job

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 21, 2021
@k8s-ci-robot k8s-ci-robot merged commit 597b918 into kubernetes:master Jan 21, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jan 21, 2021
@cpanato cpanato deleted the fix_build_image branch January 21, 2021 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/release Categorizes an issue or PR as relevant to SIG Release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants