From dcdb877121fb24b4054845213163418b6419af86 Mon Sep 17 00:00:00 2001
From: Alex ubuntu vm <alexdecb@yahoo.es>
Date: Mon, 19 Feb 2024 14:55:54 +0100
Subject: [PATCH] Addded ned to master node by default
---
.../{veths.yaml => inter-veths.yaml} | 0
deployments/inter-cluster/inter-vnet.yaml | 15 -----------
.../{network.yaml => l2sm-network-crd.yaml} | 2 +-
deployments/inter-cluster/ned.yaml | 16 ++++++++++-
deployments/inter-cluster/ping.yaml | 18 -------------
deployments/inter-cluster/vlink.yaml | 27 -------------------
deployments/inter-cluster/vnet.yaml | 6 -----
7 files changed, 16 insertions(+), 68 deletions(-)
rename deployments/inter-cluster/{veths.yaml => inter-veths.yaml} (100%)
delete mode 100644 deployments/inter-cluster/inter-vnet.yaml
rename deployments/inter-cluster/{network.yaml => l2sm-network-crd.yaml} (90%)
delete mode 100644 deployments/inter-cluster/ping.yaml
delete mode 100644 deployments/inter-cluster/vlink.yaml
delete mode 100644 deployments/inter-cluster/vnet.yaml
diff --git a/deployments/inter-cluster/veths.yaml b/deployments/inter-cluster/inter-veths.yaml
similarity index 100%
rename from deployments/inter-cluster/veths.yaml
rename to deployments/inter-cluster/inter-veths.yaml
diff --git a/deployments/inter-cluster/inter-vnet.yaml b/deployments/inter-cluster/inter-vnet.yaml
deleted file mode 100644
index 654b7fa..0000000
--- a/deployments/inter-cluster/inter-vnet.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: l2sm.k8s.local/v1
-kind: L2SMNetwork
-metadata:
- name: spain-network
-spec:
- type: inter-vnet
- config: |
- {
- "provider": {
- "name": "uc3m",
- "domain": "idco.uc3m.es"
- },
- "accessList": ["public-key-1", "public-key-2"]
- }
- signature: sxySO0jHw4h1kcqO/LMLDgOoOeH8dOn8vZWv4KMBq0upxz3lcbl+o/36JefpEwSlBJ6ukuKiQ79L4rsmmZgglk6y/VL54DFyLfPw9RJn3mzl99YE4qCaHyEBANSw+d5hPaJ/I8q+AMtjrYpglMTRPf0iMZQMNtMd0CdeX2V8aZOPCQP75PsZkWukPdoAK/++y1vbFQ6nQKagvpUZfr7Ecb4/QY+hIAzepm6N6lNiFNTgj6lGTrFK0qCVfRhMD+vXbBP6xzZjB2N1nIheK9vx7kvj3HORjZ+odVMa+AOU5ShSKpzXTvknrtcRTcWWmXPNUZLoq5k3U+z1g1OTFcjMdQ====
diff --git a/deployments/inter-cluster/network.yaml b/deployments/inter-cluster/l2sm-network-crd.yaml
similarity index 90%
rename from deployments/inter-cluster/network.yaml
rename to deployments/inter-cluster/l2sm-network-crd.yaml
index 53dea2d..229bfbe 100644
--- a/deployments/inter-cluster/network.yaml
+++ b/deployments/inter-cluster/l2sm-network-crd.yaml
@@ -18,7 +18,7 @@ spec:
type:
type: string
config:
- type: string # This is now simply a string, intended to hold JSON data.
+ type: string
nullable: true
signature:
type: string
diff --git a/deployments/inter-cluster/ned.yaml b/deployments/inter-cluster/ned.yaml
index 8ee6de1..d77dbcd 100644
--- a/deployments/inter-cluster/ned.yaml
+++ b/deployments/inter-cluster/ned.yaml
@@ -6,10 +6,24 @@ metadata:
app: l2sm
spec:
hostNetwork: true
+ initContainers:
+ - name: wait-for-l2sm-operator
+ image: curlimages/curl
+ args:
+ - /bin/sh
+ - -c
+ - >
+ set -x;
+ while [ $(curl -sw '%{http_code}' "http://l2sm-operator-service:8080/healthz" -o /dev/null) -ne 200 ]; do
+ sleep 15;
+ done;
+ sleep 5;
containers:
- name: mycontainer
image: alexdecb/l2sm-switch:2.2
command: ["sleep", "infinity"]
securityContext:
capabilities:
- add: ["NET_ADMIN"]
\ No newline at end of file
+ add: ["NET_ADMIN"]
+ nodeSelector:
+ dedicated: master
\ No newline at end of file
diff --git a/deployments/inter-cluster/ping.yaml b/deployments/inter-cluster/ping.yaml
deleted file mode 100644
index 665ec1d..0000000
--- a/deployments/inter-cluster/ping.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
- name: ping
- labels:
- app: ping-pong
- annotations:
- l2sm/networks: ping-network
-spec:
- containers:
- - name: router
- command: ["/bin/ash", "-c", "trap : TERM INT; sleep infinity & wait"]
- image: alpine:latest
- securityContext:
- capabilities:
- add: ["NET_ADMIN"]
- # Use this parameter if you want to place the pod in a specific node
- nodeName: l2sm1
diff --git a/deployments/inter-cluster/vlink.yaml b/deployments/inter-cluster/vlink.yaml
deleted file mode 100644
index fc6c27a..0000000
--- a/deployments/inter-cluster/vlink.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: l2sm.k8s.local/v1
-kind: L2SMNetwork
-metadata:
- name: vlink-sample
-spec:
- type: vlink
- config: |
- {
- "overlay-parameters": {
- "path": {
- "name": "first-path",
- "FromEndpoint": "node-a",
- "ToEndpoint": "node-e",
- "links": ["link-ac","link-cd","link-de"],
- "capabilities": {
- "bandwidthBits": "20M",
- "latencyNanos": "8e5"
- }
- },
- "reverse-path": {
- "name": "second-path",
- "fromEndpoint": "node-e",
- "toEndpoint": "node-a",
- "links": ["link-ed","link-db","link-ba"]
- }
- }
- }
diff --git a/deployments/inter-cluster/vnet.yaml b/deployments/inter-cluster/vnet.yaml
deleted file mode 100644
index b96a334..0000000
--- a/deployments/inter-cluster/vnet.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: l2sm.k8s.local/v1
-kind: L2SMNetwork
-metadata:
- name: ping-network
-spec:
- type: vnet
\ No newline at end of file
--
GitLab