From baff4e61cf596cd98e972599a8a3def7e598dcfd Mon Sep 17 00:00:00 2001
From: Sergey <s.bondarev@southbridge.ru>
Date: Sun, 19 Apr 2020 16:13:37 +0300
Subject: [PATCH] remove image flannel cni (#5980)
---
roles/download/defaults/main.yml | 12 ------------
.../flannel/templates/cni-flannel.yml.j2 | 2 +-
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 5f0070536..1bbd1850e 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -76,7 +76,6 @@ calico_typha_version: "v3.13.2"
typha_enabled: false
flannel_version: "v0.12.0"
-flannel_cni_version: "v0.3.0"
cni_version: "v0.8.5"
@@ -463,8 +462,6 @@ 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_cni_image_repo: "{{ quay_image_repo }}/coreos/flannel-cni"
-flannel_cni_image_tag: "{{ flannel_cni_version }}"
calico_node_image_repo: "{{ docker_image_repo }}/calico/node"
calico_node_image_tag: "{{ calico_version }}"
calico_cni_image_repo: "{{ docker_image_repo }}/calico/cni"
@@ -757,15 +754,6 @@ downloads:
groups:
- k8s-cluster
- flannel_cni:
- enabled: "{{ kube_network_plugin == 'flannel' }}"
- container: true
- repo: "{{ flannel_cni_image_repo }}"
- tag: "{{ flannel_cni_image_tag }}"
- sha256: "{{ flannel_cni_digest_checksum|default(None) }}"
- groups:
- - k8s-cluster
-
calicoctl:
enabled: "{{ kube_network_plugin == 'calico' or kube_network_plugin == 'canal' }}"
file: true
diff --git a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
index fb84d4358..da76ff650 100644
--- a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
+++ b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
@@ -104,7 +104,7 @@ spec:
- amd64
initContainers:
- name: install-cni
- image: {{ flannel_cni_image_repo }}:{{ flannel_cni_image_tag }}
+ image: {{ flannel_image_repo }}:{{ flannel_image_tag }}
command:
- cp
args:
--
GitLab