aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRitu Sood <ritu.sood@intel.com>2019-08-29 17:50:51 -0700
committerRitu Sood <ritu.sood@intel.com>2019-08-29 17:58:19 -0700
commit00a81d850fc144c2d43bcc0cf401d355ec7b712c (patch)
tree77ec46b9c8032b07b5c86abdde1da685422a7a27
parenta6c37bf8c9c1e9f5072bfc3e43b6ec0061ee2108 (diff)
Add check for annotation presence
If annotation is found on pod then pod is already processed, stop processing. This is different from "Failed to add ports" error. Change-Id: I101df641c150e007146bc1aeda9c5b372be329ca Signed-off-by: Ritu Sood <ritu.sood@intel.com>
-rw-r--r--internal/pkg/ovn/ovn.go5
-rw-r--r--pkg/controller/pod/pod_controller.go3
2 files changed, 3 insertions, 5 deletions
diff --git a/internal/pkg/ovn/ovn.go b/internal/pkg/ovn/ovn.go
index 82fe837..12a4912 100644
--- a/internal/pkg/ovn/ovn.go
+++ b/internal/pkg/ovn/ovn.go
@@ -72,11 +72,6 @@ func (oc *Controller) AddLogicalPorts(pod *kapi.Pod, ovnNetObjs []map[string]int
return
}
- if _, ok := pod.Annotations[Ovn4nfvAnnotationTag]; ok {
- log.V(1).Info("AddLogicalPorts : Pod annotation found")
- return
- }
-
var ovnString, outStr string
ovnString = "["
var ns netInterface
diff --git a/pkg/controller/pod/pod_controller.go b/pkg/controller/pod/pod_controller.go
index 8792985..23a847e 100644
--- a/pkg/controller/pod/pod_controller.go
+++ b/pkg/controller/pod/pod_controller.go
@@ -167,6 +167,9 @@ func (r *ReconcilePod) addLogicalPorts(pod *corev1.Pod) error {
if err != nil {
return err
}
+ if _, ok := pod.Annotations[ovn.Ovn4nfvAnnotationTag]; ok {
+ return fmt.Errorf("Pod annotation found")
+ }
key, value := ovnCtl.AddLogicalPorts(pod, nfn.Interface)
if len(key) > 0 {
return r.setPodAnnotation(pod, key, value)