From 1c40ef596e542c62cb7d775f18d3ab7170128d33 Mon Sep 17 00:00:00 2001 From: Krisztian Lengyel Date: Fri, 30 Aug 2019 15:51:12 +0200 Subject: [PATCH] Change default network to ClusterNetwork Change-Id: Id8358498bf1ce41943787b0cd1c7731eaef908f8 Signed-off-by: Krisztian Lengyel --- SPECS/caas-flannel.spec | 2 +- ansible/roles/flannel/tasks/main.yaml | 10 +++++----- .../templates/{flannel_tnet.yaml.j2 => flannel_cnet.yaml.j2} | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) rename ansible/roles/flannel/templates/{flannel_tnet.yaml.j2 => flannel_cnet.yaml.j2} (91%) diff --git a/SPECS/caas-flannel.spec b/SPECS/caas-flannel.spec index 0829960..12ca7f0 100644 --- a/SPECS/caas-flannel.spec +++ b/SPECS/caas-flannel.spec @@ -15,7 +15,7 @@ %define COMPONENT flannel %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 0.11.0 -%define RPM_MINOR_VERSION 5 +%define RPM_MINOR_VERSION 6 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} diff --git a/ansible/roles/flannel/tasks/main.yaml b/ansible/roles/flannel/tasks/main.yaml index c97645b..19f10d2 100644 --- a/ansible/roles/flannel/tasks/main.yaml +++ b/ansible/roles/flannel/tasks/main.yaml @@ -33,12 +33,12 @@ manifest: "{{ caas.manifests_directory }}/flannel-ds.yaml" state: present -- name: template default TenantNetwork for kube-system namespace +- name: template default ClusterNetwork for kube-system namespace template: - src: flannel_tnet.yaml.j2 - dest: "{{ caas.manifests_directory }}/flannel-tnet_kube_system_ns.yaml" + src: flannel_cnet.yaml.j2 + dest: "{{ caas.manifests_directory }}/flannel-cnet.yaml" -- name: create TenantNetwork within kube-system namespace +- name: create ClusterNetwork within kube-system namespace kubectl: - manifest: "{{ caas.manifests_directory }}/flannel-tnet_kube_system_ns.yaml" + manifest: "{{ caas.manifests_directory }}/flannel-cnet.yaml" state: present diff --git a/ansible/roles/flannel/templates/flannel_tnet.yaml.j2 b/ansible/roles/flannel/templates/flannel_cnet.yaml.j2 similarity index 91% rename from ansible/roles/flannel/templates/flannel_tnet.yaml.j2 rename to ansible/roles/flannel/templates/flannel_cnet.yaml.j2 index 2dfacf8..e8471e3 100644 --- a/ansible/roles/flannel/templates/flannel_tnet.yaml.j2 +++ b/ansible/roles/flannel/templates/flannel_cnet.yaml.j2 @@ -15,10 +15,9 @@ limitations under the License. #} --- apiVersion: danm.k8s.io/v1 -kind: TenantNetwork +kind: ClusterNetwork metadata: name: {{ caas.danmnet_default_name }} - namespace: {{ caas.danmnet_default_namespace }} spec: NetworkID: {{ caas.danmnet_default_network_id }} NetworkType: {{ caas.danmnet_default_network_type }} -- 2.16.6