From 62079e3b34f2f7ce7f04dc42e305c32bb719bd57 Mon Sep 17 00:00:00 2001 From: Kuralamudhan Ramakrishnan Date: Tue, 17 Mar 2020 05:32:22 +0000 Subject: adding primary network features - adding docker build bugfixes - Removing the dependence on Multus - ovn4nfv-k8s CNI will be default or cluster networking - ovn4nfv-k8s creates ovn overlay mutli-networking using pod annotations itself - remove the outdated unit test Based on the Ritu(ovn4nfv-k8s-plugin committer) patches Change-Id: Ic48bd11d746e6339075fb3ba33f12463bb3f218d Co-authored-by: Ritu Sood Signed-off-by: Kuralamudhan Ramakrishnan Change-Id: I9702bbd2d4aa23157052258ef6b363bc7b472a63 --- internal/pkg/ovn/utils.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'internal/pkg/ovn/utils.go') diff --git a/internal/pkg/ovn/utils.go b/internal/pkg/ovn/utils.go index 3b3b53b..9b388b7 100644 --- a/internal/pkg/ovn/utils.go +++ b/internal/pkg/ovn/utils.go @@ -5,6 +5,7 @@ import ( "fmt" kexec "k8s.io/utils/exec" "os" + "reflect" "strings" "time" ) @@ -36,6 +37,13 @@ var SetupOvnUtils = func() error { log.Error(err, "Failed to initialize OVN Distributed Router") return err } + + log.Info("OVN Network", "OVN Default NW", Ovn4nfvDefaultNw, "OVN Subnet", ovnConf.Subnet, "OVN Gateway IP", ovnConf.GatewayIP, "OVN ExcludeIPs", ovnConf.ExcludeIPs) + _, err = createOvnLS(Ovn4nfvDefaultNw, ovnConf.Subnet, ovnConf.GatewayIP, ovnConf.ExcludeIPs) + if err != nil && !reflect.DeepEqual(err, fmt.Errorf("LS exists")) { + log.Error(err, "Failed to create ovn4nfvk8s default nw") + return err + } return nil } -- cgit 1.2.3-korg