From 0523e8966caac1f5c79052d2481ffcfb7da95061 Mon Sep 17 00:00:00 2001
From: Alex ubuntu vm <alexdecb@yahoo.es>
Date: Wed, 15 May 2024 19:29:26 +0200
Subject: [PATCH] examples: updated to v2.4
---
examples/cdn/cdn-server.yaml | 4 ++--
examples/cdn/v-network-1.yaml | 11 +++-------
examples/inter-cluster/example-ned.yaml | 26 +++++++++++++++++++++++
examples/inter-cluster/inter-network.yaml | 18 ++++++++--------
examples/ping-pong/network.yaml | 2 +-
examples/ping-pong/ping.yaml | 1 -
6 files changed, 41 insertions(+), 21 deletions(-)
create mode 100644 examples/inter-cluster/example-ned.yaml
diff --git a/examples/cdn/cdn-server.yaml b/examples/cdn/cdn-server.yaml
index b4f21fd..9484d36 100644
--- a/examples/cdn/cdn-server.yaml
+++ b/examples/cdn/cdn-server.yaml
@@ -5,11 +5,11 @@ metadata:
labels:
app: test4
annotations:
- k8s.v1.cni.cncf.io/networks: v-network-1
+ l2sm/networks: '[{"name": "v-network-1", "ips":["192.168.1.8/24"]}]'
spec:
containers:
- name: server
- command: ["/bin/ash", "-c", "ip a add 10.0.1.2/24 dev net1 && ip route add 10.0.2.0/24 via 10.0.1.1 dev net1 && trap : TERM INT; sleep infinity & wait"]
+ command: ["/bin/ash", "-c", "sleep infinity & wait"]
image: alpine:latest
securityContext:
capabilities:
diff --git a/examples/cdn/v-network-1.yaml b/examples/cdn/v-network-1.yaml
index b5eb87e..102e9be 100644
--- a/examples/cdn/v-network-1.yaml
+++ b/examples/cdn/v-network-1.yaml
@@ -1,11 +1,6 @@
-apiVersion: "k8s.cni.cncf.io/v1"
-kind: NetworkAttachmentDefinition
+apiVersion: l2sm.l2sm.k8s.local/v1
+kind: L2SMNetwork
metadata:
name: v-network-1
spec:
- config: '{
- "cniVersion": "0.3.0",
- "type": "l2sm",
- "device": "l2sm-vNet"
- }'
-
+ type: vnet
\ No newline at end of file
diff --git a/examples/inter-cluster/example-ned.yaml b/examples/inter-cluster/example-ned.yaml
new file mode 100644
index 0000000..01db618
--- /dev/null
+++ b/examples/inter-cluster/example-ned.yaml
@@ -0,0 +1,26 @@
+apiVersion: l2sm.l2sm.k8s.local/v1
+kind: NetworkEdgeDevice
+metadata:
+ name: example-networkedgedevice
+ labels:
+ app: l2sm
+spec:
+ networkController:
+ name: example-network-controller
+ domain: controller.example.com
+ neighbors:
+ - node: l2sm-test-5
+ domain: 10.0.0.2
+ switchTemplate:
+ spec:
+ hostNetwork: true
+ containers:
+ - name: l2sm-switch
+ image: alexdecb/l2sm-switch:2.4
+ #args: ["setup_ned.sh && sleep infinity"]
+ env:
+ - name: CONTROLLERIP
+ value: "l2sm-controller-service"
+ securityContext:
+ capabilities:
+ add: ["NET_ADMIN"]
diff --git a/examples/inter-cluster/inter-network.yaml b/examples/inter-cluster/inter-network.yaml
index 654b7fa..cddc763 100644
--- a/examples/inter-cluster/inter-network.yaml
+++ b/examples/inter-cluster/inter-network.yaml
@@ -1,15 +1,15 @@
-apiVersion: l2sm.k8s.local/v1
+apiVersion: l2sm.l2sm.k8s.local/v1
kind: L2SMNetwork
metadata:
- name: spain-network
+ name: ping-network
spec:
- type: inter-vnet
+ type: ext-vnet
+ provider:
+ name: "Universidad Carlos III de Madrid"
+ domain: idco.uc3m.es
config: |
{
- "provider": {
- "name": "uc3m",
- "domain": "idco.uc3m.es"
- },
- "accessList": ["public-key-1", "public-key-2"]
+ "accessList": ["public-key-1", "public-key-2"],
+ "signature": "sxySO0jHw4h1kcqO/LMLDgOoOeH8dOn8vZWv4KMBq0upxz3lcbl+o/36JefpEwSlBJ6ukuKiQ79L4rsmmZgglk6y/VL54DFyLfPw9RJn3mzl99YE4qCaHyEBANSw+d5hPaJ/I8q+AMtjrYpglMTRPf0iMZQMNtMd0CdeX2V8aZOPCQP75PsZkWukPdoAK/++y1vbFQ6nQKagvpUZfr7Ecb4/QY+hIAzepm6N6lNiFNTgj6lGTrFK0qCVfRhMD+vXbBP6xzZjB2N1nIheK9vx7kvj3HORjZ+odVMa+AOU5ShSKpzXTvknrtcRTcWWmXPNUZLoq5k3U+z1g1OTFcjMdQ===="
+
}
- signature: sxySO0jHw4h1kcqO/LMLDgOoOeH8dOn8vZWv4KMBq0upxz3lcbl+o/36JefpEwSlBJ6ukuKiQ79L4rsmmZgglk6y/VL54DFyLfPw9RJn3mzl99YE4qCaHyEBANSw+d5hPaJ/I8q+AMtjrYpglMTRPf0iMZQMNtMd0CdeX2V8aZOPCQP75PsZkWukPdoAK/++y1vbFQ6nQKagvpUZfr7Ecb4/QY+hIAzepm6N6lNiFNTgj6lGTrFK0qCVfRhMD+vXbBP6xzZjB2N1nIheK9vx7kvj3HORjZ+odVMa+AOU5ShSKpzXTvknrtcRTcWWmXPNUZLoq5k3U+z1g1OTFcjMdQ====
diff --git a/examples/ping-pong/network.yaml b/examples/ping-pong/network.yaml
index 900bab7..dca3087 100644
--- a/examples/ping-pong/network.yaml
+++ b/examples/ping-pong/network.yaml
@@ -1,5 +1,5 @@
apiVersion: l2sm.l2sm.k8s.local/v1
-kind: L2SMNetwork
+kind: L2Network
metadata:
name: ping-network
spec:
diff --git a/examples/ping-pong/ping.yaml b/examples/ping-pong/ping.yaml
index fda5515..83990d8 100644
--- a/examples/ping-pong/ping.yaml
+++ b/examples/ping-pong/ping.yaml
@@ -6,7 +6,6 @@ metadata:
app: ping-pong
annotations:
l2sm/networks: '[{"name": "ping-network", "ips":["192.168.1.6/24"]}]'
-
spec:
containers:
- name: router
--
GitLab