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

Add ARM64 support for masters #9566

Merged
merged 6 commits into from
Aug 15, 2020
Merged

Conversation

hakman
Copy link
Member

@hakman hakman commented Jul 13, 2020

This PR adds build and side-loading support for ARM64 masters:

  • build multi-arch images (the AMD64 image is pushed twice, with and without the -amd64 repo suffix.
  • add support for side-loading the multi-arch images
  • disable the Protokube checks in mock

The Protokube check has to be disabled in mock to allow changing the image names change to multi-arch from:

dns-controller.tar.gz
kops-controller.tar.gz
kube-apiserver-healthcheck.tar.gz
protokube.tar.gz

to:

dns-controller-amd64.tar.gz
dns-controller-arm64.tar.gz
kops-controller-amd64.tar.gz
kops-controller-arm64.tar.gz
kube-apiserver-healthcheck-amd64.tar.gz
kube-apiserver-healthcheck-arm64.tar.gz
protokube-amd64.tar.gz
protokube-arm64.tar.gz

TODO (in future PRs):

  • re-enable the Protokube checks in mock after the next release
  • decide on how to handle multi-arch manifests for the kops images
  • remove the -plain bazel image targets
  • build etcd-manager multi-arch images Support for ARM64 kopeio/etcd-manager#334

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 13, 2020
@johngmyers
Copy link
Member

This supports a mixed-arch control plane, which seems unlikely. Perhaps we should have a cluster spec field specifying the arch of the control plane, allowing apply_cluster to save a bunch of asset management.

@hakman hakman force-pushed the arm64-images branch 2 times, most recently from 9d8decf to d80e3b4 Compare July 14, 2020 07:13
@hakman
Copy link
Member Author

hakman commented Jul 15, 2020

/test pull-kops-e2e-cni-cilium

@hakman
Copy link
Member Author

hakman commented Jul 15, 2020

This supports a mixed-arch control plane, which seems unlikely. Perhaps we should have a cluster spec field specifying the arch of the control plane, allowing apply_cluster to save a bunch of asset management.

@johngmyers I thought about that also, but I decided on not complicating the spec even more. Current implementation allows the node to autodetect whatever OS arch the node has and keeps the logic consistent in the asset management code.

I am in four of extending this to a cluster spec option though:
#9535

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 18, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 18, 2020
@hakman hakman force-pushed the arm64-images branch 2 times, most recently from f9209fa to 1fb4b3d Compare July 18, 2020 06:56
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 18, 2020
@hakman
Copy link
Member Author

hakman commented Jul 25, 2020

/test pull-kops-e2e-cni-cilium

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 31, 2020
@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 31, 2020
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2020
@hakman hakman changed the title [WIP] Add ARM64 support for masters Add ARM64 support for masters Aug 13, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 13, 2020
@hakman
Copy link
Member Author

hakman commented Aug 13, 2020

/hold for feedback from reviewers

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 13, 2020
@hakman hakman requested a review from olemarkus August 13, 2020 08:49
@olemarkus
Copy link
Member

/lgtm

This gives me a valid cluster bar the autoscaler pods that comes in #9744

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 13, 2020
@johngmyers
Copy link
Member

/lgtm

@hakman
Copy link
Member Author

hakman commented Aug 15, 2020

/hold cancel

@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 Aug 15, 2020
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 15, 2020
@johngmyers
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 15, 2020
@hakman
Copy link
Member Author

hakman commented Aug 15, 2020

/test all

@hakman
Copy link
Member Author

hakman commented Aug 15, 2020

/test pull-kops-e2e-cni-kuberouter

@k8s-ci-robot k8s-ci-robot merged commit 96ab842 into kubernetes:master Aug 15, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Aug 15, 2020
@hakman hakman deleted the arm64-images branch August 15, 2020 03:46
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/api area/kops-controller area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants