Skip to content

Enable s390x image cross platform build for calico#5778

Closed
huoqifeng wants to merge 6 commits intoprojectcalico:masterfrom
huoqifeng:apiserver-s390x
Closed

Enable s390x image cross platform build for calico#5778
huoqifeng wants to merge 6 commits intoprojectcalico:masterfrom
huoqifeng:apiserver-s390x

Conversation

@huoqifeng
Copy link

@huoqifeng huoqifeng commented Mar 21, 2022 •
edited
Loading

Description

After get the go-build s390x image via projectcalico/toolchain#379 and all Dockerfile.s390x work well via #5793. Will enable the build in CI.

Related issues/PRs

Todos

  • Tests
  • Documentation
  • Release note

Release Note

None required

@huoqifeng huoqifeng requested a review from a team as a code owner March 21, 2022 03:25
@marvin-tigera marvin-tigera added this to the Calico v3.23.0 milestone Mar 21, 2022
@marvin-tigera marvin-tigera added docs-pr-required Change is not yet documented release-note-required Change has user-facing impact (no matter how small) labels Mar 21, 2022
@huoqifeng huoqifeng changed the title enable s390x image build for apiserver fix s390x image build for apiserver, app-policy Mar 21, 2022
@huoqifeng huoqifeng changed the title fix s390x image build for apiserver, app-policy fix s390x image build for apiserver, app-policy, typha Mar 21, 2022
@huoqifeng huoqifeng changed the title fix s390x image build for apiserver, app-policy, typha fix s390x image build for apiserver, app-policy, typha, pod2daemon Mar 21, 2022
@huoqifeng huoqifeng changed the title fix s390x image build for apiserver, app-policy, typha, pod2daemon fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers Mar 21, 2022
@huoqifeng huoqifeng changed the title fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers [WIP]fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers Mar 21, 2022
fix Dockerfile.s390x bug in apiserver, app-policy, typha, pod2daemon,…
cf0b085 
… kube-controllers

Signed-off-by: huoqifeng <huoqif@cn.ibm.com>
@huoqifeng huoqifeng changed the title [WIP]fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers Mar 21, 2022
fix cni-plugin Makefile for s390x
56010cb 
Signed-off-by: huoqifeng <huoqif@cn.ibm.com>
caseydavenport
caseydavenport reviewed Mar 22, 2022
View reviewed changes
apiserver/Makefile Outdated
$(API_SERVER_IMAGE): register $(CONTAINER_CREATED)
$(CONTAINER_CREATED): docker-image/Dockerfile.$(ARCH) $(BINDIR)/apiserver-$(ARCH) $(BINDIR)/filecheck-$(ARCH)
ifeq ($(ARCH),s390x)
$(DOCKER_BUILD) -t $(API_SERVER_IMAGE):latest-$(ARCH) -f docker-image/Dockerfile.$(ARCH) .
Copy link
Member

@caseydavenport caseydavenport Mar 22, 2022

Choose a reason for hiding this comment

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

Why do we need this conditional here instead of loading the image?

Copy link
Author

@huoqifeng huoqifeng Mar 23, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

@caseydavenport thanks for the kind review. There is no s390x images available in dockerhub, usually, user need build the images on a IBM Z (s390x) machine and then run the scripts. -- pull and --load option does not work for this case. For example: https://hub.docker.com/r/calico/go-build/tags

Copy link
Member

@caseydavenport caseydavenport Mar 29, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I'm not sure I understand - without --load the s390x image won't be built as part of our release process.

Do you mean that even on s390x machines, the --load option doesn't exist in docker?

Copy link
Member

@caseydavenport caseydavenport Jun 14, 2022

Choose a reason for hiding this comment

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

@huoqifeng did we end up getting the s390x images available in dockerhub?

Copy link
Author

@huoqifeng huoqifeng Jun 15, 2022

Choose a reason for hiding this comment

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

@huoqifeng did we end up getting the s390x images available in dockerhub?

@caseydavenport right, we can keep align with other ARCHs after merge projectcalico/toolchain#379 and get a s390x go-build image.

@huoqifeng huoqifeng mentioned this pull request Mar 23, 2022
Merged
3 tasks
@huoqifeng huoqifeng mentioned this pull request Apr 14, 2022
Closed
@huoqifeng huoqifeng changed the title fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers [WIP] fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers May 31, 2022
@huoqifeng huoqifeng changed the title [WIP] fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers [WIP][DUP] fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers May 31, 2022
@huoqifeng huoqifeng changed the title [WIP][DUP] fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers [WIP] fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers May 31, 2022
@huoqifeng huoqifeng changed the title [WIP] fix s390x image build for apiserver, app-policy, typha, pod2daemon, kube-controllers [WIP] Enable s390x image cross platform build for apiserver, app-policy, typha, pod2daemon, kube-controllers May 31, 2022
@huoqifeng huoqifeng changed the title [WIP] Enable s390x image cross platform build for apiserver, app-policy, typha, pod2daemon, kube-controllers [WIP] Enable s390x image cross platform build for apiserver, app-policy, pod2daemon, kube-controllers Jun 16, 2022
@huoqifeng huoqifeng changed the title [WIP] Enable s390x image cross platform build for apiserver, app-policy, pod2daemon, kube-controllers [WIP] Enable s390x image cross platform build for calico Jun 16, 2022
huoqifeng added 3 commits June 16, 2022 13:51
rollback apiserver Dockerfile.s390x, handle it in 5793
62776ab 
Signed-off-by: huoqifeng <huoqif@cn.ibm.com>
rollback makefile for s390x arch
6d4305a 
Signed-off-by: huoqifeng <huoqif@cn.ibm.com>
drop EXCLUDEARCH for s390x as we enbaled it for all
67f3543 
Signed-off-by: huoqifeng <huoqif@cn.ibm.com>
@huoqifeng
Copy link
Author

huoqifeng commented Jun 16, 2022

@caseydavenport I'll drop the EXCLUDEARCH?= for s390x in this PR, it could only be merged after #5793 and projectcalico/toolchain#379 get merged.

@huoqifeng huoqifeng changed the title [WIP] Enable s390x image cross platform build for calico Enable s390x image cross platform build for calico Jun 16, 2022
@caseydavenport
Copy link
Member

caseydavenport commented Jun 16, 2022

@huoqifeng maybe we can just implement this change as part of #5793? They seem pretty tightly coupled.

@huoqifeng
Copy link
Author

huoqifeng commented Jun 17, 2022

@huoqifeng maybe we can just implement this change as part of #5793? They seem pretty tightly coupled.

@caseydavenport sure, let's close this and use #5793 for all the changes.

@huoqifeng
Copy link
Author

huoqifeng commented Jun 17, 2022

Close it and will handle all s390x changes in #5793

@huoqifeng huoqifeng closed this Jun 17, 2022
@marvin-tigera marvin-tigera removed release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Jun 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@caseydavenport caseydavenport caseydavenport left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

Calico v3.24.0

Development

Successfully merging this pull request may close these issues.

4 participants

@huoqifeng @caseydavenport @mgleung @marvin-tigera