Change default network to ClusterNetwork

Change-Id: Id8358498bf1ce41943787b0cd1c7731eaef908f8
Signed-off-by: Krisztian Lengyel <krisztian.lengyel@nokia.com>

diff --git a/SPECS/caas-flannel.spec b/SPECS/caas-flannel.spec
index 0829960..12ca7f0 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 }}