diff options
author | Trinath Somanchi <trinaths.dev@gmail.com> | 2019-11-15 09:32:45 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2019-11-15 09:32:45 +0000 |
commit | 222ffb6e7ed3b4a31dad18bae1ec26cdf7c9991a (patch) | |
tree | 521aa2c1954ebf2c2a136275bd62575d4badd192 | |
parent | 53279580afc48c90cbd28ab61799d9e81e41fffa (diff) | |
parent | 5dcca8ca6c5b70ca0453044aeacb0fb16dbd80ce (diff) |
Merge "Add a check for network creation"
-rw-r--r-- | pkg/controller/network/network_controller.go | 5 |
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 |