From eca48c083b034616ca9bc99cb8324a0029275fce Mon Sep 17 00:00:00 2001
From: Alex ubuntu vm <alexdecb@yahoo.es>
Date: Fri, 14 Jun 2024 18:41:48 +0200
Subject: [PATCH] deployments. added he-codeco-netma namespace
---
.../custom-installation/config/account.yaml | 1 +
.../custom-installation/config/binding.yaml | 1 +
.../custom-installation/deployController.yaml | 2 +
.../custom-installation/deployManager.yaml | 2 +-
.../custom-installation/deployOperator.yaml | 6 +-
.../custom-installation/deploySwitch.yaml | 2 +-
.../interfaces_definitions/vhost1.yaml | 1 +
.../interfaces_definitions/vhost10.yaml | 1 +
.../interfaces_definitions/vhost2.yaml | 1 +
.../interfaces_definitions/vhost3.yaml | 1 +
.../interfaces_definitions/vhost4.yaml | 1 +
.../interfaces_definitions/vhost5.yaml | 1 +
.../interfaces_definitions/vhost6.yaml | 1 +
.../interfaces_definitions/vhost7.yaml | 1 +
.../interfaces_definitions/vhost8.yaml | 1 +
.../interfaces_definitions/vhost9.yaml | 1 +
.../mysql/database-schema.yaml | 1 +
...development.yaml => mysql-deployment.yaml} | 7 ++-
.../custom-installation/mysql/mysql-pv.yaml | 1 +
.../custom-installation/mysql/mysql-pvc.yaml | 1 +
deployments/l2sm-deployment.yaml | 63 +++++++++++++------
21 files changed, 71 insertions(+), 26 deletions(-)
rename deployments/custom-installation/mysql/{mysql-development.yaml => mysql-deployment.yaml} (89%)
diff --git a/deployments/custom-installation/config/account.yaml b/deployments/custom-installation/config/account.yaml
index 2af8ec5..e4a9bd7 100644
--- a/deployments/custom-installation/config/account.yaml
+++ b/deployments/custom-installation/config/account.yaml
@@ -2,3 +2,4 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: l2sm-operator
+ namespace: he-codeco-netma
diff --git a/deployments/custom-installation/config/binding.yaml b/deployments/custom-installation/config/binding.yaml
index 01997ea..0264b91 100644
--- a/deployments/custom-installation/config/binding.yaml
+++ b/deployments/custom-installation/config/binding.yaml
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: l2sm-operator
+ namespace: he-codeco-netma
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
diff --git a/deployments/custom-installation/deployController.yaml b/deployments/custom-installation/deployController.yaml
index 614ec96..8c3a780 100644
--- a/deployments/custom-installation/deployController.yaml
+++ b/deployments/custom-installation/deployController.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: l2sm-controller
+ namespace: he-codeco-netma
spec:
replicas: 1
selector:
@@ -30,6 +31,7 @@ apiVersion: v1
kind: Service
metadata:
name: l2sm-controller-service
+ namespace: he-codeco-netma
spec:
selector:
app: l2sm-controller
diff --git a/deployments/custom-installation/deployManager.yaml b/deployments/custom-installation/deployManager.yaml
index 86da97a..1dee772 100644
--- a/deployments/custom-installation/deployManager.yaml
+++ b/deployments/custom-installation/deployManager.yaml
@@ -9666,7 +9666,7 @@ spec:
- /manager
env:
- name: CONTROLLER_IP
- value: l2sm-controller-service.default.svc.cluster.local
+ value: l2sm-controller-service.he-codeco-netma.svc.cluster.local
- name: CONTROLLER_PORT
value: "8181"
- name: SWITCHES_NAMESPACE
diff --git a/deployments/custom-installation/deployOperator.yaml b/deployments/custom-installation/deployOperator.yaml
index 418305d..ca07047 100644
--- a/deployments/custom-installation/deployOperator.yaml
+++ b/deployments/custom-installation/deployOperator.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: l2sm-operator
+ namespace: he-codeco-netma
spec:
replicas: 1
strategy:
@@ -34,7 +35,7 @@ spec:
- name: CONTROLLER_IP
value: l2sm-controller-service
- name: DATABASE_IP
- value: mysql-development-service
+ value: mysql-service
- name: MYSQL_USER
value: l2sm
- name: MYSQL_PASSWORD
@@ -43,7 +44,7 @@ spec:
value: l2sm
# imagePullPolicy: Always
nodeSelector:
- dedicated: master
+ dedicated: control-plane
tolerations:
- key: dedicated
operator: Equal
@@ -55,6 +56,7 @@ apiVersion: v1
kind: Service
metadata:
name: l2sm-operator-service
+ namespace: he-codeco-netma
spec:
ports:
- protocol: TCP
diff --git a/deployments/custom-installation/deploySwitch.yaml b/deployments/custom-installation/deploySwitch.yaml
index 5906371..e0bad85 100644
--- a/deployments/custom-installation/deploySwitch.yaml
+++ b/deployments/custom-installation/deploySwitch.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: l2sm-switch
- #namespace: kube-system
+ namespace: he-codeco-netma
labels:
l2sm-component: l2sm-switch
spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost1.yaml b/deployments/custom-installation/interfaces_definitions/vhost1.yaml
index 35ec50b..408b065 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost1.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost1.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth1
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost10.yaml b/deployments/custom-installation/interfaces_definitions/vhost10.yaml
index 4937c12..73e4c26 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost10.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost10.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth10
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost2.yaml b/deployments/custom-installation/interfaces_definitions/vhost2.yaml
index cb536e6..8c7d052 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost2.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost2.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth2
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost3.yaml b/deployments/custom-installation/interfaces_definitions/vhost3.yaml
index e9895a6..47ae587 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost3.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost3.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth3
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost4.yaml b/deployments/custom-installation/interfaces_definitions/vhost4.yaml
index c78bb1d..4ee5bce 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost4.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost4.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth4
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost5.yaml b/deployments/custom-installation/interfaces_definitions/vhost5.yaml
index 624a4e0..131d2d6 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost5.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost5.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth5
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost6.yaml b/deployments/custom-installation/interfaces_definitions/vhost6.yaml
index 2de8c5a..799d0ec 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost6.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost6.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth6
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost7.yaml b/deployments/custom-installation/interfaces_definitions/vhost7.yaml
index f4d707b..69a680b 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost7.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost7.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth7
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost8.yaml b/deployments/custom-installation/interfaces_definitions/vhost8.yaml
index 2369034..978b50e 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost8.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost8.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth8
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
diff --git a/deployments/custom-installation/interfaces_definitions/vhost9.yaml b/deployments/custom-installation/interfaces_definitions/vhost9.yaml
index b2a6f9b..597aec7 100644
--- a/deployments/custom-installation/interfaces_definitions/vhost9.yaml
+++ b/deployments/custom-installation/interfaces_definitions/vhost9.yaml
@@ -3,6 +3,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth9
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
diff --git a/deployments/custom-installation/mysql/database-schema.yaml b/deployments/custom-installation/mysql/database-schema.yaml
index 9acea17..0c8f4c6 100644
--- a/deployments/custom-installation/mysql/database-schema.yaml
+++ b/deployments/custom-installation/mysql/database-schema.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: mysql-schema
+ namespace: he-codeco-netma
data:
init.sql: |
diff --git a/deployments/custom-installation/mysql/mysql-development.yaml b/deployments/custom-installation/mysql/mysql-deployment.yaml
similarity index 89%
rename from deployments/custom-installation/mysql/mysql-development.yaml
rename to deployments/custom-installation/mysql/mysql-deployment.yaml
index 030042d..d14a2d2 100644
--- a/deployments/custom-installation/mysql/mysql-development.yaml
+++ b/deployments/custom-installation/mysql/mysql-deployment.yaml
@@ -1,7 +1,8 @@
apiVersion: v1
kind: Pod
metadata:
- name: mysql-development-pod
+ name: mysql-pod
+ namespace: he-codeco-netma
labels:
app: mysql
spec:
@@ -33,7 +34,8 @@ spec:
apiVersion: v1
kind: Service
metadata:
- name: mysql-development-service
+ name: mysql-service
+ namespace: he-codeco-netma
spec:
type: ClusterIP
ports:
@@ -47,6 +49,7 @@ apiVersion: v1
kind: Secret
metadata:
name: mysql-secret
+ namespace: he-codeco-netma
type: Opaque
data:
MYSQL_ROOT_PASSWORD: cGFzc3dvcmQ= # Base64 encoded "password"
diff --git a/deployments/custom-installation/mysql/mysql-pv.yaml b/deployments/custom-installation/mysql/mysql-pv.yaml
index 8eef7d1..ee8de6c 100644
--- a/deployments/custom-installation/mysql/mysql-pv.yaml
+++ b/deployments/custom-installation/mysql/mysql-pv.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
kind: PersistentVolume
metadata:
name: mysql-pv
+ namespace: he-codeco-netma
labels:
type: local
spec:
diff --git a/deployments/custom-installation/mysql/mysql-pvc.yaml b/deployments/custom-installation/mysql/mysql-pvc.yaml
index 889f6d5..481a3b2 100644
--- a/deployments/custom-installation/mysql/mysql-pvc.yaml
+++ b/deployments/custom-installation/mysql/mysql-pvc.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: mysql-pv-claim
+ namespace: he-codeco-netma
spec:
storageClassName: manual
accessModes:
diff --git a/deployments/l2sm-deployment.yaml b/deployments/l2sm-deployment.yaml
index 762f0bd..a073b1e 100644
--- a/deployments/l2sm-deployment.yaml
+++ b/deployments/l2sm-deployment.yaml
@@ -1,12 +1,28 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+ labels:
+ app.kubernetes.io/component: manager
+ app.kubernetes.io/created-by: l2network
+ app.kubernetes.io/instance: system
+ app.kubernetes.io/managed-by: kustomize
+ app.kubernetes.io/name: namespace
+ app.kubernetes.io/part-of: l2network
+ control-plane: controller-manager
+ name: he-codeco-netma
+---
apiVersion: v1
kind: ServiceAccount
metadata:
name: l2sm-operator
+ namespace: he-codeco-netma
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: l2sm-operator
+ namespace: he-codeco-netma
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
@@ -20,6 +36,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: l2sm-controller
+ namespace: he-codeco-netma
spec:
replicas: 1
selector:
@@ -48,6 +65,7 @@ apiVersion: v1
kind: Service
metadata:
name: l2sm-controller-service
+ namespace: he-codeco-netma
spec:
selector:
app: l2sm-controller
@@ -63,20 +81,7 @@ spec:
type: ClusterIP
---
----
-apiVersion: v1
-kind: Namespace
-metadata:
- labels:
- app.kubernetes.io/component: manager
- app.kubernetes.io/created-by: l2network
- app.kubernetes.io/instance: system
- app.kubernetes.io/managed-by: kustomize
- app.kubernetes.io/name: namespace
- app.kubernetes.io/part-of: l2network
- control-plane: controller-manager
- name: he-codeco-netma
----
+
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
@@ -9730,7 +9735,7 @@ spec:
- /manager
env:
- name: CONTROLLER_IP
- value: l2sm-controller-service.default.svc.cluster.local
+ value: l2sm-controller-service.he-codeco-netma.svc.cluster.local
- name: CONTROLLER_PORT
value: "8181"
- name: SWITCHES_NAMESPACE
@@ -9881,6 +9886,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: l2sm-operator
+ namespace: he-codeco-netma
spec:
replicas: 1
strategy:
@@ -9913,7 +9919,7 @@ spec:
- name: CONTROLLER_IP
value: l2sm-controller-service
- name: DATABASE_IP
- value: mysql-development-service
+ value: mysql-service
- name: MYSQL_USER
value: l2sm
- name: MYSQL_PASSWORD
@@ -9922,7 +9928,7 @@ spec:
value: l2sm
# imagePullPolicy: Always
nodeSelector:
- dedicated: master
+ dedicated: control-plane
tolerations:
- key: dedicated
operator: Equal
@@ -9934,6 +9940,7 @@ apiVersion: v1
kind: Service
metadata:
name: l2sm-operator-service
+ namespace: he-codeco-netma
spec:
ports:
- protocol: TCP
@@ -9948,7 +9955,7 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: l2sm-switch
- #namespace: kube-system
+ namespace: he-codeco-netma
labels:
l2sm-component: l2sm-switch
spec:
@@ -10006,6 +10013,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth10
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
@@ -10025,6 +10033,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth1
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
@@ -10044,6 +10053,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth2
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
@@ -10063,6 +10073,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth3
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
@@ -10082,6 +10093,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth4
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
@@ -10101,6 +10113,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth5
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
@@ -10120,6 +10133,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth6
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
@@ -10139,6 +10153,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth7
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
@@ -10158,6 +10173,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth8
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
@@ -10177,6 +10193,7 @@ apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: veth9
+ namespace: he-codeco-netma
labels:
app: l2sm
spec:
@@ -10195,6 +10212,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: mysql-schema
+ namespace: he-codeco-netma
data:
init.sql: |
@@ -10256,7 +10274,8 @@ data:
apiVersion: v1
kind: Pod
metadata:
- name: mysql-development-pod
+ name: mysql-pod
+ namespace: he-codeco-netma
labels:
app: mysql
spec:
@@ -10288,7 +10307,8 @@ spec:
apiVersion: v1
kind: Service
metadata:
- name: mysql-development-service
+ name: mysql-service
+ namespace: he-codeco-netma
spec:
type: ClusterIP
ports:
@@ -10302,6 +10322,7 @@ apiVersion: v1
kind: Secret
metadata:
name: mysql-secret
+ namespace: he-codeco-netma
type: Opaque
data:
MYSQL_ROOT_PASSWORD: cGFzc3dvcmQ= # Base64 encoded "password"
@@ -10313,6 +10334,7 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: mysql-pv-claim
+ namespace: he-codeco-netma
spec:
storageClassName: manual
accessModes:
@@ -10325,6 +10347,7 @@ apiVersion: v1
kind: PersistentVolume
metadata:
name: mysql-pv
+ namespace: he-codeco-netma
labels:
type: local
spec:
--
GitLab