Merge remote changes into release-2.0

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/README.md

@@ -20,17 +20,17 @@ kubectl taint nodes --all node-role.kubernetes.io/control-plane- node-role.kuber
 
 1. Create the virtual interface definitions using the following command:
  ```bash
-kubectl create -f ./deployments/custom_installation/interfaces_definitions
+kubectl create -f ./deployments/custom-installation/interfaces_definitions
 ```
 
 2. Create the Kubernetes account Service Account and apply their configuration by applying the following command:
  ```bash
-kubectl create -f ./deployments/custom_installation/config/
+kubectl create -f ./deployments/config/
 ```
 
 3. Create the Kubernetes Persistent Volume by using the following kubectl command:
  ```bash
-kubectl create -f ./deployments/custom_installation/mysql/
+kubectl create -f ./deployments/custom-installation/mysql/
 ```
 
 4. Before deploying the L2S-M operator, it is neccessary to label your master node as the "master" of the cluster. To do so, get the names of your Kubernetes nodes, select the master and apply the "master" label with the following command:
@@ -42,13 +42,13 @@ kubectl label nodes [your-master-node] dedicated=master
 5. Deploy the L2S-M Controller by using the following command: 
 
 ```bash
-kubectl create -f ./deployments/custom_installation/deployController.yanl
+kubectl create -f ./deployments/custom-installation/deployController.yaml
 ```
  You can check that the deployment was successful if the pod enters the "running" state using the *kubectl get pods* command.
 
 6. After the previous preparation, (make sure the controller is running) you can deploy the operator in your cluster using the YAML deployment file:
  ```bash
-kubectl create -f ./deployments/custom_installation/deployOperator.yaml
+kubectl create -f ./deployments/custom-installation/deployOperator.yaml
 ```
 
 Once these two pods are in running state, you can finally deploy the virtual switches
@@ -57,7 +57,7 @@ Once these two pods are in running state, you can finally deploy the virtual swi
 
 **First deploying the virtual OVS Daemonset:**
 ```bash
-kubectl create -f ./deployments/custom_installation/deploySwitch.yaml
+kubectl create -f ./deployments/custom-installation/deploySwitch.yaml
 ```
 
 And check there is a pod running in each node, with ```kubectl get pods -o wide```
@@ -141,4 +141,4 @@ Created vxlan between node l2sm2 and node l2sm1.
 ```
 
 
-You are all set! If you want to learn how to create virtual networks and use them in your applications, [check the following section of the repository](https://github.com/Networks-it-uc3m/L2S-M/tree/main/examples/ping-pong)
+You are all set! If you want to learn how to create virtual networks and use them in your applications, [check the following section of the repository](https://github.com/Networks-it-uc3m/L2S-M/tree/release-2.0/examples/)

deployments/custom-installation/deployOperator.yaml

@@ -16,9 +16,8 @@ spec:
     spec:
       serviceAccountName: l2sm-operator
       containers:
-      - image: alexdecb/l2sm-operator:2.0
+      - 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": "br2",
+      "mtu": 1400,
       "device": "veth2"
     }'
 ---
@@ -29,6 +33,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br3",
+      "mtu": 1400,
       "device": "veth3"
     }'
 ---
@@ -40,6 +46,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br4",
+      "mtu": 1400,
       "device": "veth4"
     }'
 ---
@@ -51,6 +59,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br5",
+      "mtu": 1400,
       "device": "veth5"
     }'
 ---
@@ -62,6 +72,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br6",
+      "mtu": 1400,
       "device": "veth6"
     }'
 ---
@@ -74,6 +86,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br7",
+      "mtu": 1400,
       "device": "veth7"
     }'
 ---
@@ -85,6 +99,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br8",
+      "mtu": 1400,
       "device": "veth8"
     }'
 ---
@@ -96,6 +112,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br9",
+      "mtu": 1400,
       "device": "veth9"
     }'
 ---
@@ -107,6 +125,8 @@ spec:
   config: '{
       "cniVersion": "0.3.0",
       "type": "bridge",
+      "bridge": "br10",
+      "mtu": 1400,
       "device": "veth10"
     }'
 ---