Browse Source
Add image_arch in flannel image tag (#7560)
* Add image_arch variable when download flannel image
* Fix flannel image tag typo with image arch
pull/7578/head
muzi502
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
roles/download/defaults/main.yml
-
roles/network_plugin/flannel/templates/cni-flannel.yml.j2
|
|
|
@ -401,7 +401,7 @@ kube_proxy_image_repo: "{{ kube_image_repo }}/kube-proxy" |
|
|
|
etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd" |
|
|
|
etcd_image_tag: "{{ etcd_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}" |
|
|
|
flannel_image_repo: "{{ quay_image_repo }}/coreos/flannel" |
|
|
|
flannel_image_tag: "{{ flannel_version }}" |
|
|
|
flannel_image_tag: "{{ flannel_version }}-{{ image_arch }}" |
|
|
|
calico_node_image_repo: "{{ quay_image_repo }}/calico/node" |
|
|
|
calico_node_image_tag: "{{ calico_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}" |
|
|
|
calico_cni_image_repo: "{{ quay_image_repo }}/calico/cni" |
|
|
|
|
|
|
|
@ -66,7 +66,7 @@ spec: |
|
|
|
serviceAccountName: flannel |
|
|
|
containers: |
|
|
|
- name: kube-flannel |
|
|
|
image: {{ flannel_image_repo }}:{{ flannel_image_tag }}-{{ arch }} |
|
|
|
image: {{ flannel_image_repo }}:{{ flannel_image_tag | regex_replace(image_arch,'') }}{{ arch }} |
|
|
|
imagePullPolicy: {{ k8s_image_pull_policy }} |
|
|
|
resources: |
|
|
|
limits: |
|
|
|
@ -109,7 +109,7 @@ spec: |
|
|
|
- {{ arch }} |
|
|
|
initContainers: |
|
|
|
- name: install-cni |
|
|
|
image: {{ flannel_image_repo }}:{{ flannel_image_tag }}-{{ arch }} |
|
|
|
image: {{ flannel_image_repo }}:{{ flannel_image_tag | regex_replace(image_arch,'') }}{{ arch }} |
|
|
|
command: |
|
|
|
- cp |
|
|
|
args: |
|
|
|
|
