diff --git a/build/operator/l2sm-operator.py b/build/operator/l2sm-operator.py
index 3f75af80cf2072b0b6b93b092942993aee2b99c4..782ed0c55cdac57791f1ade1c567eeec813c06ca 100644
--- a/build/operator/l2sm-operator.py
+++ b/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()
diff --git a/deployments/README.md b/deployments/README.md
index acb000c735a42113f8a5d52dec75671df1dace68..d178245a186ba603ee0a545de0bb104de334b020 100644
--- a/deployments/README.md
+++ b/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/)
diff --git a/deployments/custom-installation/deployOperator.yaml b/deployments/custom-installation/deployOperator.yaml
index 41594da25c80c9127110fe59da30a91301085915..f88b81f497015405513c5278b4cb3130275a8440 100644
--- a/deployments/custom-installation/deployOperator.yaml
+++ b/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
diff --git a/deployments/custom-installation/interfaces_definitions/vhost1.yaml b/deployments/custom-installation/interfaces_definitions/vhost1.yaml
index 3f603cfbfe4a3d71fbad932cd85de76bc5903667..5eed80277d2e17060a7eca49df5c16c5a65f10ea 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost1.yaml
+++ b/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"
}'
diff --git a/deployments/custom-installation/interfaces_definitions/vhost10.yaml b/deployments/custom-installation/interfaces_definitions/vhost10.yaml
index 9975699dcea91fcb1048ec0b7d305973aac5ddaa..db850d1e3521c9def537de543f938859863faddb 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost10.yaml
+++ b/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"
}'
diff --git a/deployments/custom-installation/interfaces_definitions/vhost2.yaml b/deployments/custom-installation/interfaces_definitions/vhost2.yaml
index c99a91cb7df73ccd99aa100532353e9f038d0df4..ebee425eab8d2688deb262d400a7c0a8a7534ec4 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost2.yaml
+++ b/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"
}'
diff --git a/deployments/custom-installation/interfaces_definitions/vhost3.yaml b/deployments/custom-installation/interfaces_definitions/vhost3.yaml
index c05f175fb6e39c3bdcb54cb66886aec003d0d630..984a57469a4e688885fe059edd4c8e4e7f170260 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost3.yaml
+++ b/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"
}'
diff --git a/deployments/custom-installation/interfaces_definitions/vhost4.yaml b/deployments/custom-installation/interfaces_definitions/vhost4.yaml
index a1496cde83851bb1cd9eca90cef96fbbf3f61004..be25ebf2cfabc4eeaa689e05c117997ff883de6f 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost4.yaml
+++ b/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"
}'
diff --git a/deployments/custom-installation/interfaces_definitions/vhost5.yaml b/deployments/custom-installation/interfaces_definitions/vhost5.yaml
index 81caf02d9008aa1c6e71295b20749d45a8e07c4a..9742122420bcf635a91e478ccb578b2814bdd3e6 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost5.yaml
+++ b/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"
}'
diff --git a/deployments/custom-installation/interfaces_definitions/vhost6.yaml b/deployments/custom-installation/interfaces_definitions/vhost6.yaml
index 44250108d7a5865631b65b9b293bf72f911d2f2f..86012451b57ea4510865b89233c1ae49c2148c82 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost6.yaml
+++ b/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"
}'
diff --git a/deployments/custom-installation/interfaces_definitions/vhost7.yaml b/deployments/custom-installation/interfaces_definitions/vhost7.yaml
index 2bcf5b6cfbb935e19e30e3b18acfc89c38d3adbf..c6cdd78a69e830449a07e477b434f7af4ce75bb6 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost7.yaml
+++ b/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"
}'
diff --git a/deployments/custom-installation/interfaces_definitions/vhost8.yaml b/deployments/custom-installation/interfaces_definitions/vhost8.yaml
index 2749e314fd0ce0ca727c500b7b15cf48f25169d8..e3b478dd85bef2539de7e684143768e5e49a6ecb 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost8.yaml
+++ b/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"
}'
diff --git a/deployments/custom-installation/interfaces_definitions/vhost9.yaml b/deployments/custom-installation/interfaces_definitions/vhost9.yaml
index 58944e8ce7b13bc6d6f5cfa304c43918b7908f3a..5b68835638e705195e1f528cc00fe8e3bcdce8cf 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost9.yaml
+++ b/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"
}'
diff --git a/deployments/l2sm-deployment.yaml b/deployments/l2sm-deployment.yaml
index 2ae0edc5644dc1f0de7d72d4e2793c3d1a199f10..5f6950b73879a9750de5a462e4ac45fea8ae0a9e 100644
--- a/deployments/l2sm-deployment.yaml
+++ b/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"
}'
---