Add multi architeture support to flannel (#6166)

Signed-off-by: Victor Morales <v.morales@samsung.com>
This commit is contained in:
Victor Morales 2020-09-22 00:44:47 -07:00 committed by GitHub
parent 5bd937ece0
commit 0d0cc8cf9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -38,11 +38,16 @@ data:
{% endif %} {% endif %}
} }
} }
{% for arch in ['amd64', 'arm64', 'arm', 'ppc64le', 's390x'] %}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
{% if arch == 'amd64' %}
name: kube-flannel name: kube-flannel
{% else %}
name: kube-flannel-ds-{{ arch }}
{% endif %}
namespace: kube-system namespace: kube-system
labels: labels:
tier: node tier: node
@ -61,7 +66,7 @@ spec:
serviceAccountName: flannel serviceAccountName: flannel
containers: containers:
- name: kube-flannel - name: kube-flannel
image: {{ flannel_image_repo }}:{{ flannel_image_tag }} image: {{ flannel_image_repo }}:{{ flannel_image_tag }}-{{ arch }}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
resources: resources:
limits: limits:
@ -101,10 +106,10 @@ spec:
- key: kubernetes.io/arch - key: kubernetes.io/arch
operator: In operator: In
values: values:
- amd64 - {{ arch }}
initContainers: initContainers:
- name: install-cni - name: install-cni
image: {{ flannel_image_repo }}:{{ flannel_image_tag }} image: {{ flannel_image_repo }}:{{ flannel_image_tag }}-{{ arch }}
command: command:
- cp - cp
args: args:
@ -137,3 +142,4 @@ spec:
rollingUpdate: rollingUpdate:
maxUnavailable: {{ serial | default('20%') }} maxUnavailable: {{ serial | default('20%') }}
type: RollingUpdate type: RollingUpdate
{% endfor %}