switch interfaces: BUG FIX

Fixed loop  that occured when two bridges joined together and the switch, forming a loop that would take all the CPU usage from process systemd-networkd

build/operator/l2sm-operator.py

@@ -200,8 +200,7 @@ def pod_vn(body, name, namespace, logger, annotations, **kwargs):
 
     ret.metadata.annotations['k8s.v1.cni.cncf.io/networks'] = ', '.join(multusInt)
 
-    #PATCH NETWORK WITH ANNOTATION
-    v1.patch_namespaced_pod(name, namespace, ret)
+  
 
     #GET NETWORK ID'S
     #for j in items:
@@ -233,7 +232,8 @@ def pod_vn(body, name, namespace, logger, annotations, **kwargs):
       
       response = session.post(baseControllerUrl + '/l2sm/networks/port', json=payload)
 
-
+    #PATCH NETWORK WITH ANNOTATION
+    v1.patch_namespaced_pod(name, namespace, ret)
 
     db.commit()
     db.close()

deployments/custom-installation/deployOperator.yaml

@@ -16,9 +16,8 @@ spec:
     spec:
       serviceAccountName: l2sm-operator
       containers:
-      - image: alexdecb/l2sm-operator:latest
+      - image: alexdecb/l2sm-operator:2.1
         name: l2sm-opt-pod
-        imagePullPolicy: Always
         env:
           - name: CONTROLLER_IP
             value: l2sm-controller-service

deployments/custom-installation/interfaces_definitions/vhost1.yaml

@@ -7,5 +7,7 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br1",
+      "mtu": 1400,
       "device": "veth1"
     }'

deployments/custom-installation/interfaces_definitions/vhost10.yaml

@@ -7,5 +7,7 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br10",
+      "mtu": 1400,
       "device": "veth10"
     }'

deployments/custom-installation/interfaces_definitions/vhost2.yaml

@@ -7,5 +7,7 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br2",
+      "mtu": 1400,
       "device": "veth2"
     }'

deployments/custom-installation/interfaces_definitions/vhost3.yaml

@@ -7,5 +7,7 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br3",
+      "mtu": 1400,
       "device": "veth3"
     }'

deployments/custom-installation/interfaces_definitions/vhost4.yaml

@@ -7,5 +7,7 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br4",
+      "mtu": 1400,
       "device": "veth4"
     }'

deployments/custom-installation/interfaces_definitions/vhost5.yaml

@@ -7,5 +7,7 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br5",
+      "mtu": 1400,
       "device": "veth5"
     }'

deployments/custom-installation/interfaces_definitions/vhost6.yaml

@@ -7,5 +7,7 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br6",
+      "mtu": 1400,
       "device": "veth6"
     }'

deployments/custom-installation/interfaces_definitions/vhost7.yaml

@@ -7,5 +7,7 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br7",
+      "mtu": 1400,
       "device": "veth7"
     }'

deployments/custom-installation/interfaces_definitions/vhost8.yaml

@@ -7,5 +7,7 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br8",
+      "mtu": 1400,
       "device": "veth8"
     }'

deployments/custom-installation/interfaces_definitions/vhost9.yaml

@@ -7,5 +7,7 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br9",
+      "mtu": 1400,
       "device": "veth9"
     }'

deployments/l2sm-deployment.yaml

@@ -7,6 +7,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br1",
+      "mtu": 1400,
       "device": "veth1"
     }'
 ---
@@ -18,6 +20,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br1",
+      "mtu": 1400,
       "device": "veth2"
     }'
 ---
@@ -29,6 +33,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br1",
+      "mtu": 1400,
       "device": "veth3"
     }'
 ---
@@ -40,6 +46,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br1",
+      "mtu": 1400,
       "device": "veth4"
     }'
 ---
@@ -51,6 +59,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br1",
+      "mtu": 1400,
       "device": "veth5"
     }'
 ---
@@ -62,6 +72,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br1",
+      "mtu": 1400,
       "device": "veth6"
     }'
 ---
@@ -74,6 +86,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br1",
+      "mtu": 1400,
       "device": "veth7"
     }'
 ---
@@ -85,6 +99,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br1",
+      "mtu": 1400,
       "device": "veth8"
     }'
 ---
@@ -96,6 +112,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br1",
+      "mtu": 1400,
       "device": "veth9"
     }'
 ---
@@ -107,6 +125,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br1",
+      "mtu": 1400,
       "device": "veth10"
     }'
 ---