From: Krisztian Lengyel <krisztian.lengyel@nokia.com>
Date: Fri, 19 Jul 2019 15:41:18 +0000 (+0200)
Subject: Use default tenant network on infra components
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-registry.git;a=commitdiff_plain;h=refs%2Fchanges%2F29%2F1229%2F3

Use default tenant network on infra components

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

diff --git a/SPECS/registry.spec b/SPECS/registry.spec
index ec321d4..ef216ec 100644
--- a/SPECS/registry.spec
+++ b/SPECS/registry.spec
@@ -15,7 +15,7 @@
 %define COMPONENT registry
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 2.7.1
-%define RPM_MINOR_VERSION 4
+%define RPM_MINOR_VERSION 5
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
@@ -96,4 +96,3 @@ fi
 
 %clean
 rm -rf ${buildroot}
-
diff --git a/ansible/roles/registry/templates/main/docker-registry.yml b/ansible/roles/registry/templates/main/docker-registry.yml
index 3bb725a..d140676 100644
--- a/ansible/roles/registry/templates/main/docker-registry.yml
+++ b/ansible/roles/registry/templates/main/docker-registry.yml
@@ -25,13 +25,6 @@ spec:
       name: registry
   template:
     metadata:
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {
-              "network":"flannel"
-            }
-          ]
       labels:
         name: registry
     spec:
diff --git a/ansible/roles/registry/templates/update/docker-registry-update.yml b/ansible/roles/registry/templates/update/docker-registry-update.yml
index 89b2387..36407f7 100644
--- a/ansible/roles/registry/templates/update/docker-registry-update.yml
+++ b/ansible/roles/registry/templates/update/docker-registry-update.yml
@@ -25,13 +25,6 @@ spec:
       name: registry-update
   template:
     metadata:
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {
-              "network":"flannel"
-            }
-          ]
       labels:
         name: registry-update
     spec: