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

support ARM and AMD for calico #1282

Merged
merged 1 commit into from
Nov 17, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config/master/calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: docker.io/calico/node:v3.16.2
envFrom:
- configMapRef:
# Allow KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT to be overridden for eBPF mode.
Expand Down Expand Up @@ -565,7 +565,7 @@ spec:
securityContext:
fsGroup: 65534
containers:
- image: quay.io/calico/typha:v3.16.2
- image: docker.io/calico/typha:v3.16.2
name: calico-typha
ports:
- containerPort: 5473
Expand Down Expand Up @@ -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
Copy link
Contributor

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.

name: autoscaler
command:
- /cluster-proportional-autoscaler
Expand Down