Use default tenant network on infra components

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

diff --git a/SPECS/caas-chartrepo.spec b/SPECS/caas-chartrepo.spec
index 4f802c4..96a57b1 100644 (file)
--- a/SPECS/caas-chartrepo.spec
+++ b/SPECS/caas-chartrepo.spec
@@ -15,7 +15,7 @@
 %define COMPONENT chartrepo
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 6
+%define RPM_MINOR_VERSION 7
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
 %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save

diff --git a/SPECS/caas-helm.spec b/SPECS/caas-helm.spec
index dfe5f61..3c08373 100644 (file)
--- a/SPECS/caas-helm.spec
+++ b/SPECS/caas-helm.spec
@@ -15,7 +15,7 @@
 %define COMPONENT helm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 2.14.2
-%define RPM_MINOR_VERSION 0
+%define RPM_MINOR_VERSION 1
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define go_version 1.11.5
 %define cni_plugins_version 0.7.0

diff --git a/ansible/roles/chart_repo/templates/chart-repo.yml b/ansible/roles/chart_repo/templates/chart-repo.yml
index bb65d1f..465d77c 100644 (file)
--- a/ansible/roles/chart_repo/templates/chart-repo.yml
+++ b/ansible/roles/chart_repo/templates/chart-repo.yml
@@ -26,13 +26,6 @@ spec:
       {{ caas.kubernetes_component_label }}: chart-repo
   template:
     metadata:
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {
-              "network":"flannel"
-            }
-          ]
       labels:
         {{ caas.kubernetes_component_label }}: chart-repo
     spec:

diff --git a/ansible/roles/helm/templates/tiller.yml b/ansible/roles/helm/templates/tiller.yml
index 36c55d8..dee3e54 100644 (file)
--- a/ansible/roles/helm/templates/tiller.yml
+++ b/ansible/roles/helm/templates/tiller.yml
@@ -26,13 +26,6 @@ spec:
       {{ caas.kubernetes_component_label }}: tiller
   template:
     metadata:
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {
-              "network":"flannel"
-            }
-          ]
       labels:
         {{ caas.kubernetes_component_label }}: tiller
     spec: