-
Notifications
You must be signed in to change notification settings - Fork 742
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
support ARM and AMD for calico #1282
Conversation
/cc @caseydavenport can you please take a look? |
config/master/calico.yaml
Outdated
@@ -32,7 +32,7 @@ spec: | |||
# container programs network policy and routes on each | |||
# host. | |||
- name: calico-node | |||
image: quay.io/calico/node:v3.16.2 | |||
image: calico/node:v3.16.2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You will probably want to explicitly call out the registry here. e.g., docker.io/calico/node:v3.16.2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes will do that
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is awesome! I spent an hour trying to figure why it didn't work for graviton, then I saw dockerhub had both arm64 and x86_64 architecture listed for the same tag and quay didn't decided to try. I have a cluster with both Archs and wanted the daemonset to run on all nodes
I got it working with helm upgrade --install --set calico.node.image="calico/node" --namespace kube-system aws-calico eks/aws-calico
.
I am going to put a PR for the helm charts!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just ran into this exact same issue. :(
@@ -707,7 +707,7 @@ spec: | |||
nodeSelector: | |||
beta.kubernetes.io/os: linux | |||
containers: | |||
- image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.7.1 | |||
- image: k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.3 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't tried this version myself, but it should probably be fine.
A couple minor comments from me but this LGTM. |
f47ad79
to
c58ad2c
Compare
Thanks for your time on reviewing the PR, I have made the change you suggested. Will merge the PR. |
What type of PR is this?
enhancement
Which issue does this PR fix:
#1218
What does this PR do / Why do we need it:
Update calico-node and calico-typha to docker images to support ARM and AMD instances
Update autoscalar image - https://github.com/kubernetes-sigs/cluster-proportional-autoscaler/releases/tag/1.8.3
If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:
Testing done on this change:
Yes
AMD instance
ARM instance
Automation added to e2e:
No
Will this break upgrades or downgrades. Has updating a running cluster been tested?:
No
Does this change require updates to the CNI daemonset config files to work?:
No
Does this PR introduce any user-facing change?:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.