aboutsummaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorRitu Sood <ritu.sood@intel.com>2019-09-29 06:22:17 -0700
committerRitu Sood <ritu.sood@intel.com>2019-09-29 06:22:17 -0700
commit5dcca8ca6c5b70ca0453044aeacb0fb16dbd80ce (patch)
tree598e4a56808ef77e08d9e5777a7a3c0f2591b0ab /pkg
parenteae13a54dbdc442a450992f6c4811037ab30daab (diff)
Add a check for network creation
If network already exists consider that as not an error Change-Id: I279338e6e4d6f6ad0d7417bcabbd3f2027ff808e Signed-off-by: Ritu Sood <ritu.sood@intel.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/controller/network/network_controller.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/controller/network/network_controller.go b/pkg/controller/network/network_controller.go
index 2392e3d..abdcb14 100644
--- a/pkg/controller/network/network_controller.go
+++ b/pkg/controller/network/network_controller.go
@@ -4,13 +4,12 @@ import (
"context"
"fmt"
k8sv1alpha1 "ovn4nfv-k8s-plugin/pkg/apis/k8s/v1alpha1"
-
- // corev1 "k8s.io/api/core/v1"
"github.com/go-logr/logr"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"ovn4nfv-k8s-plugin/internal/pkg/ovn"
"ovn4nfv-k8s-plugin/pkg/utils"
+ "reflect"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/handler"
@@ -111,7 +110,7 @@ func (r *ReconcileNetwork) createNetwork(cr *k8sv1alpha1.Network, reqLogger logr
return err
}
err = ovnCtl.CreateNetwork(cr)
- if err != nil {
+ if err != nil && !reflect.DeepEqual(err, fmt.Errorf("LS exists")) {
// Log the error
reqLogger.Error(err, "Error Creating Network")
cr.Status.State = k8sv1alpha1.CreateInternalError