From 82008c9f3e1dc692e1003dcdbddb836dc3dda786 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Jun 2021 14:30:45 -0500 Subject: [PATCH 001/449] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c734158..aefcd7f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +# RELEASE CUT: Release-1.0 + # 5G Core with RAN + UE simulator deployment on Red Hat Openshift with Service Mesh
Background:
From 72fbf7d0c4424c9f984e0719620a97e6cab1f68c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 28 Jan 2022 19:50:30 -0600 Subject: [PATCH 002/449] Update values.yaml --- 5gran/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index c42f1c1..dc5d0c3 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -5,7 +5,7 @@ ran: pullPolicy: IfNotPresent tag: "v1.5" amf: - address: 172.27.103.93 + address: 52.72.129.204 port: 30412 user: imsi: "imsi-208930000000001" From 388780c80230e4a459f38139730cb5d603860f04 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 16:37:09 -0600 Subject: [PATCH 003/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 506aa1c..b3792bc 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -65,7 +65,7 @@ spec: - name: amf image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-amfd", "-c", "/open5gs/config-map/amf.yaml"] + command: ["open5gs-amfd", "-d", "-c", "/open5gs/config-map/amf.yaml"] volumeMounts: - name: open5gs-amf-config mountPath: /open5gs/config-map/amf.yaml From 2db108870d9131b0be8199bc3705cc2b9fd4f073 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 16:40:07 -0600 Subject: [PATCH 004/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index dec8a4a..21e10f6 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -36,7 +36,7 @@ spec: imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} command: ["/bin/sh", "-c"] args: - - open5gs-smfd -c /open5gs/config-map/smf.yaml; + - open5gs-smfd -d -c /open5gs/config-map/smf.yaml; volumeMounts: - name: open5gs-smf-config mountPath: /open5gs/config-map/smf.yaml From 1f7dd36539fe675a7adfba0c7b69aa46c582836a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 16:40:42 -0600 Subject: [PATCH 005/449] Update nrf-deploy.yaml --- 5gcore/templates/nrf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/nrf-deploy.yaml b/5gcore/templates/nrf-deploy.yaml index 1a0c1f7..b86dd26 100644 --- a/5gcore/templates/nrf-deploy.yaml +++ b/5gcore/templates/nrf-deploy.yaml @@ -34,7 +34,7 @@ spec: - name: nrf image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-nrfd", "-c", "/open5gs/config-map/nrf.yaml"] + command: ["open5gs-nrfd", "-d", "-c", "/open5gs/config-map/nrf.yaml"] volumeMounts: - name: open5gs-nrf-config mountPath: /open5gs/config-map/nrf.yaml From 321ea9151a18ddbe7656203424c67f195cf3ecda Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 16:41:17 -0600 Subject: [PATCH 006/449] Update udr-deploy.yaml --- 5gcore/templates/udr-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/udr-deploy.yaml b/5gcore/templates/udr-deploy.yaml index 479c3b8..78bc67f 100644 --- a/5gcore/templates/udr-deploy.yaml +++ b/5gcore/templates/udr-deploy.yaml @@ -34,7 +34,7 @@ spec: - name: udr image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-udrd", "-c", "/open5gs/config-map/udr.yaml"] + command: ["open5gs-udrd", "-d", "-c", "/open5gs/config-map/udr.yaml"] volumeMounts: - name: open5gs-udr-config mountPath: /open5gs/config-map/udr.yaml From 1a709a5e3cdbf637f85d4d1d121381164a32f056 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:38:34 -0600 Subject: [PATCH 007/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index b3792bc..67c0d08 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -50,7 +50,7 @@ metadata: labels: epc-mode: amf spec: - replicas: 1 + #replicas: 1 selector: matchLabels: epc-mode: amf From 88bbe80b9c6a6efbc439cc036508756f0ccc4c73 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:39:01 -0600 Subject: [PATCH 008/449] Update ausf-deploy.yaml --- 5gcore/templates/ausf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/ausf-deploy.yaml b/5gcore/templates/ausf-deploy.yaml index acb1987..c5dd43d 100644 --- a/5gcore/templates/ausf-deploy.yaml +++ b/5gcore/templates/ausf-deploy.yaml @@ -19,7 +19,7 @@ metadata: labels: epc-mode: ausf spec: - replicas: 1 + #replicas: 1 selector: matchLabels: epc-mode: ausf From c0255d625ecfc270d36798d6b55dce511d64b56e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:39:19 -0600 Subject: [PATCH 009/449] Update nrf-deploy.yaml --- 5gcore/templates/nrf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/nrf-deploy.yaml b/5gcore/templates/nrf-deploy.yaml index b86dd26..4308108 100644 --- a/5gcore/templates/nrf-deploy.yaml +++ b/5gcore/templates/nrf-deploy.yaml @@ -19,7 +19,7 @@ metadata: labels: epc-mode: nrf spec: - replicas: 1 + #replicas: 1 selector: matchLabels: epc-mode: nrf From db27acd15068628fcc0153c866db03867264f654 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:39:41 -0600 Subject: [PATCH 010/449] Update nssf-deploy.yaml --- 5gcore/templates/nssf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/nssf-deploy.yaml b/5gcore/templates/nssf-deploy.yaml index 04de289..8cfb806 100644 --- a/5gcore/templates/nssf-deploy.yaml +++ b/5gcore/templates/nssf-deploy.yaml @@ -19,7 +19,7 @@ metadata: labels: epc-mode: nssf spec: - replicas: 1 + #replicas: 1 selector: matchLabels: epc-mode: nssf From a6e7dade4ba1199f203e81039d7483c9cc3cc25e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:39:59 -0600 Subject: [PATCH 011/449] Update pcf-deploy.yaml --- 5gcore/templates/pcf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/pcf-deploy.yaml b/5gcore/templates/pcf-deploy.yaml index 007c5d4..596cb68 100644 --- a/5gcore/templates/pcf-deploy.yaml +++ b/5gcore/templates/pcf-deploy.yaml @@ -19,7 +19,7 @@ metadata: labels: epc-mode: pcf spec: - replicas: 1 + #replicas: 1 selector: matchLabels: epc-mode: pcf From 3120f3f2f70d83535d0c1f40010cba7fa23fe110 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:40:17 -0600 Subject: [PATCH 012/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index 21e10f6..c22492b 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -19,7 +19,7 @@ metadata: labels: epc-mode: smf spec: - replicas: 1 + #replicas: 1 selector: matchLabels: epc-mode: smf From a6b4d377483afb73ea896a0465fec3a6396cc181 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:40:31 -0600 Subject: [PATCH 013/449] Update udm-deploy.yaml --- 5gcore/templates/udm-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/udm-deploy.yaml b/5gcore/templates/udm-deploy.yaml index 0366f98..ce9c6fd 100644 --- a/5gcore/templates/udm-deploy.yaml +++ b/5gcore/templates/udm-deploy.yaml @@ -19,7 +19,7 @@ metadata: labels: epc-mode: udm spec: - replicas: 1 + #replicas: 1 selector: matchLabels: epc-mode: udm From a913f082a46fd95fdd59e7b06e975fd9a4cde28a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:40:46 -0600 Subject: [PATCH 014/449] Update udr-deploy.yaml --- 5gcore/templates/udr-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/udr-deploy.yaml b/5gcore/templates/udr-deploy.yaml index 78bc67f..719ca11 100644 --- a/5gcore/templates/udr-deploy.yaml +++ b/5gcore/templates/udr-deploy.yaml @@ -19,7 +19,7 @@ metadata: labels: epc-mode: udr spec: - replicas: 1 + #replicas: 1 selector: matchLabels: epc-mode: udr From 48a752d040b653bfd7301ef2685a9cb7037e6b12 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:41:02 -0600 Subject: [PATCH 015/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 6773136..6439427 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -19,7 +19,7 @@ metadata: labels: epc-mode: upf spec: - replicas: 1 + #replicas: 1 selector: matchLabels: epc-mode: upf From 0c000a5c2d6a3e66d057fc3e136f4fead327e474 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:41:20 -0600 Subject: [PATCH 016/449] Update web-ui-deploy.yaml --- 5gcore/templates/web-ui-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/web-ui-deploy.yaml b/5gcore/templates/web-ui-deploy.yaml index 062b10d..9e8b8a1 100644 --- a/5gcore/templates/web-ui-deploy.yaml +++ b/5gcore/templates/web-ui-deploy.yaml @@ -50,7 +50,7 @@ metadata: labels: epc-mode: webui spec: - replicas: 1 + #replicas: 1 selector: matchLabels: epc-mode: webui From 18c79c7fc432e5c525a3c726893b9bcecc7552c5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:43:36 -0600 Subject: [PATCH 017/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 67c0d08..b9f1310 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -74,3 +74,16 @@ spec: - name: open5gs-amf-config configMap: name: open5gs-amf-config +--- +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: open5gs-amf-d +spec: + maxReplicas: 7 + minReplicas: 1 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: open5gs-amf-d + targetCPUUtilizationPercentage: 60 From 74037017587b72a6055057fd45e0cb164d7e2f19 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:44:49 -0600 Subject: [PATCH 018/449] Update ausf-deploy.yaml --- 5gcore/templates/ausf-deploy.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/5gcore/templates/ausf-deploy.yaml b/5gcore/templates/ausf-deploy.yaml index c5dd43d..2dc7674 100644 --- a/5gcore/templates/ausf-deploy.yaml +++ b/5gcore/templates/ausf-deploy.yaml @@ -43,3 +43,16 @@ spec: - name: open5gs-ausf-config configMap: name: open5gs-ausf-config +--- +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: open5gs-ausf-d +spec: + maxReplicas: 7 + minReplicas: 1 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: open5gs-ausf-d + targetCPUUtilizationPercentage: 60 From b0a710b331987d5909815b5648bc7dcd3bb2d23a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:47:15 -0600 Subject: [PATCH 019/449] Update nrf-deploy.yaml --- 5gcore/templates/nrf-deploy.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/5gcore/templates/nrf-deploy.yaml b/5gcore/templates/nrf-deploy.yaml index 4308108..0854ccb 100644 --- a/5gcore/templates/nrf-deploy.yaml +++ b/5gcore/templates/nrf-deploy.yaml @@ -43,4 +43,16 @@ spec: - name: open5gs-nrf-config configMap: name: open5gs-nrf-config - +--- +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: open5gs-nrf-d +spec: + maxReplicas: 7 + minReplicas: 1 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: open5gs-nrf-d + targetCPUUtilizationPercentage: 60 From 297d7ca45e29513745834f49c9a701fd86ac1026 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:47:56 -0600 Subject: [PATCH 020/449] Update nssf-deploy.yaml --- 5gcore/templates/nssf-deploy.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/5gcore/templates/nssf-deploy.yaml b/5gcore/templates/nssf-deploy.yaml index 8cfb806..65c27a0 100644 --- a/5gcore/templates/nssf-deploy.yaml +++ b/5gcore/templates/nssf-deploy.yaml @@ -43,3 +43,16 @@ spec: - name: open5gs-nssf-config configMap: name: open5gs-nssf-config +--- +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: open5gs-nssf-d +spec: + maxReplicas: 7 + minReplicas: 1 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: open5gs-nssf-d + targetCPUUtilizationPercentage: 60 From 6c8f5ce14cae7eb6cf9e0f26cf5a531a8a257ee1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:48:25 -0600 Subject: [PATCH 021/449] Update pcf-deploy.yaml --- 5gcore/templates/pcf-deploy.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/5gcore/templates/pcf-deploy.yaml b/5gcore/templates/pcf-deploy.yaml index 596cb68..dd7e530 100644 --- a/5gcore/templates/pcf-deploy.yaml +++ b/5gcore/templates/pcf-deploy.yaml @@ -43,3 +43,16 @@ spec: - name: open5gs-pcf-config configMap: name: open5gs-pcf-config +--- +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: open5gs-pcf-d +spec: + maxReplicas: 7 + minReplicas: 1 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: open5gs-pcf-d + targetCPUUtilizationPercentage: 60 From cb281b4aae9427e14104535838b8ec21d8cd7594 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:48:46 -0600 Subject: [PATCH 022/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index c22492b..5f3a2a7 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -45,3 +45,16 @@ spec: - name: open5gs-smf-config configMap: name: open5gs-smf-config +--- +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: open5gs-smf-d +spec: + maxReplicas: 7 + minReplicas: 1 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: open5gs-smf-d + targetCPUUtilizationPercentage: 60 From 6fd1c5a8710e36390b6e1f316d3f78195abac43e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:49:05 -0600 Subject: [PATCH 023/449] Update udm-deploy.yaml --- 5gcore/templates/udm-deploy.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/5gcore/templates/udm-deploy.yaml b/5gcore/templates/udm-deploy.yaml index ce9c6fd..65d3561 100644 --- a/5gcore/templates/udm-deploy.yaml +++ b/5gcore/templates/udm-deploy.yaml @@ -43,3 +43,16 @@ spec: - name: open5gs-udm-config configMap: name: open5gs-udm-config +--- +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: open5gs-udm-d +spec: + maxReplicas: 7 + minReplicas: 1 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: open5gs-udm-d + targetCPUUtilizationPercentage: 60 From 2f1411b8b6a5b3f65aadacd59be9c594c53574f8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:49:42 -0600 Subject: [PATCH 024/449] Update udr-deploy.yaml --- 5gcore/templates/udr-deploy.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/5gcore/templates/udr-deploy.yaml b/5gcore/templates/udr-deploy.yaml index 719ca11..196a092 100644 --- a/5gcore/templates/udr-deploy.yaml +++ b/5gcore/templates/udr-deploy.yaml @@ -43,3 +43,16 @@ spec: - name: open5gs-udr-config configMap: name: open5gs-udr-config +--- +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: open5gs-udr-d +spec: + maxReplicas: 7 + minReplicas: 1 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: open5gs-udr-d + targetCPUUtilizationPercentage: 60 From 1d162ce2cf1d5cb6c93f553fc10ef17f7515f844 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:50:08 -0600 Subject: [PATCH 025/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 6439427..40356fd 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -59,3 +59,16 @@ spec: - name: dev-net-tun hostPath: path: /dev/net/tun +--- +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: open5gs-upf-d +spec: + maxReplicas: 7 + minReplicas: 1 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: open5gs-upf-d + targetCPUUtilizationPercentage: 60 From 4302beb1dc4fb6fb058b3220d6407f16967b4db5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:53:01 -0600 Subject: [PATCH 026/449] Create resource-limits.yaml --- 5gcore/templates/resource-limits.yaml | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 5gcore/templates/resource-limits.yaml diff --git a/5gcore/templates/resource-limits.yaml b/5gcore/templates/resource-limits.yaml new file mode 100644 index 0000000..b426024 --- /dev/null +++ b/5gcore/templates/resource-limits.yaml @@ -0,0 +1,37 @@ +apiVersion: "v1" +kind: "LimitRange" +metadata: + name: "resource-limits-pod" +spec: + limits: + - type: "Pod" + max: + cpu: "600" + memory: "2Gi" + min: + cpu: "10m" + memory: "4Mi" + maxLimitRequestRatio: + cpu: "100" +--- +apiVersion: "v1" +kind: "LimitRange" +metadata: + name: "resource-limits" +spec: + limits: + - type: "Container" + max: + cpu: "300" + memory: "1Gi" + min: + cpu: "5m" + memory: "4Mi" + default: + cpu: "100m" + memory: "100Mi" + defaultRequest: + cpu: "100m" + memory: "100Mi" + maxLimitRequestRatio: + cpu: "300" From 8a1660f0f32470b737e8654e86c0e4ac3a4e4f8f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:54:21 -0600 Subject: [PATCH 027/449] Update resource-limits.yaml --- 5gcore/templates/resource-limits.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/resource-limits.yaml b/5gcore/templates/resource-limits.yaml index b426024..d1f945d 100644 --- a/5gcore/templates/resource-limits.yaml +++ b/5gcore/templates/resource-limits.yaml @@ -17,7 +17,7 @@ spec: apiVersion: "v1" kind: "LimitRange" metadata: - name: "resource-limits" + name: "resource-limits-container" spec: limits: - type: "Container" From a0dc78878823fd1c071af8cbbd0c75da2eb13297 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 2 Feb 2022 19:56:34 -0600 Subject: [PATCH 028/449] Update mongodb.yaml --- 5gcore/templates/mongodb.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/5gcore/templates/mongodb.yaml b/5gcore/templates/mongodb.yaml index c78e179..c1f21cd 100644 --- a/5gcore/templates/mongodb.yaml +++ b/5gcore/templates/mongodb.yaml @@ -47,3 +47,16 @@ spec: resources: requests: storage: 20Gi +--- +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: open5gs-mongodb-d +spec: + maxReplicas: 7 + minReplicas: 1 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: open5gs-mongodb-d + targetCPUUtilizationPercentage: 60 From 8e56006f521e38b60e834b5d61d3bbe230281c8b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 08:36:03 -0600 Subject: [PATCH 029/449] Update amf-configmap.yaml --- 5gcore/templates/amf-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/amf-configmap.yaml b/5gcore/templates/amf-configmap.yaml index bbf36df..8cd7bd1 100644 --- a/5gcore/templates/amf-configmap.yaml +++ b/5gcore/templates/amf-configmap.yaml @@ -30,7 +30,6 @@ data: mnc: {{ .Values.amf.mnc }} s_nssai: - sst: 1 - sd: 1 security: integrity_order : [ NIA2, NIA1, NIA0 ] ciphering_order : [ NEA0, NEA1, NEA2 ] From 86800b52b457e31e7eb5f3649d7e9e54196b4df6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 08:40:36 -0600 Subject: [PATCH 030/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index f37a17d..8c41e80 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -19,6 +19,5 @@ data: # List of supported S-NSSAIs by this gNB slices: - sst: 1 - sd: 1 # Indicates whether or not SCTP stream number errors should be ignored. ignoreStreamIds: true From 1c8797c494e527e6e675717bde743e81b2771ef7 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 08:46:11 -0600 Subject: [PATCH 031/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index 8c41e80..f37a17d 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -19,5 +19,6 @@ data: # List of supported S-NSSAIs by this gNB slices: - sst: 1 + sd: 1 # Indicates whether or not SCTP stream number errors should be ignored. ignoreStreamIds: true From 7ae38ec806d849ab96d275dcbd2d25114f3f8f35 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 08:47:05 -0600 Subject: [PATCH 032/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index c6e63b0..d1079ec 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -46,7 +46,6 @@ data: # Default Configured NSSAI for this UE default-nssai: - sst: 1 - sd: 1 # Supported encryption algorithms by this UE integrity: From 691031e472573d0b8fa1b15b4d3bf7c7772590f0 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 08:51:12 -0600 Subject: [PATCH 033/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index d1079ec..f8e25f1 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -41,7 +41,6 @@ data: # Configured NSSAI for this UE by HPLMN configured-nssai: - sst: 1 - sd: 1 # Default Configured NSSAI for this UE default-nssai: From 6fea13a24ab7164859998fddd1b21d3772e65a91 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 08:53:19 -0600 Subject: [PATCH 034/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index f8e25f1..d59224c 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -35,13 +35,13 @@ data: apn: 'internet' slice: sst: 1 - sd: 1 emergency: false # Configured NSSAI for this UE by HPLMN configured-nssai: - sst: 1 - + sd: 1 + # Default Configured NSSAI for this UE default-nssai: - sst: 1 From 709a44bea0b961b130a6753d111395f843393ebb Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 08:55:01 -0600 Subject: [PATCH 035/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index d59224c..7e6c4d4 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -40,7 +40,6 @@ data: # Configured NSSAI for this UE by HPLMN configured-nssai: - sst: 1 - sd: 1 # Default Configured NSSAI for this UE default-nssai: From 0b3e221172e54960fc0931ce61e8f8e0f55168be Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 08:56:24 -0600 Subject: [PATCH 036/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 7e6c4d4..663c265 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -40,10 +40,12 @@ data: # Configured NSSAI for this UE by HPLMN configured-nssai: - sst: 1 + sd: 1 # Default Configured NSSAI for this UE default-nssai: - sst: 1 + sd: 1 # Supported encryption algorithms by this UE integrity: From 1b15a4088c81401ec49721ff53234c9872904bfc Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 08:58:57 -0600 Subject: [PATCH 037/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 663c265..f71fb6b 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -35,6 +35,7 @@ data: apn: 'internet' slice: sst: 1 + sd: 1 emergency: false # Configured NSSAI for this UE by HPLMN From f3936db0005c7cfe133b26f80446370c2ed40da8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 08:59:47 -0600 Subject: [PATCH 038/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index f37a17d..8c41e80 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -19,6 +19,5 @@ data: # List of supported S-NSSAIs by this gNB slices: - sst: 1 - sd: 1 # Indicates whether or not SCTP stream number errors should be ignored. ignoreStreamIds: true From e17091b3e639640731065c6bcc5ac5feeca276df Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 09:00:13 -0600 Subject: [PATCH 039/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index f71fb6b..7e6c4d4 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -35,18 +35,15 @@ data: apn: 'internet' slice: sst: 1 - sd: 1 emergency: false # Configured NSSAI for this UE by HPLMN configured-nssai: - sst: 1 - sd: 1 # Default Configured NSSAI for this UE default-nssai: - sst: 1 - sd: 1 # Supported encryption algorithms by this UE integrity: From 1de40ff90d6c5d23a774af938b416b867d5b9e9b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 13:53:31 -0600 Subject: [PATCH 040/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index b9f1310..aa9e6a9 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -1,3 +1,34 @@ +apiVersion: networking.istio.io/v1alpha3 +kind: Gateway +metadata: + name: open5gsamf-gateway +spec: + selector: + istio: ingressgateway # use Istio default gateway implementation + servers: + - port: + number: 88 + name: http + protocol: HTTP + hosts: + - "*" +--- +apiVersion: networking.istio.io/v1alpha3 +kind: VirtualService +metadata: + name: open5gsamf-ingress +spec: + hosts: + - "*" + gateways: + - open5gswebui-gateway + http: + - route: + - destination: + host: open5gs-amf + port: + number: 80 +--- apiVersion: v1 kind: Service metadata: From 96f5ee0af7e5156faef055102d629724bf8fe74f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 13:54:08 -0600 Subject: [PATCH 041/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index aa9e6a9..cdf8e20 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -27,7 +27,7 @@ spec: - destination: host: open5gs-amf port: - number: 80 + number: 88 --- apiVersion: v1 kind: Service @@ -57,7 +57,7 @@ spec: epc-mode: amf ports: - protocol: TCP - port: 80 + port: 88 targetPort: 80 nodePort: 30080 --- From e7c4e38cbc603d005e523fbf78e68587956321ce Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 14:19:06 -0600 Subject: [PATCH 042/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index cdf8e20..c979d50 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -112,7 +112,7 @@ metadata: name: open5gs-amf-d spec: maxReplicas: 7 - minReplicas: 1 + minReplicas: 2 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From e1d949b73ee13d69b7c4a00ed2de441dd18ab8c3 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 14:19:22 -0600 Subject: [PATCH 043/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index 5f3a2a7..7aba58c 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -52,7 +52,7 @@ metadata: name: open5gs-smf-d spec: maxReplicas: 7 - minReplicas: 1 + minReplicas: 2 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From 3e2588e44f87ec2fa1ae077df158e6739693e53c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 14:19:38 -0600 Subject: [PATCH 044/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 40356fd..388d453 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -66,7 +66,7 @@ metadata: name: open5gs-upf-d spec: maxReplicas: 7 - minReplicas: 1 + minReplicas: 2 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From db03dbd386166c469db26c5fa0689629ccc69a8b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 14:35:45 -0600 Subject: [PATCH 045/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index c979d50..25bbc2f 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -1,34 +1,3 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: Gateway -metadata: - name: open5gsamf-gateway -spec: - selector: - istio: ingressgateway # use Istio default gateway implementation - servers: - - port: - number: 88 - name: http - protocol: HTTP - hosts: - - "*" ---- -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: open5gsamf-ingress -spec: - hosts: - - "*" - gateways: - - open5gswebui-gateway - http: - - route: - - destination: - host: open5gs-amf - port: - number: 88 ---- apiVersion: v1 kind: Service metadata: From e0a9a18edd8ac570cc8812751d3ab1003ae16043 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 16:18:25 -0600 Subject: [PATCH 046/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 25bbc2f..43b63bc 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -81,7 +81,7 @@ metadata: name: open5gs-amf-d spec: maxReplicas: 7 - minReplicas: 2 + minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From 1892b02fe0773b8eb485254a96e8c1243a3f9c66 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 16:36:30 -0600 Subject: [PATCH 047/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index 7aba58c..4807896 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -52,9 +52,9 @@ metadata: name: open5gs-smf-d spec: maxReplicas: 7 - minReplicas: 2 + minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment name: open5gs-smf-d - targetCPUUtilizationPercentage: 60 + targetCPUUtilizationPercentage: 40 From f15c13717c97047fd7137e824bbbd6433141eb6b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 16:36:56 -0600 Subject: [PATCH 048/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 388d453..272b22a 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -66,9 +66,9 @@ metadata: name: open5gs-upf-d spec: maxReplicas: 7 - minReplicas: 2 + minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment name: open5gs-upf-d - targetCPUUtilizationPercentage: 60 + targetCPUUtilizationPercentage: 40 From 615526af14e50a86e70a793096a7aa6958494015 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 16:37:12 -0600 Subject: [PATCH 049/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 43b63bc..0277852 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -86,4 +86,4 @@ spec: apiVersion: apps/v1 kind: Deployment name: open5gs-amf-d - targetCPUUtilizationPercentage: 60 + targetCPUUtilizationPercentage: 40 From 06377c3c8141c0c95251226ec496fd0ece36b9fc Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 16:38:10 -0600 Subject: [PATCH 050/449] Update values.yaml --- 5gran/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index dc5d0c3..e52275c 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -5,7 +5,7 @@ ran: pullPolicy: IfNotPresent tag: "v1.5" amf: - address: 52.72.129.204 + address: 10.0.145.35 port: 30412 user: imsi: "imsi-208930000000001" From 1b63a601d99c1227956b48340d852b40c5927867 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 16:44:01 -0600 Subject: [PATCH 051/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index 8c41e80..f37a17d 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -19,5 +19,6 @@ data: # List of supported S-NSSAIs by this gNB slices: - sst: 1 + sd: 1 # Indicates whether or not SCTP stream number errors should be ignored. ignoreStreamIds: true From 6b00628ef456ddd9b923eb85c154beaa3e087573 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 16:44:56 -0600 Subject: [PATCH 052/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 7e6c4d4..663c265 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -40,10 +40,12 @@ data: # Configured NSSAI for this UE by HPLMN configured-nssai: - sst: 1 + sd: 1 # Default Configured NSSAI for this UE default-nssai: - sst: 1 + sd: 1 # Supported encryption algorithms by this UE integrity: From ec3066be3e95022b896fd6ba741d3bf1de45d38b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 16:57:51 -0600 Subject: [PATCH 053/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index f37a17d..8c41e80 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -19,6 +19,5 @@ data: # List of supported S-NSSAIs by this gNB slices: - sst: 1 - sd: 1 # Indicates whether or not SCTP stream number errors should be ignored. ignoreStreamIds: true From f487f1ccf6975fb724fc52b1189ad8148344b980 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 16:58:08 -0600 Subject: [PATCH 054/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 663c265..7e6c4d4 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -40,12 +40,10 @@ data: # Configured NSSAI for this UE by HPLMN configured-nssai: - sst: 1 - sd: 1 # Default Configured NSSAI for this UE default-nssai: - sst: 1 - sd: 1 # Supported encryption algorithms by this UE integrity: From 357c5c318795a692ac5be2092b9068cc7d8e1db1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 18:19:01 -0600 Subject: [PATCH 055/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 272b22a..fc5e5b9 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -45,7 +45,7 @@ spec: ip link set ogstun up; sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; - open5gs-upfd -c /open5gs/config-map/upf.yaml; + open5gs-upfd -d -c /open5gs/config-map/upf.yaml; volumeMounts: - name: open5gs-upf-config mountPath: /open5gs/config-map/upf.yaml From e59c29ea99031810bfe134586a49c017c52cee5e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 19:29:50 -0600 Subject: [PATCH 056/449] Update amf-configmap.yaml --- 5gcore/templates/amf-configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/amf-configmap.yaml b/5gcore/templates/amf-configmap.yaml index 8cd7bd1..bbf36df 100644 --- a/5gcore/templates/amf-configmap.yaml +++ b/5gcore/templates/amf-configmap.yaml @@ -30,6 +30,7 @@ data: mnc: {{ .Values.amf.mnc }} s_nssai: - sst: 1 + sd: 1 security: integrity_order : [ NIA2, NIA1, NIA0 ] ciphering_order : [ NEA0, NEA1, NEA2 ] From 6ff97619cb65b802597d0a30df3e9a53d3e71b68 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 19:30:31 -0600 Subject: [PATCH 057/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 0277852..bef61e1 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -86,4 +86,4 @@ spec: apiVersion: apps/v1 kind: Deployment name: open5gs-amf-d - targetCPUUtilizationPercentage: 40 + targetCPUUtilizationPercentage: 70 From 336423ef5c78934f300522b5b8934a3ba3e983f4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 19:31:41 -0600 Subject: [PATCH 058/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index bef61e1..2b0c310 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -65,7 +65,7 @@ spec: - name: amf image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-amfd", "-d", "-c", "/open5gs/config-map/amf.yaml"] + command: ["open5gs-amfd", "-c", "/open5gs/config-map/amf.yaml"] volumeMounts: - name: open5gs-amf-config mountPath: /open5gs/config-map/amf.yaml From fff611af1c2270b30b56ec532670e52e6605bfcf Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 19:32:58 -0600 Subject: [PATCH 059/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index 4807896..3dfc05d 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -36,7 +36,7 @@ spec: imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} command: ["/bin/sh", "-c"] args: - - open5gs-smfd -d -c /open5gs/config-map/smf.yaml; + - open5gs-smfd -c /open5gs/config-map/smf.yaml; volumeMounts: - name: open5gs-smf-config mountPath: /open5gs/config-map/smf.yaml @@ -57,4 +57,4 @@ spec: apiVersion: apps/v1 kind: Deployment name: open5gs-smf-d - targetCPUUtilizationPercentage: 40 + targetCPUUtilizationPercentage: 70 From 234d7773f40cd34758afb7235966bc9acf4ef3f2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 19:39:44 -0600 Subject: [PATCH 060/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index 8c41e80..f37a17d 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -19,5 +19,6 @@ data: # List of supported S-NSSAIs by this gNB slices: - sst: 1 + sd: 1 # Indicates whether or not SCTP stream number errors should be ignored. ignoreStreamIds: true From 31e163e6254d9bb7727ff80d96430cd0130ccabf Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 19:40:17 -0600 Subject: [PATCH 061/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 7e6c4d4..213a742 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -37,14 +37,14 @@ data: sst: 1 emergency: false - # Configured NSSAI for this UE by HPLMN + # Configured NSSAI for this UE by HPLMN configured-nssai: - sst: 1 - + sd: 1 # Default Configured NSSAI for this UE default-nssai: - sst: 1 - + sd: 1 # Supported encryption algorithms by this UE integrity: IA1: true From 91d0599318778c4fd589319e795622a4f28ccc47 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 22:54:27 -0600 Subject: [PATCH 062/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index fc5e5b9..40356fd 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -45,7 +45,7 @@ spec: ip link set ogstun up; sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; - open5gs-upfd -d -c /open5gs/config-map/upf.yaml; + open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: - name: open5gs-upf-config mountPath: /open5gs/config-map/upf.yaml @@ -71,4 +71,4 @@ spec: apiVersion: apps/v1 kind: Deployment name: open5gs-upf-d - targetCPUUtilizationPercentage: 40 + targetCPUUtilizationPercentage: 60 From 9788caa4444761d38a39af31cb98affe8a29a3c2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 22:55:12 -0600 Subject: [PATCH 063/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index 3dfc05d..615f6de 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -57,4 +57,4 @@ spec: apiVersion: apps/v1 kind: Deployment name: open5gs-smf-d - targetCPUUtilizationPercentage: 70 + targetCPUUtilizationPercentage: 60 From 255d76cbb0fcf17bf4dcb6704233de73506b5d57 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 22:56:01 -0600 Subject: [PATCH 064/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 2b0c310..43b63bc 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -65,7 +65,7 @@ spec: - name: amf image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-amfd", "-c", "/open5gs/config-map/amf.yaml"] + command: ["open5gs-amfd", "-d", "-c", "/open5gs/config-map/amf.yaml"] volumeMounts: - name: open5gs-amf-config mountPath: /open5gs/config-map/amf.yaml @@ -86,4 +86,4 @@ spec: apiVersion: apps/v1 kind: Deployment name: open5gs-amf-d - targetCPUUtilizationPercentage: 70 + targetCPUUtilizationPercentage: 60 From cd4ca6b8ba7d76d8356ed1347285495b7af71e87 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 22:56:33 -0600 Subject: [PATCH 065/449] Update amf-configmap.yaml --- 5gcore/templates/amf-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/amf-configmap.yaml b/5gcore/templates/amf-configmap.yaml index bbf36df..8cd7bd1 100644 --- a/5gcore/templates/amf-configmap.yaml +++ b/5gcore/templates/amf-configmap.yaml @@ -30,7 +30,6 @@ data: mnc: {{ .Values.amf.mnc }} s_nssai: - sst: 1 - sd: 1 security: integrity_order : [ NIA2, NIA1, NIA0 ] ciphering_order : [ NEA0, NEA1, NEA2 ] From 70362e290234e1496b6c63307be0a00775e6195a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 22:57:21 -0600 Subject: [PATCH 066/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index f37a17d..8c41e80 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -19,6 +19,5 @@ data: # List of supported S-NSSAIs by this gNB slices: - sst: 1 - sd: 1 # Indicates whether or not SCTP stream number errors should be ignored. ignoreStreamIds: true From 1c75d6db75b89841c827f3bdc6e3860a4f0b12b5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 22:57:42 -0600 Subject: [PATCH 067/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 213a742..635ae27 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -40,11 +40,11 @@ data: # Configured NSSAI for this UE by HPLMN configured-nssai: - sst: 1 - sd: 1 + # Default Configured NSSAI for this UE default-nssai: - sst: 1 - sd: 1 + # Supported encryption algorithms by this UE integrity: IA1: true From dec4ffcd37e39aeba5b8714ed39595af7390192f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 23:03:51 -0600 Subject: [PATCH 068/449] Delete resource-limits.yaml --- 5gcore/templates/resource-limits.yaml | 37 --------------------------- 1 file changed, 37 deletions(-) delete mode 100644 5gcore/templates/resource-limits.yaml diff --git a/5gcore/templates/resource-limits.yaml b/5gcore/templates/resource-limits.yaml deleted file mode 100644 index d1f945d..0000000 --- a/5gcore/templates/resource-limits.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: "v1" -kind: "LimitRange" -metadata: - name: "resource-limits-pod" -spec: - limits: - - type: "Pod" - max: - cpu: "600" - memory: "2Gi" - min: - cpu: "10m" - memory: "4Mi" - maxLimitRequestRatio: - cpu: "100" ---- -apiVersion: "v1" -kind: "LimitRange" -metadata: - name: "resource-limits-container" -spec: - limits: - - type: "Container" - max: - cpu: "300" - memory: "1Gi" - min: - cpu: "5m" - memory: "4Mi" - default: - cpu: "100m" - memory: "100Mi" - defaultRequest: - cpu: "100m" - memory: "100Mi" - maxLimitRequestRatio: - cpu: "300" From 8b8a5ae337857e41fbe98f3337f971ad24dc1de8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 23:13:20 -0600 Subject: [PATCH 069/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 43b63bc..d186673 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -26,7 +26,7 @@ spec: epc-mode: amf ports: - protocol: TCP - port: 88 + port: 80 targetPort: 80 nodePort: 30080 --- @@ -50,13 +50,14 @@ metadata: labels: epc-mode: amf spec: - #replicas: 1 + replicas: 1 selector: matchLabels: epc-mode: amf template: metadata: annotations: + k8s.v1.cni.cncf.io/networks: '[{"name": "macvlan-multus", "ips": [ "192.168.100.201/24"]}]' sidecar.istio.io/inject: "true" labels: epc-mode: amf From 216b8cc0f6178b9d1af0f120cad11234c8d850fa Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 23:18:15 -0600 Subject: [PATCH 070/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index 615f6de..f2c5689 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -19,7 +19,7 @@ metadata: labels: epc-mode: smf spec: - #replicas: 1 + replicas: 1 selector: matchLabels: epc-mode: smf @@ -44,7 +44,7 @@ spec: volumes: - name: open5gs-smf-config configMap: - name: open5gs-smf-config + name: open5gs-smf-config --- apiVersion: autoscaling/v1 kind: HorizontalPodAutoscaler From 4f6498b778aa088944d28a066b4189d50544d59c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 23:18:58 -0600 Subject: [PATCH 071/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index f2c5689..5999201 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -19,7 +19,6 @@ metadata: labels: epc-mode: smf spec: - replicas: 1 selector: matchLabels: epc-mode: smf From 559f6cc84c648571c39d6e71582549bead417bcb Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 23:19:17 -0600 Subject: [PATCH 072/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index d186673..cce427c 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -50,7 +50,6 @@ metadata: labels: epc-mode: amf spec: - replicas: 1 selector: matchLabels: epc-mode: amf From 7a9af780a438e49643b2e030b4e68c8d4613aebf Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 23:25:51 -0600 Subject: [PATCH 073/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index cce427c..a470dbe 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -56,7 +56,6 @@ spec: template: metadata: annotations: - k8s.v1.cni.cncf.io/networks: '[{"name": "macvlan-multus", "ips": [ "192.168.100.201/24"]}]' sidecar.istio.io/inject: "true" labels: epc-mode: amf From 42dcd073715f2e11bd6e3a2432907a26b4e4f0f9 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 3 Feb 2022 23:43:03 -0600 Subject: [PATCH 074/449] Create resource-limits.yaml --- 5gcore/templates/resource-limits.yaml | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 5gcore/templates/resource-limits.yaml diff --git a/5gcore/templates/resource-limits.yaml b/5gcore/templates/resource-limits.yaml new file mode 100644 index 0000000..d1f945d --- /dev/null +++ b/5gcore/templates/resource-limits.yaml @@ -0,0 +1,37 @@ +apiVersion: "v1" +kind: "LimitRange" +metadata: + name: "resource-limits-pod" +spec: + limits: + - type: "Pod" + max: + cpu: "600" + memory: "2Gi" + min: + cpu: "10m" + memory: "4Mi" + maxLimitRequestRatio: + cpu: "100" +--- +apiVersion: "v1" +kind: "LimitRange" +metadata: + name: "resource-limits-container" +spec: + limits: + - type: "Container" + max: + cpu: "300" + memory: "1Gi" + min: + cpu: "5m" + memory: "4Mi" + default: + cpu: "100m" + memory: "100Mi" + defaultRequest: + cpu: "100m" + memory: "100Mi" + maxLimitRequestRatio: + cpu: "300" From 1bb2ee3486a2ed45928eee1fb10a25c80baca9f9 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 08:05:15 -0600 Subject: [PATCH 075/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index a470dbe..5b70bd7 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -80,7 +80,7 @@ metadata: name: open5gs-amf-d spec: maxReplicas: 7 - minReplicas: 1 + minReplicas: 2 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From fe53174cb825b8d8489867703d5e2c9aea28edee Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 08:51:28 -0600 Subject: [PATCH 076/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 5b70bd7..49c3dfa 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -79,8 +79,8 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 7 - minReplicas: 2 + maxReplicas: 1 + minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From 652ee2602e6c8d45bb1d25a87246e6f4286d7762 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 08:53:35 -0600 Subject: [PATCH 077/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 49c3dfa..a470dbe 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -79,7 +79,7 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 1 + maxReplicas: 7 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 From 7f5ed87d54d49f8832549d3c85c25af16fd006c8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 08:58:53 -0600 Subject: [PATCH 078/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index a470dbe..6785ada 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -69,6 +69,8 @@ spec: - name: open5gs-amf-config mountPath: /open5gs/config-map/amf.yaml subPath: "amf.yaml" + nodeSelector: + amfnode: true volumes: - name: open5gs-amf-config configMap: From a322f4a34ed09fcd7a3a4d8a0d9a18ae84c048ce Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 08:59:26 -0600 Subject: [PATCH 079/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 6785ada..1630fa7 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -82,7 +82,7 @@ metadata: name: open5gs-amf-d spec: maxReplicas: 7 - minReplicas: 1 + minReplicas: 2 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From 06abe51116f745f8c69c97b8412d635de03c9712 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:06:36 -0600 Subject: [PATCH 080/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 1630fa7..5ff5aee 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -70,7 +70,7 @@ spec: mountPath: /open5gs/config-map/amf.yaml subPath: "amf.yaml" nodeSelector: - amfnode: true + amfnode: emblasoft volumes: - name: open5gs-amf-config configMap: From 78af56ac70088b4c01498709fad52c0b3a4fc0e7 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:19:20 -0600 Subject: [PATCH 081/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index 5999201..8b60957 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -51,7 +51,7 @@ metadata: name: open5gs-smf-d spec: maxReplicas: 7 - minReplicas: 1 + minReplicas: 2 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From aa08324d45ae696455796a741dba0cf583a4a0ea Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:26:09 -0600 Subject: [PATCH 082/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 5ff5aee..34eeec5 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -81,8 +81,8 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 7 - minReplicas: 2 + maxReplicas: 1 + minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From 722d4982cdcbb962d20c70e9546f7a51fa5d0c59 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:26:31 -0600 Subject: [PATCH 083/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index 8b60957..42be5dd 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -50,8 +50,8 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-smf-d spec: - maxReplicas: 7 - minReplicas: 2 + maxReplicas: 1 + minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From aa5e8fea1e38df0f23ee117f7f123bee96a033e2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:35:18 -0600 Subject: [PATCH 084/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 34eeec5..1d8f84e 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -56,6 +56,7 @@ spec: template: metadata: annotations: + cluster-autoscaler.kubernetes.io/safe-to-evict: "false" sidecar.istio.io/inject: "true" labels: epc-mode: amf From ad10ab90a2679c342f9505cb8b7ef92704fc280e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:40:26 -0600 Subject: [PATCH 085/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 1d8f84e..c58de9e 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -82,7 +82,7 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 1 + maxReplicas: 7 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 From c6546180f3226489ae1200fc3486d5ce6410ed8d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:47:04 -0600 Subject: [PATCH 086/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index c58de9e..1d8f84e 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -82,7 +82,7 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 7 + maxReplicas: 1 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 From d11a4fcaa8e96e438692f643b4f2a9c4b0de139a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:48:40 -0600 Subject: [PATCH 087/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 1d8f84e..c58de9e 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -82,7 +82,7 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 1 + maxReplicas: 7 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 From bdcda56e383409d491eae038d747675d7e4f15ca Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:50:17 -0600 Subject: [PATCH 088/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index c58de9e..1d8f84e 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -82,7 +82,7 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 7 + maxReplicas: 1 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 From fe524378770ea4291814b0916aaaa58ad01392d1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:51:21 -0600 Subject: [PATCH 089/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 1d8f84e..c761906 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -82,10 +82,10 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 1 + maxReplicas: 7 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment name: open5gs-amf-d - targetCPUUtilizationPercentage: 60 + targetCPUUtilizationPercentage: 65 From b0a602b55e107296e545f40ac61e23210cd61029 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:53:55 -0600 Subject: [PATCH 090/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index c761906..d81ab4a 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -82,10 +82,10 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 7 + maxReplicas: 1 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment name: open5gs-amf-d - targetCPUUtilizationPercentage: 65 + targetCPUUtilizationPercentage: 70 From e836d9d31c3abadcdedf45020ef5ff915d6a4bd6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:55:16 -0600 Subject: [PATCH 091/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index d81ab4a..180ac51 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -82,7 +82,7 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 1 + maxReplicas: 5 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 From daf2038a0a26d2f1f80bdb4543b9123a6a3c85b2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 09:58:43 -0600 Subject: [PATCH 092/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 180ac51..1d8f84e 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -82,10 +82,10 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 5 + maxReplicas: 1 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment name: open5gs-amf-d - targetCPUUtilizationPercentage: 70 + targetCPUUtilizationPercentage: 60 From 236e94306ac90ab5b68f94f9b3adc4c29c8a1978 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 10:03:04 -0600 Subject: [PATCH 093/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 1d8f84e..c58de9e 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -82,7 +82,7 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 1 + maxReplicas: 7 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 From a291a83e84698bdb725ad2bbeaed72ad96b53fa4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 15:10:17 -0600 Subject: [PATCH 094/449] Create k8s-deployment-stress.yaml --- k8s-deployment-stress.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 k8s-deployment-stress.yaml diff --git a/k8s-deployment-stress.yaml b/k8s-deployment-stress.yaml new file mode 100644 index 0000000..dddc13a --- /dev/null +++ b/k8s-deployment-stress.yaml @@ -0,0 +1,26 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: stress-test + namespace: stress-test +spec: + replicas: 10 + selector: + matchLabels: + app: stress-test + template: + metadata: + labels: + app: stress-test + spec: + containers: + - name: stress-test + image: progrium/stress + command: ["/usr/bin/stress", + "--verbose", + "-c", + "2", + "--vm", + "2", + "--vm-bytes", + "512M"] From 79bdc68949d3c41020340ce1a408aa97e0ce3853 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 4 Feb 2022 15:22:06 -0600 Subject: [PATCH 095/449] Update k8s-deployment-stress.yaml --- k8s-deployment-stress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s-deployment-stress.yaml b/k8s-deployment-stress.yaml index dddc13a..6264d04 100644 --- a/k8s-deployment-stress.yaml +++ b/k8s-deployment-stress.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: stress-test - image: progrium/stress + image: efatnar/stress-test command: ["/usr/bin/stress", "--verbose", "-c", From 80a53cc2a3df491bf8ea70a4eb6b871216396a06 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Tue, 8 Feb 2022 10:31:08 -0600 Subject: [PATCH 096/449] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index aefcd7f..db8eb06 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ # RELEASE CUT: Release-1.0 +This Release includes Open5g deployment on OCP with RH-OSSM with leveraging HPA for CNFs.
+This Release does not include Multus! Multus is part of the Main branch for development and verification. Once that effort reaches stability we will have Release 2.0 cut.
# 5G Core with RAN + UE simulator deployment on Red Hat Openshift with Service Mesh
From f4c82038e3713e90f02a3d453f47aa182df00ea8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Tue, 8 Feb 2022 10:31:21 -0600 Subject: [PATCH 097/449] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index db8eb06..42fc935 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # RELEASE CUT: Release-1.0 -This Release includes Open5g deployment on OCP with RH-OSSM with leveraging HPA for CNFs.
-This Release does not include Multus! Multus is part of the Main branch for development and verification. Once that effort reaches stability we will have Release 2.0 cut.
+>> This Release includes Open5g deployment on OCP with RH-OSSM with leveraging HPA for CNFs.
+>> This Release does not include Multus! Multus is part of the Main branch for development and verification. Once that effort reaches stability we will have Release 2.0 cut.
# 5G Core with RAN + UE simulator deployment on Red Hat Openshift with Service Mesh
From 6712fc21ddb447e7ae4806806624ff4988111038 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 12:13:36 -0600 Subject: [PATCH 098/449] Update enablesctp.yaml --- enablesctp.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enablesctp.yaml b/enablesctp.yaml index ddca52e..2a63346 100644 --- a/enablesctp.yaml +++ b/enablesctp.yaml @@ -8,7 +8,7 @@ metadata: spec: config: ignition: - version: 3.1.0 + version: 3.2.0 storage: files: - contents: From e4be86afe8fac9c26503e6c8dd8a6fc7fdb6fe53 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 12:14:40 -0600 Subject: [PATCH 099/449] Create enablesctp-new.yaml --- enablesctp-new.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 enablesctp-new.yaml diff --git a/enablesctp-new.yaml b/enablesctp-new.yaml new file mode 100644 index 0000000..f718e4d --- /dev/null +++ b/enablesctp-new.yaml @@ -0,0 +1,22 @@ +apiVersion: machineconfiguration.openshift.io/v1 +kind: MachineConfig +metadata: + name: load-sctp-module + labels: + machineconfiguration.openshift.io/role: worker +spec: + config: + ignition: + version: 3.2.0 + storage: + files: + - path: /etc/modprobe.d/sctp-blacklist.conf + mode: 0644 + overwrite: true + contents: + source: data:, + - path: /etc/modules-load.d/sctp-load.conf + mode: 0644 + overwrite: true + contents: + source: data:,sctp From 6dda99cc51e9d26d390296181aa159fb683f10b8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 12:15:08 -0600 Subject: [PATCH 100/449] Update enablesctp-new.yaml --- enablesctp-new.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/enablesctp-new.yaml b/enablesctp-new.yaml index f718e4d..b84f310 100644 --- a/enablesctp-new.yaml +++ b/enablesctp-new.yaml @@ -1,3 +1,4 @@ +# Ref: https://docs.openshift.com/container-platform/4.9/networking/using-sctp.html apiVersion: machineconfiguration.openshift.io/v1 kind: MachineConfig metadata: From b32803d7fd2bac9e0e4749a02863227f5993578e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 12:23:27 -0600 Subject: [PATCH 101/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index c58de9e..f10baf2 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -10,7 +10,7 @@ spec: epc-mode: amf ports: - protocol: SCTP - port: 38412 + port: 30412 targetPort: 38412 nodePort: 30412 --- From a730307e059151556c8158db792c0c7b1e66d66d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 12:25:52 -0600 Subject: [PATCH 102/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index f10baf2..c58de9e 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -10,7 +10,7 @@ spec: epc-mode: amf ports: - protocol: SCTP - port: 30412 + port: 38412 targetPort: 38412 nodePort: 30412 --- From e4d06ef798a329c04c51de6fd1745a193e586e96 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 14:46:15 -0600 Subject: [PATCH 103/449] Update values.yaml --- 5gcore/values.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index bdc3521..cc4f127 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -20,4 +20,8 @@ amf: tac: 7 k8s: - interface: eth0 + interface: eth0 + +cnf: + amf: + nodeport: 30412 From e84c2a8842c3e9593fb858b4ca4e8fa7f065c679 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 14:47:44 -0600 Subject: [PATCH 104/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index c58de9e..98bc1b6 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -10,9 +10,9 @@ spec: epc-mode: amf ports: - protocol: SCTP - port: 38412 + port: {{ .Values.cnf.amf.port }} targetPort: 38412 - nodePort: 30412 + nodePort: {{ .Values.cnf.amf.nodeport }} --- apiVersion: v1 kind: Service From 232686b08df649eea0f1aecf1f9aa4e62ef5d460 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 14:48:05 -0600 Subject: [PATCH 105/449] Update values.yaml --- 5gcore/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index cc4f127..6f026b1 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -25,3 +25,4 @@ k8s: cnf: amf: nodeport: 30412 + port: 30412 From de0bf10b4b3918c1e6c0ecfa5b8df9f56c2ccedd Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 15:05:21 -0600 Subject: [PATCH 106/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 98bc1b6..a121996 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -56,7 +56,7 @@ spec: template: metadata: annotations: - cluster-autoscaler.kubernetes.io/safe-to-evict: "false" + #cluster-autoscaler.kubernetes.io/safe-to-evict: "false" sidecar.istio.io/inject: "true" labels: epc-mode: amf From 5fe040b6c9e62ff5468202ffa1e893ecc6f5b17f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 15:16:57 -0600 Subject: [PATCH 107/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index a121996..98bc1b6 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -56,7 +56,7 @@ spec: template: metadata: annotations: - #cluster-autoscaler.kubernetes.io/safe-to-evict: "false" + cluster-autoscaler.kubernetes.io/safe-to-evict: "false" sidecar.istio.io/inject: "true" labels: epc-mode: amf From eea7f5bb6cfe6216712d523d297e62164e026953 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 15:22:15 -0600 Subject: [PATCH 108/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 98bc1b6..f10baf2 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -10,9 +10,9 @@ spec: epc-mode: amf ports: - protocol: SCTP - port: {{ .Values.cnf.amf.port }} + port: 30412 targetPort: 38412 - nodePort: {{ .Values.cnf.amf.nodeport }} + nodePort: 30412 --- apiVersion: v1 kind: Service From 69a168413f3b1c1a5a6addaa900868dbcf504586 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 15:27:40 -0600 Subject: [PATCH 109/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index f10baf2..ebc8a45 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -10,9 +10,9 @@ spec: epc-mode: amf ports: - protocol: SCTP - port: 30412 + port: {{ .Values.cnf.amf.port }} targetPort: 38412 - nodePort: 30412 + nodePort: {{ .Values.cnf.amf.nodeport }} --- apiVersion: v1 kind: Service @@ -56,7 +56,6 @@ spec: template: metadata: annotations: - cluster-autoscaler.kubernetes.io/safe-to-evict: "false" sidecar.istio.io/inject: "true" labels: epc-mode: amf From 73332a6d3efaa2847513704e23e0fafa530d5aff Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 15:31:52 -0600 Subject: [PATCH 110/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index ebc8a45..28af668 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -56,6 +56,7 @@ spec: template: metadata: annotations: + cluster-autoscaler.kubernetes.io/safe-to-evict: "false" sidecar.istio.io/inject: "true" labels: epc-mode: amf @@ -69,8 +70,6 @@ spec: - name: open5gs-amf-config mountPath: /open5gs/config-map/amf.yaml subPath: "amf.yaml" - nodeSelector: - amfnode: emblasoft volumes: - name: open5gs-amf-config configMap: From 84dbdffc6b59e9cf5ef700b902685b5d0eb2aa44 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 15:46:43 -0600 Subject: [PATCH 111/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 28af668..594c26f 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -10,9 +10,9 @@ spec: epc-mode: amf ports: - protocol: SCTP - port: {{ .Values.cnf.amf.port }} + port: {{ .Values.cnf.amf.sctp.port }} targetPort: 38412 - nodePort: {{ .Values.cnf.amf.nodeport }} + nodePort: {{ .Values.cnf.amf.sctp.nodeport }} --- apiVersion: v1 kind: Service From f6da944c9374f09b427485401cfa12c501fb5fa2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 15:47:03 -0600 Subject: [PATCH 112/449] Update values.yaml --- 5gcore/values.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index 6f026b1..bdc3c50 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -24,5 +24,6 @@ k8s: cnf: amf: - nodeport: 30412 - port: 30412 + sctp: + nodeport: 30412 + port: 30412 From e237babc607a55ebcb8e02c43baadf260bbd7db1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 15:47:35 -0600 Subject: [PATCH 113/449] Update values.yaml --- 5gcore/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index bdc3c50..7bb26b8 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -27,3 +27,6 @@ cnf: sctp: nodeport: 30412 port: 30412 + http: + nodeport: 31412 + port: 31412 From 9163029e28a8fd9e6d9f1e26e38ea3cc4603f6e6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 15:48:36 -0600 Subject: [PATCH 114/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 594c26f..f0b250e 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -26,9 +26,9 @@ spec: epc-mode: amf ports: - protocol: TCP - port: 80 + port: {{ .Values.cnf.amf.http.port }} targetPort: 80 - nodePort: 30080 + nodePort: {{ .Values.cnf.amf.http.nodeport }} --- kind: NetworkPolicy apiVersion: networking.k8s.io/v1 From 4e5f1e5d482299a6e32155d4a0d8a3c67f7e2220 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 9 Feb 2022 15:48:53 -0600 Subject: [PATCH 115/449] Update values.yaml --- 5gcore/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index 7bb26b8..eed8582 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -28,5 +28,5 @@ cnf: nodeport: 30412 port: 30412 http: - nodeport: 31412 - port: 31412 + nodeport: 30080 + port: 80 From 34da3f10198f33a1a21a0ee7bbb3d6b3772873dd Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 08:13:52 -0600 Subject: [PATCH 116/449] Delete enablesctp.yaml --- enablesctp.yaml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 enablesctp.yaml diff --git a/enablesctp.yaml b/enablesctp.yaml deleted file mode 100644 index 2a63346..0000000 --- a/enablesctp.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: machineconfiguration.openshift.io/v1 -kind: MachineConfig -metadata: - labels: - # for 3 node cluster change role to ; master - machineconfiguration.openshift.io/role: worker - name: sctpmodule -spec: - config: - ignition: - version: 3.2.0 - storage: - files: - - contents: - source: data:, - mode: 420 - overwrite: true - path: /etc/modprobe.d/sctp-blacklist.conf - - contents: - source: data:text/plain;charset=utf-8,sctp - mode: 420 - overwrite: true - path: /etc/modules-load.d/sctp-load.conf From 464755567a0471bfb675cbb9ab3f9d1109fe0249 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 08:14:04 -0600 Subject: [PATCH 117/449] Rename enablesctp-new.yaml to enablesctp.yaml --- enablesctp-new.yaml => enablesctp.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename enablesctp-new.yaml => enablesctp.yaml (100%) diff --git a/enablesctp-new.yaml b/enablesctp.yaml similarity index 100% rename from enablesctp-new.yaml rename to enablesctp.yaml From 9058a7a15ef6f2531c46ab43be4d04aa08476e0b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 08:21:50 -0600 Subject: [PATCH 118/449] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 42fc935..dd84a5c 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,11 @@ oc get nodes ![alt text](https://raw.githubusercontent.com/fenar/cnvopen5gcore/main/pics/Open5GCoreServiceMesh2.png)
---- -(2) Provision user equipment (UE) imsi (see ueransim/ueransim-ue-configmap.yaml, defaul imsi is 208930000000001) to 5gcore so your ue registration (ie running ueransim ue mode) will be allowed. +(2) Provision user equipment (UE) imsi (see ueransim/ueransim-ue-configmap.yaml, defaul imsi is 208930000000001) to 5gcore so your ue registration (ie running ueransim ue mode) will be allowed.
+``` +username: admin +password: 1423 +``` ![alt text](https://raw.githubusercontent.com/fenar/cnvopen5gcore/main/pics/Open5GSWebUI.png)
---- From 18584f906786ee2c2db9321db964a6157581adb1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 08:37:57 -0600 Subject: [PATCH 119/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index f0b250e..e5e2bc8 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -30,19 +30,6 @@ spec: targetPort: 80 nodePort: {{ .Values.cnf.amf.http.nodeport }} --- -kind: NetworkPolicy -apiVersion: networking.k8s.io/v1 -metadata: - name: allow-sctp-on-http -spec: - podSelector: - matchLabels: - epc-mode: amf - ingress: - - ports: - - protocol: SCTP - port: 80 ---- apiVersion: apps/v1 kind: Deployment metadata: From d13d6ac7b8bdde6d4e135d36c41caa71690fe2c5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 10:30:40 -0600 Subject: [PATCH 120/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index e5e2bc8..e1922de 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -30,6 +30,19 @@ spec: targetPort: 80 nodePort: {{ .Values.cnf.amf.http.nodeport }} --- +kind: NetworkPolicy +apiVersion: networking.k8s.io/v1 +metadata: + name: allow-sctp +spec: + podSelector: + matchLabels: + epc-mode: amf + ingress: + - ports: + - protocol: SCTP + port: {{ .Values.cnf.amf.sctp.port }} +--- apiVersion: apps/v1 kind: Deployment metadata: From 441db396a55081059075e687446007a18ff6a4a7 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 11:09:34 -0600 Subject: [PATCH 121/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index e1922de..b1d46b3 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -35,9 +35,6 @@ apiVersion: networking.k8s.io/v1 metadata: name: allow-sctp spec: - podSelector: - matchLabels: - epc-mode: amf ingress: - ports: - protocol: SCTP @@ -65,7 +62,7 @@ spec: - name: amf image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-amfd", "-d", "-c", "/open5gs/config-map/amf.yaml"] + command: ["open5gs-amfd", "-c", "/open5gs/config-map/amf.yaml"] volumeMounts: - name: open5gs-amf-config mountPath: /open5gs/config-map/amf.yaml @@ -80,7 +77,7 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 7 + maxReplicas: 5 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 From 2892366c7d5e2ea2629b5f85bf972c510d15e872 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 11:33:03 -0600 Subject: [PATCH 122/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index b1d46b3..8858309 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -39,6 +39,16 @@ spec: - ports: - protocol: SCTP port: {{ .Values.cnf.amf.sctp.port }} +--- +kind: NetworkPolicy +apiVersion: networking.k8s.io/v1 +metadata: + name: allow-sctp-http +spec: + ingress: + - ports: + - protocol: SCTP + port: 80 --- apiVersion: apps/v1 kind: Deployment From 50f35c892e681514aa50ed30dc35206e211e349f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 11:39:10 -0600 Subject: [PATCH 123/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 8858309..ae3ce7e 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -43,8 +43,11 @@ spec: kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: allow-sctp-http + name: allow-sctp-on-http spec: + podSelector: + matchLabels: + epc-mode: amf ingress: - ports: - protocol: SCTP From fd49844f6dd4bdc499a59ef21f0594e3b78d97a9 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 11:41:37 -0600 Subject: [PATCH 124/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index ae3ce7e..1c98655 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -35,6 +35,9 @@ apiVersion: networking.k8s.io/v1 metadata: name: allow-sctp spec: + podSelector: + matchLabels: + epc-mode: amf ingress: - ports: - protocol: SCTP From ff07cd8f5963ce2e60ee5c6a2737edc22b69434e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 11:53:42 -0600 Subject: [PATCH 125/449] Update values.yaml --- 5gcore/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index eed8582..801b89e 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -26,7 +26,7 @@ cnf: amf: sctp: nodeport: 30412 - port: 30412 + port: 38412 http: nodeport: 30080 port: 80 From 558573828d848ba39eec0f8d97fd8e9fa3ede3ed Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 12:22:55 -0600 Subject: [PATCH 126/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 1c98655..af74da3 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -30,19 +30,19 @@ spec: targetPort: 80 nodePort: {{ .Values.cnf.amf.http.nodeport }} --- -kind: NetworkPolicy -apiVersion: networking.k8s.io/v1 -metadata: - name: allow-sctp -spec: - podSelector: - matchLabels: - epc-mode: amf - ingress: - - ports: - - protocol: SCTP - port: {{ .Values.cnf.amf.sctp.port }} ---- +#kind: NetworkPolicy +#apiVersion: networking.k8s.io/v1 +#metadata: +# name: allow-sctp +#spec: +# podSelector: +# matchLabels: +# epc-mode: amf +# ingress: +# - ports: +# - protocol: SCTP +# port: {{ .Values.cnf.amf.sctp.port }} +#--- kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: From 2abdc561cdf7d05708f96f628ab7047888f36b21 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 12:25:10 -0600 Subject: [PATCH 127/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index af74da3..1c98655 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -30,19 +30,19 @@ spec: targetPort: 80 nodePort: {{ .Values.cnf.amf.http.nodeport }} --- -#kind: NetworkPolicy -#apiVersion: networking.k8s.io/v1 -#metadata: -# name: allow-sctp -#spec: -# podSelector: -# matchLabels: -# epc-mode: amf -# ingress: -# - ports: -# - protocol: SCTP -# port: {{ .Values.cnf.amf.sctp.port }} -#--- +kind: NetworkPolicy +apiVersion: networking.k8s.io/v1 +metadata: + name: allow-sctp +spec: + podSelector: + matchLabels: + epc-mode: amf + ingress: + - ports: + - protocol: SCTP + port: {{ .Values.cnf.amf.sctp.port }} +--- kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: From 08daca2061367d7e14aa717565edc2a49c7d7b8d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 12:29:27 -0600 Subject: [PATCH 128/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 1c98655..2f99abf 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -94,7 +94,7 @@ metadata: name: open5gs-amf-d spec: maxReplicas: 5 - minReplicas: 1 + minReplicas: 3 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From 4f47f2dc834dce89b1eb7420eff66f6345c2cf24 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 11 Feb 2022 12:33:36 -0600 Subject: [PATCH 129/449] Update amf-configmap.yaml --- 5gcore/templates/amf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-configmap.yaml b/5gcore/templates/amf-configmap.yaml index 8cd7bd1..027758f 100644 --- a/5gcore/templates/amf-configmap.yaml +++ b/5gcore/templates/amf-configmap.yaml @@ -35,7 +35,7 @@ data: ciphering_order : [ NEA0, NEA1, NEA2 ] network_name: full: Open5GS - amf_name: open5gs-amf0 + amf_name: open5gs-amf nrf: sbi: name: open5gs-nrf From 20a1512d7851236445a61f946b2e5d1189e11b06 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 10:02:39 -0500 Subject: [PATCH 130/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 2f99abf..615bbcb 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -93,8 +93,8 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-amf-d spec: - maxReplicas: 5 - minReplicas: 3 + maxReplicas: 3 + minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment From 99607ea9c0b98e4aa5db40618152bae971c74e54 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 10:03:34 -0500 Subject: [PATCH 131/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 615bbcb..9a38568 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -99,4 +99,4 @@ spec: apiVersion: apps/v1 kind: Deployment name: open5gs-amf-d - targetCPUUtilizationPercentage: 60 + targetCPUUtilizationPercentage: 80 From 183e8300331430dd412ffef1b839a235f632eb71 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 12:24:02 -0500 Subject: [PATCH 132/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 1536725..3ada2b3 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping -I uesimtun0 www.google.com"] volumes: - name: 5gran-gnb-config configMap: From 8b22d1e78df49acf4262b0d0d7fc321413816aa6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 12:26:50 -0500 Subject: [PATCH 133/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 3ada2b3..310c766 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping -I uesimtun0 www.google.com"] + command: ["/bin/sh","-c","sh ping -I uesimtun0 www.google.com"] volumes: - name: 5gran-gnb-config configMap: From 0336178357e256ecf3d098e57402610fc7136c80 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 12:38:09 -0500 Subject: [PATCH 134/449] Update values.yaml --- 5gran/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/5gran/values.yaml b/5gran/values.yaml index e52275c..2501098 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -9,4 +9,6 @@ ran: port: 30412 user: imsi: "imsi-208930000000001" + imei: "356938035643801" + imeiSv: "4370816125816151" tac: 7 From 6e4f9b4bd1fbde69c57dd1b8217690725412f7db Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 12:38:41 -0500 Subject: [PATCH 135/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 635ae27..ab3d625 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -21,9 +21,9 @@ data: # Authentication Management Field (AMF) value amf: '8000' # IMEI number of the device. It is used if no SUPI is provided - imei: '356938035643801' + imei: '{{ .Values.ran.user.imei }}' # IMEISV number of the device. It is used if no SUPI and IMEI is provided - imeiSv: '4370816125816151' + imeiSv: '{{ .Values.ran.user.imeiSv }}' # List of gNB IP addresses for Radio Link Simulation gnbSearchList: From b5789506e2b675efe3a53d87f55dfd74f99492e6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 12:40:24 -0500 Subject: [PATCH 136/449] Update values.yaml --- 5gran/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/5gran/values.yaml b/5gran/values.yaml index 2501098..274a4de 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -11,4 +11,6 @@ ran: imsi: "imsi-208930000000001" imei: "356938035643801" imeiSv: "4370816125816151" + subscriptionKey: "465B5CE8B199B49FAA5F0A2EE238A6BC" + opCode: "E8ED289DEBA952E4283B54E88E6183CA" tac: 7 From 85f693790c459f53e20b178bc055261982758fcd Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 12:40:32 -0500 Subject: [PATCH 137/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index ab3d625..7285bbd 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -13,9 +13,9 @@ data: mnc: '93' # Permanent subscription key - key: '465B5CE8B199B49FAA5F0A2EE238A6BC' + key: '{{ .Values.ran.user.subscriptionKey }}' # Operator code (OP or OPC) of the UE - op: 'E8ED289DEBA952E4283B54E88E6183CA' + op: '{{ .Values.ran.user.opCode }}' # This value specifies the OP type and it can be either 'OP' or 'OPC' opType: 'OPC' # Authentication Management Field (AMF) value From 7862a73b2626affb3a347689a8db4f6d70a6b98c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 12:41:21 -0500 Subject: [PATCH 138/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 310c766..8bbd97f 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh ping -I uesimtun0 www.google.com"] + command: ["/bin/sh","-c","sh ping -I uesimtun0 1.1.1.1"] volumes: - name: 5gran-gnb-config configMap: From 6a819b26363b8e0b0ae39786da3937b93bb98823 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 12:48:29 -0500 Subject: [PATCH 139/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 8bbd97f..0b1dca9 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh ping -I uesimtun0 1.1.1.1"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.213 ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From 20dd6cb16d28cb4301b53fe29f9739b4308dc146 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 12:53:03 -0500 Subject: [PATCH 140/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 0b1dca9..1536725 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.213 ping www.google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From 9f9227df3c8228892ae47299849f16d034467e6a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 12:57:27 -0500 Subject: [PATCH 141/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 1536725..d4cc452 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -30,7 +30,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","./nr-ue -c /open5gs/config-map/5gran-ue-configmap.yaml"] + #command: ["/bin/sh","-c","./nr-ue -c /open5gs/config-map/5gran-ue-configmap.yaml"] volumeMounts: - name: 5gran-ue-config mountPath: /open5gs/config-map/5gran-ue-configmap.yaml From 7dd504a92fa4448359e10ca939541684fb8fdce1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 12:59:02 -0500 Subject: [PATCH 142/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index d4cc452..3be0636 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -30,7 +30,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - #command: ["/bin/sh","-c","./nr-ue -c /open5gs/config-map/5gran-ue-configmap.yaml"] + command: ["/bin/sh","-c","./nr-ue -c /open5gs/config-map/5gran-ue-configmap.yaml"] volumeMounts: - name: 5gran-ue-config mountPath: /open5gs/config-map/5gran-ue-configmap.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] + #command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From 96c00b5770019d87027044cf279de42d91a62030 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 13:06:15 -0500 Subject: [PATCH 143/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 3be0636..1536725 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - #command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From 54ce07c3581735687e7ad3beb79d378abddee7c0 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 15:29:36 -0500 Subject: [PATCH 144/449] Update values.yaml --- 5gran/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index 274a4de..f360726 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -3,7 +3,7 @@ ran: image: repository: docker.io/efatnar/ueransim pullPolicy: IfNotPresent - tag: "v1.5" + tag: "v2.0" amf: address: 10.0.145.35 port: 30412 From f6b744c4b38ea22c9696326f520aa7b76e3cead5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 15:35:10 -0500 Subject: [PATCH 145/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 7285bbd..805721a 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -28,6 +28,20 @@ data: # List of gNB IP addresses for Radio Link Simulation gnbSearchList: - 0.0.0.0 + + # UAC Access Identities Configuration + uacAic: + mps: false + mcs: false + + # UAC Access Control Class + uacAcc: + normalClass: 0 + class11: false + class12: false + class13: false + class14: false + class15: false # Initial PDU sessions to be established sessions: From 64f31c4603be0e1a5beee5ea6ab73a17e92ce879 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 15:59:18 -0500 Subject: [PATCH 146/449] Update 5gcore.dockerfile --- docker/5gcore.dockerfile | 101 ++++++++++++++++++++++++++++++++++----- 1 file changed, 90 insertions(+), 11 deletions(-) diff --git a/docker/5gcore.dockerfile b/docker/5gcore.dockerfile index 34e1204..7c89f1d 100644 --- a/docker/5gcore.dockerfile +++ b/docker/5gcore.dockerfile @@ -1,15 +1,94 @@ -FROM ubuntu:focal +FROM ubuntu:jammy as efatnar_step -MAINTAINER Fatih Nar +ENV DEBIAN_FRONTEND=noninteractive +ENV LD_LIBRARY_PATH=/open5gs/install/lib/x86_64-linux-gnu -ENV DEBIAN_FRONTEND noninteractive +# Install updates and dependencies +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + ninja-build \ + build-essential \ + flex \ + bison \ + git \ + libsctp-dev \ + libgnutls28-dev \ + libgcrypt-dev \ + libssl-dev \ + libidn11-dev \ + libmongoc-dev \ + libbson-dev \ + libyaml-dev \ + meson \ + mongodb \ + curl \ + gnupg \ + ca-certificates \ + libmicrohttpd-dev \ + libcurl4-gnutls-dev \ + libnghttp2-dev \ + libtins-dev \ + libidn11-dev \ + libtalloc-dev + +RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - && apt-get install -y nodejs + +# Get open5gs code and install +RUN git clone --recursive https://github.com/open5gs/open5gs && cd open5gs && \ + git checkout main && meson build --prefix=`pwd`/install && \ + ninja -C build && cd build && ninja install && \ + mkdir -p /open5gs/install/include + +# Building WebUI of open5gs +RUN cd open5gs/webui && npm ci --no-optional + +# Build final image +FROM ubuntu:jammy + +ENV DEBIAN_FRONTEND=noninteractive +ENV LD_LIBRARY_PATH=/open5gs/install/lib/x86_64-linux-gnu RUN apt-get update && \ - apt-get -yq dist-upgrade && \ - apt-get --no-install-recommends -qqy install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev \ - libidn11-dev libmongoc-dev libbson-dev libyaml-dev libmicrohttpd-dev libcurl4-gnutls-dev meson iproute2 libnghttp2-dev \ - iptables iputils-ping tcpdump cmake curl gnupg meson && \ - git clone --recursive -b v2.2.2 https://github.com/open5gs/open5gs && \ - cd open5gs && meson build --prefix=/ && ninja -C build && cd build && ninja install - -WORKDIR / + apt-get install -y --no-install-recommends \ + curl \ + ca-certificates \ + libssl-dev \ + libyaml-dev \ + libmicrohttpd-dev \ + libmongoc-dev \ + libsctp-dev \ + libcurl4-gnutls-dev \ + libtins-dev \ + libidn11-dev \ + libtalloc-dev \ + netbase \ + ifupdown \ + net-tools \ + iputils-ping \ + python3-setuptools \ + python3-wheel \ + python3-pip \ + iptables && \ + apt-get autoremove -y && apt-get autoclean + +RUN pip3 install click + +RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - && apt-get install -y nodejs && \ + apt-get remove -y curl && apt-get autoremove -y && apt-get autoclean + +RUN update-ca-certificates + +COPY --from=efatnar_step /open5gs/install/bin /open5gs/install/bin +COPY --from=efatnar_step /open5gs/install/etc /open5gs/install/etc +COPY --from=efatnar_step /open5gs/install/include /open5gs/install/include +COPY --from=efatnar_step /open5gs/install/lib /open5gs/install/lib +COPY --from=efatnar_step /open5gs/webui /open5gs/webui + +# Set the working directory to open5gs +WORKDIR open5gs + +COPY open5gs_init.sh / +CMD /open5gs_init.sh From 88066ee43445e0eb1f960228e808ecc40f9d239a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 16:01:50 -0500 Subject: [PATCH 147/449] Update ueransim.dockerfile --- docker/ueransim.dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/ueransim.dockerfile b/docker/ueransim.dockerfile index 1e1a6ef..48e24b4 100644 --- a/docker/ueransim.dockerfile +++ b/docker/ueransim.dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal +FROM ubuntu:jammy MAINTAINER Fatih Nar @@ -8,7 +8,7 @@ USER root RUN apt-get update && \ apt-get -yq dist-upgrade && \ - apt-get install iputils-ping dnsutils && \ + apt-get install -y iputils-ping dnsutils && \ apt-get --no-install-recommends -qqy install make g++ libsctp-dev lksctp-tools iproute2 python3-pip && \ mkdir UERANSIM From 1821730e78015363dc62101e050f700ae7ac1383 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 16:06:27 -0500 Subject: [PATCH 148/449] Update values.yaml --- 5gcore/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index 801b89e..a4da62c 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -4,7 +4,7 @@ open5gcore: image: repository: docker.io/efatnar/open5gcore pullPolicy: IfNotPresent - tag: "v1.1" + tag: "v2.0" webui: image: From 942bb59468c945120eb83e0232412c99dcecafd9 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 16:57:51 -0500 Subject: [PATCH 149/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 9a38568..48040fb 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -78,7 +78,7 @@ spec: - name: amf image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-amfd", "-c", "/open5gs/config-map/amf.yaml"] + command: ["/open5gs/install/bin/open5gs-amfd", "-c", "/open5gs/config-map/amf.yaml"] volumeMounts: - name: open5gs-amf-config mountPath: /open5gs/config-map/amf.yaml From 13f2be4747242e604986d38f4d85c33417f0e2e2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 16:59:02 -0500 Subject: [PATCH 150/449] Update ausf-deploy.yaml --- 5gcore/templates/ausf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/ausf-deploy.yaml b/5gcore/templates/ausf-deploy.yaml index 2dc7674..6fbe8db 100644 --- a/5gcore/templates/ausf-deploy.yaml +++ b/5gcore/templates/ausf-deploy.yaml @@ -34,7 +34,7 @@ spec: - name: ausf image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-ausfd", "-c", "/open5gs/config-map/ausf.yaml"] + command: ["/open5gs/install/bin/open5gs-ausfd", "-c", "/open5gs/config-map/ausf.yaml"] volumeMounts: - name: open5gs-ausf-config mountPath: /open5gs/config-map/ausf.yaml From 0ca84036def5df5f4f9e31d72dcbe0e4f4d4236a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 16:59:18 -0500 Subject: [PATCH 151/449] Update nrf-deploy.yaml --- 5gcore/templates/nrf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/nrf-deploy.yaml b/5gcore/templates/nrf-deploy.yaml index 0854ccb..a774cd4 100644 --- a/5gcore/templates/nrf-deploy.yaml +++ b/5gcore/templates/nrf-deploy.yaml @@ -34,7 +34,7 @@ spec: - name: nrf image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-nrfd", "-d", "-c", "/open5gs/config-map/nrf.yaml"] + command: ["/open5gs/install/bin/open5gs-nrfd", "-d", "-c", "/open5gs/config-map/nrf.yaml"] volumeMounts: - name: open5gs-nrf-config mountPath: /open5gs/config-map/nrf.yaml From a1943f50f5d32b8e468ea3264b5872889697ef48 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 16:59:33 -0500 Subject: [PATCH 152/449] Update nssf-deploy.yaml --- 5gcore/templates/nssf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/nssf-deploy.yaml b/5gcore/templates/nssf-deploy.yaml index 65c27a0..42aa248 100644 --- a/5gcore/templates/nssf-deploy.yaml +++ b/5gcore/templates/nssf-deploy.yaml @@ -34,7 +34,7 @@ spec: - name: nssf image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-nssfd", "-c", "/open5gs/config-map/nssf.yaml"] + command: ["/open5gs/install/bin/open5gs-nssfd", "-c", "/open5gs/config-map/nssf.yaml"] volumeMounts: - name: open5gs-nssf-config mountPath: /open5gs/config-map/nssf.yaml From 4274f932a5309045a8e7540a65aeb46cb2970368 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 16:59:47 -0500 Subject: [PATCH 153/449] Update pcf-deploy.yaml --- 5gcore/templates/pcf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/pcf-deploy.yaml b/5gcore/templates/pcf-deploy.yaml index dd7e530..a8003fb 100644 --- a/5gcore/templates/pcf-deploy.yaml +++ b/5gcore/templates/pcf-deploy.yaml @@ -34,7 +34,7 @@ spec: - name: pcf image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-pcfd", "-c", "/open5gs/config-map/pcf.yaml"] + command: ["/open5gs/install/bin/open5gs-pcfd", "-c", "/open5gs/config-map/pcf.yaml"] volumeMounts: - name: open5gs-pcf-config mountPath: /open5gs/config-map/pcf.yaml From 4b930cadeacbd09bd3d99e74e6d2fefa280c312c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 17:00:27 -0500 Subject: [PATCH 154/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index 42be5dd..1f9cdf6 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -35,7 +35,7 @@ spec: imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} command: ["/bin/sh", "-c"] args: - - open5gs-smfd -c /open5gs/config-map/smf.yaml; + - /open5gs/install/bin/open5gs-smfd -c /open5gs/config-map/smf.yaml; volumeMounts: - name: open5gs-smf-config mountPath: /open5gs/config-map/smf.yaml From 59642ace45da1466650efc7e9582b0da04899215 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 17:00:41 -0500 Subject: [PATCH 155/449] Update udm-deploy.yaml --- 5gcore/templates/udm-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/udm-deploy.yaml b/5gcore/templates/udm-deploy.yaml index 65d3561..bf55a8c 100644 --- a/5gcore/templates/udm-deploy.yaml +++ b/5gcore/templates/udm-deploy.yaml @@ -34,7 +34,7 @@ spec: - name: udm image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-udmd", "-c", "/open5gs/config-map/udm.yaml"] + command: ["/open5gs/install/bin/open5gs-udmd", "-c", "/open5gs/config-map/udm.yaml"] volumeMounts: - name: open5gs-udm-config mountPath: /open5gs/config-map/udm.yaml From d1c3b4c7fc54ec28118714b233af6733de985e42 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 17:00:56 -0500 Subject: [PATCH 156/449] Update udr-deploy.yaml --- 5gcore/templates/udr-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/udr-deploy.yaml b/5gcore/templates/udr-deploy.yaml index 196a092..4f0d698 100644 --- a/5gcore/templates/udr-deploy.yaml +++ b/5gcore/templates/udr-deploy.yaml @@ -34,7 +34,7 @@ spec: - name: udr image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["open5gs-udrd", "-d", "-c", "/open5gs/config-map/udr.yaml"] + command: ["/open5gs/install/bin/open5gs-udrd", "-d", "-c", "/open5gs/config-map/udr.yaml"] volumeMounts: - name: open5gs-udr-config mountPath: /open5gs/config-map/udr.yaml From cbbd0d2e49a48bff7b4aec7993319486409c585d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 17:01:21 -0500 Subject: [PATCH 157/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 40356fd..565ca0f 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -45,7 +45,7 @@ spec: ip link set ogstun up; sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; - open5gs-upfd -c /open5gs/config-map/upf.yaml; + /open5gs/install/bin/open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: - name: open5gs-upf-config mountPath: /open5gs/config-map/upf.yaml From ae2df46a5cbfb4074ed80939b89ed127e2ced1e7 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 17:06:28 -0500 Subject: [PATCH 158/449] Update values.yaml --- 5gran/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index f360726..64c2900 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -5,7 +5,7 @@ ran: pullPolicy: IfNotPresent tag: "v2.0" amf: - address: 10.0.145.35 + address: 172.27.201.37 port: 30412 user: imsi: "imsi-208930000000001" From 787240af076b236e261e1aea2d18674b2ea20e30 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 17:13:34 -0500 Subject: [PATCH 159/449] Update values.yaml --- 5gran/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index 64c2900..536c3ed 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -13,4 +13,4 @@ ran: imeiSv: "4370816125816151" subscriptionKey: "465B5CE8B199B49FAA5F0A2EE238A6BC" opCode: "E8ED289DEBA952E4283B54E88E6183CA" - tac: 7 + tac: 1 From 02861f9c768ea6d7c2a503d1de65317fc38967b3 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 17:14:41 -0500 Subject: [PATCH 160/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index 8c41e80..07049c4 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -6,7 +6,7 @@ data: 5gran-gnb-configmap.yaml: | mcc: '208' # Mobile Country Code value mnc: '93' # Mobile Network Code value (2 or 3 digits) - nci: '0x000000011' # NR Cell Identity (36-bit) + nci: '0x000000010' # NR Cell Identity (36-bit) idLength: 32 # NR gNB ID length in bits [22...32] tac: {{ .Values.ran.tac }} # Tracking Area Code linkIp: 0.0.0.0 From da09d85ddeb58b737413e4f1bf4874df7ac6edc5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 17:15:49 -0500 Subject: [PATCH 161/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 805721a..7beae83 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -49,7 +49,6 @@ data: apn: 'internet' slice: sst: 1 - emergency: false # Configured NSSAI for this UE by HPLMN configured-nssai: From 669151c977c586ced6a0552a1e935bbe61a7bbef Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 17:19:28 -0500 Subject: [PATCH 162/449] Update values.yaml --- 5gran/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index 536c3ed..64c2900 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -13,4 +13,4 @@ ran: imeiSv: "4370816125816151" subscriptionKey: "465B5CE8B199B49FAA5F0A2EE238A6BC" opCode: "E8ED289DEBA952E4283B54E88E6183CA" - tac: 1 + tac: 7 From 0500e3f91a91411eb90c3ece77acb318ca292e87 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:14:04 -0500 Subject: [PATCH 163/449] Update values.yaml --- 5gcore/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index a4da62c..9fceb1e 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -5,6 +5,7 @@ open5gcore: repository: docker.io/efatnar/open5gcore pullPolicy: IfNotPresent tag: "v2.0" + oldtag: "v1.1" webui: image: From ed490913395863f54ea0d79ba2ede65aea17cd1d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:14:38 -0500 Subject: [PATCH 164/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index 1f9cdf6..ddf4ca3 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -31,11 +31,11 @@ spec: spec: containers: - name: smf - image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" + image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.oldtag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} command: ["/bin/sh", "-c"] args: - - /open5gs/install/bin/open5gs-smfd -c /open5gs/config-map/smf.yaml; + - open5gs-smfd -c /open5gs/config-map/smf.yaml; volumeMounts: - name: open5gs-smf-config mountPath: /open5gs/config-map/smf.yaml From 2fd366b28e1a1cfe3b6eca838b87f43bcac6ff93 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:18:21 -0500 Subject: [PATCH 165/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 48040fb..7e8062b 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -76,9 +76,9 @@ spec: spec: containers: - name: amf - image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" + image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.oldtag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["/open5gs/install/bin/open5gs-amfd", "-c", "/open5gs/config-map/amf.yaml"] + command: ["open5gs-amfd", "-c", "/open5gs/config-map/amf.yaml"] volumeMounts: - name: open5gs-amf-config mountPath: /open5gs/config-map/amf.yaml From b6474fe9dc43582cce69650bf1c01c5d76758285 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:32:05 -0500 Subject: [PATCH 166/449] Update ausf-deploy.yaml --- 5gcore/templates/ausf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/ausf-deploy.yaml b/5gcore/templates/ausf-deploy.yaml index 6fbe8db..cf2bb18 100644 --- a/5gcore/templates/ausf-deploy.yaml +++ b/5gcore/templates/ausf-deploy.yaml @@ -32,9 +32,9 @@ spec: spec: containers: - name: ausf - image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" + image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.oldtag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["/open5gs/install/bin/open5gs-ausfd", "-c", "/open5gs/config-map/ausf.yaml"] + command: ["open5gs-ausfd", "-c", "/open5gs/config-map/ausf.yaml"] volumeMounts: - name: open5gs-ausf-config mountPath: /open5gs/config-map/ausf.yaml From 419bc081b1353c8be82d235e6b5f3993bb2d99ad Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:32:23 -0500 Subject: [PATCH 167/449] Update nrf-deploy.yaml --- 5gcore/templates/nrf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/nrf-deploy.yaml b/5gcore/templates/nrf-deploy.yaml index a774cd4..267d443 100644 --- a/5gcore/templates/nrf-deploy.yaml +++ b/5gcore/templates/nrf-deploy.yaml @@ -32,9 +32,9 @@ spec: spec: containers: - name: nrf - image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" + image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.oldtag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["/open5gs/install/bin/open5gs-nrfd", "-d", "-c", "/open5gs/config-map/nrf.yaml"] + command: ["open5gs-nrfd", "-d", "-c", "/open5gs/config-map/nrf.yaml"] volumeMounts: - name: open5gs-nrf-config mountPath: /open5gs/config-map/nrf.yaml From 60030050cef04cb88047606d990a660149cf7d57 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:32:45 -0500 Subject: [PATCH 168/449] Update nssf-deploy.yaml --- 5gcore/templates/nssf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/nssf-deploy.yaml b/5gcore/templates/nssf-deploy.yaml index 42aa248..1fa6364 100644 --- a/5gcore/templates/nssf-deploy.yaml +++ b/5gcore/templates/nssf-deploy.yaml @@ -32,9 +32,9 @@ spec: spec: containers: - name: nssf - image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" + image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.oldtag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["/open5gs/install/bin/open5gs-nssfd", "-c", "/open5gs/config-map/nssf.yaml"] + command: ["open5gs-nssfd", "-c", "/open5gs/config-map/nssf.yaml"] volumeMounts: - name: open5gs-nssf-config mountPath: /open5gs/config-map/nssf.yaml From ffa28ea3dff38c54997e09fbe3a5ee6bbde220fb Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:33:05 -0500 Subject: [PATCH 169/449] Update pcf-deploy.yaml --- 5gcore/templates/pcf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/pcf-deploy.yaml b/5gcore/templates/pcf-deploy.yaml index a8003fb..7703d62 100644 --- a/5gcore/templates/pcf-deploy.yaml +++ b/5gcore/templates/pcf-deploy.yaml @@ -32,9 +32,9 @@ spec: spec: containers: - name: pcf - image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" + image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.oldtag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["/open5gs/install/bin/open5gs-pcfd", "-c", "/open5gs/config-map/pcf.yaml"] + command: ["open5gs-pcfd", "-c", "/open5gs/config-map/pcf.yaml"] volumeMounts: - name: open5gs-pcf-config mountPath: /open5gs/config-map/pcf.yaml From 58deb9a0d6517e68422c406dd023513a226450e7 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:33:38 -0500 Subject: [PATCH 170/449] Update udm-deploy.yaml --- 5gcore/templates/udm-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/udm-deploy.yaml b/5gcore/templates/udm-deploy.yaml index bf55a8c..04d099e 100644 --- a/5gcore/templates/udm-deploy.yaml +++ b/5gcore/templates/udm-deploy.yaml @@ -32,9 +32,9 @@ spec: spec: containers: - name: udm - image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" + image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.oldtag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["/open5gs/install/bin/open5gs-udmd", "-c", "/open5gs/config-map/udm.yaml"] + command: ["open5gs-udmd", "-c", "/open5gs/config-map/udm.yaml"] volumeMounts: - name: open5gs-udm-config mountPath: /open5gs/config-map/udm.yaml From 6f7fd428fd849272d55ca2bbfb884f1e860d6494 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:33:56 -0500 Subject: [PATCH 171/449] Update udr-deploy.yaml --- 5gcore/templates/udr-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/udr-deploy.yaml b/5gcore/templates/udr-deploy.yaml index 4f0d698..e4383ab 100644 --- a/5gcore/templates/udr-deploy.yaml +++ b/5gcore/templates/udr-deploy.yaml @@ -32,9 +32,9 @@ spec: spec: containers: - name: udr - image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" + image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.oldtag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} - command: ["/open5gs/install/bin/open5gs-udrd", "-d", "-c", "/open5gs/config-map/udr.yaml"] + command: ["open5gs-udrd", "-d", "-c", "/open5gs/config-map/udr.yaml"] volumeMounts: - name: open5gs-udr-config mountPath: /open5gs/config-map/udr.yaml From 2581d37265b94aa5cfc388042ea1005628d8c4ec Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:34:18 -0500 Subject: [PATCH 172/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 565ca0f..06d8d38 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -32,7 +32,7 @@ spec: spec: containers: - name: upf - image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" + image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.oldtag }}" imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} securityContext: privileged: true @@ -45,7 +45,7 @@ spec: ip link set ogstun up; sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; - /open5gs/install/bin/open5gs-upfd -c /open5gs/config-map/upf.yaml; + open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: - name: open5gs-upf-config mountPath: /open5gs/config-map/upf.yaml From 3670e048a106ae8245d14c8d0509239d2b9d8233 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:39:11 -0500 Subject: [PATCH 173/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 1536725..3ada2b3 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping -I uesimtun0 www.google.com"] volumes: - name: 5gran-gnb-config configMap: From b8763273eff377ef61c325238e5f8cb77cf67468 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:41:55 -0500 Subject: [PATCH 174/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 3ada2b3..d8da0a1 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping -I uesimtun0 www.google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping -I uesimtun0 1.1.1.1"] volumes: - name: 5gran-gnb-config configMap: From 4a2c0ebf79e8cc1e6c8ee9828078c037593f4b4c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:46:15 -0500 Subject: [PATCH 175/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index d8da0a1..c0fe144 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping -I uesimtun0 1.1.1.1"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping 1.1.1.1"] volumes: - name: 5gran-gnb-config configMap: From dabbc4594d1808718e032c1ea6e333fff772cf69 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 18:48:33 -0500 Subject: [PATCH 176/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index c0fe144..1536725 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping 1.1.1.1"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From e85fb72f01da8ca6c3849ced49ed4dea534283bd Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 19:03:37 -0500 Subject: [PATCH 177/449] Update values.yaml --- 5gcore/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index 9fceb1e..bf281d0 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -22,6 +22,7 @@ amf: k8s: interface: eth0 + tun-interface: ogstun cnf: amf: From 27e0a4754a10d3c6a3530488e1d468c988817f35 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 19:04:12 -0500 Subject: [PATCH 178/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 5769476..9fabc13 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -10,7 +10,7 @@ data: pfcp: dev: {{ .Values.k8s.interface }} gtpu: - dev: {{ .Values.k8s.interface }} + dev: {{ .Values.k8s.tun-interface }} subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} From a50a3c68d1b66bb26aafd8380220d8cff01649da Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 19:12:03 -0500 Subject: [PATCH 179/449] Update values.yaml --- 5gcore/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index bf281d0..c7b9e16 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -23,7 +23,7 @@ amf: k8s: interface: eth0 tun-interface: ogstun - + cnf: amf: sctp: From 078b5b631d73bbc7d49ad726aeb7e862177e0541 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 19:12:35 -0500 Subject: [PATCH 180/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 9fabc13..5769476 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -10,7 +10,7 @@ data: pfcp: dev: {{ .Values.k8s.interface }} gtpu: - dev: {{ .Values.k8s.tun-interface }} + dev: {{ .Values.k8s.interface }} subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} From 493659469fc8936f2948990bb2f3d18b8539f32d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 19:12:52 -0500 Subject: [PATCH 181/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 5769476..9fabc13 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -10,7 +10,7 @@ data: pfcp: dev: {{ .Values.k8s.interface }} gtpu: - dev: {{ .Values.k8s.interface }} + dev: {{ .Values.k8s.tun-interface }} subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} From 04ecab1846349f25a9beceb24abcc1b734c5cc92 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 19:13:02 -0500 Subject: [PATCH 182/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 9fabc13..97cd997 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -10,7 +10,7 @@ data: pfcp: dev: {{ .Values.k8s.interface }} gtpu: - dev: {{ .Values.k8s.tun-interface }} + dev: {{ .Values.k8s.tuninterface }} subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} From 8374d47bda57ef44f2a1a2854fc98d105d486a02 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 19:13:15 -0500 Subject: [PATCH 183/449] Update values.yaml --- 5gcore/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index c7b9e16..f05eadb 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -22,7 +22,7 @@ amf: k8s: interface: eth0 - tun-interface: ogstun + tuninterface: ogstun cnf: amf: From c883919404424656fdba57e67aad77fde2db00ac Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 19:30:36 -0500 Subject: [PATCH 184/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 97cd997..5769476 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -10,7 +10,7 @@ data: pfcp: dev: {{ .Values.k8s.interface }} gtpu: - dev: {{ .Values.k8s.tuninterface }} + dev: {{ .Values.k8s.interface }} subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} From 43240355fbdae856adaa7e0622c2593bc03dcf7a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 19:34:32 -0500 Subject: [PATCH 185/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 5769476..97cd997 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -10,7 +10,7 @@ data: pfcp: dev: {{ .Values.k8s.interface }} gtpu: - dev: {{ .Values.k8s.interface }} + dev: {{ .Values.k8s.tuninterface }} subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} From 3e4ec54fda76afff4b41dc6fc1118677e9fe0e5b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 19:49:04 -0500 Subject: [PATCH 186/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 06d8d38..b14c361 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -65,10 +65,10 @@ kind: HorizontalPodAutoscaler metadata: name: open5gs-upf-d spec: - maxReplicas: 7 + maxReplicas: 2 minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment name: open5gs-upf-d - targetCPUUtilizationPercentage: 60 + targetCPUUtilizationPercentage: 80 From 9ee24dd1434f18c1c0875af474dbe9b76729b6b1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 20:00:29 -0500 Subject: [PATCH 187/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 1536725..28e3008 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] + command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From 728e6bb2d6a5be321762f1325f040d4b743f5c80 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 22:18:38 -0500 Subject: [PATCH 188/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 28e3008..fc2bad8 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') ping www.google.com"] + command: ["/bin/sh","-c","sh nr-binder ${ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'} ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From 258e2f5aa83921297d84bcaf6d021959330bf602 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 22:22:17 -0500 Subject: [PATCH 189/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index fc2bad8..1536725 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder ${ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'} ping www.google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From 448b311fc854807b05c5b9a17c14934bd4736733 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 22:31:17 -0500 Subject: [PATCH 190/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 1536725..7b08ad5 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,9 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] + command: ["/bin/sh","-c"] + args: + - sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') ping www.google.com; volumes: - name: 5gran-gnb-config configMap: From 947b5b7a2868833c3bdc40750dc73dfc3dc0d230 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 22:32:52 -0500 Subject: [PATCH 191/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 7b08ad5..ba3889b 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -42,7 +42,7 @@ spec: privileged: true command: ["/bin/sh","-c"] args: - - sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') ping www.google.com; + - nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') ping www.google.com; volumes: - name: 5gran-gnb-config configMap: From 46dfb9232f802813b095995d6cf13017ea4296dc Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 22:40:06 -0500 Subject: [PATCH 192/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index ba3889b..be3aa75 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -42,7 +42,10 @@ spec: privileged: true command: ["/bin/sh","-c"] args: - - nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') ping www.google.com; + - echo starting; + echo tunnel-ip: $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'); + sh nr-binder "$(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+')" ping www.google.com; + echo done; volumes: - name: 5gran-gnb-config configMap: From 688cb88d8588e51c15ecb7a9bc654f65700849dc Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 22:46:30 -0500 Subject: [PATCH 193/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index be3aa75..28e3008 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,12 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c"] - args: - - echo starting; - echo tunnel-ip: $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'); - sh nr-binder "$(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+')" ping www.google.com; - echo done; + command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From bacf55bdf244c543a9345740c1dd8a85e51f98bc Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 22:49:02 -0500 Subject: [PATCH 194/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 28e3008..1536725 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') ping www.google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From 8f607830e511b9cf3d4e2bdd9b691d2041b0bae4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 22:59:35 -0500 Subject: [PATCH 195/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 1536725..10c44cc 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 curl google.com"] volumes: - name: 5gran-gnb-config configMap: From 6844b39c76f5fed811596bc9d30bc055abb67e15 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:06:55 -0500 Subject: [PATCH 196/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 10c44cc..2e9d2ec 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,10 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 curl google.com"] + command: ["/bin/sh","-c"] + args: + - echo "fenarx-101 tun-ip: $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+')"; + sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') curl google.com; volumes: - name: 5gran-gnb-config configMap: From 7740b0aec33fab1e8ea2518c35a3afebcf2042c4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:09:47 -0500 Subject: [PATCH 197/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 2e9d2ec..ecdf45b 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -41,9 +41,7 @@ spec: securityContext: privileged: true command: ["/bin/sh","-c"] - args: - - echo "fenarx-101 tun-ip: $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+')"; - sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') curl google.com; + args: ["./nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') curl google.com"] volumes: - name: 5gran-gnb-config configMap: From 1dba4753ebe77e50694070f654e18d0000041d66 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:11:39 -0500 Subject: [PATCH 198/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index ecdf45b..55ded79 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -41,7 +41,7 @@ spec: securityContext: privileged: true command: ["/bin/sh","-c"] - args: ["./nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+') curl google.com"] + args: ["./nr-binder ${ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'} curl google.com"] volumes: - name: 5gran-gnb-config configMap: From e099ed4d2065edfdf15a70743cfd7f5152dcc52e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:12:57 -0500 Subject: [PATCH 199/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 55ded79..27357c6 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,8 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c"] - args: ["./nr-binder ${ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'} curl google.com"] + command: ["/bin/sh","-c","./nr-binder ${ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'} curl google.com"] volumes: - name: 5gran-gnb-config configMap: From c5bc44bb23b44e087bc8c8346cb8c2d6528a7939 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:14:47 -0500 Subject: [PATCH 200/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 27357c6..e1e3f9c 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","./nr-binder ${ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'} curl google.com"] + command: ["/bin/sh","-c","./nr-binder 10.45.0.2 curl google.com"] volumes: - name: 5gran-gnb-config configMap: From 8d8426732f071c805f6468837a415e8570da8c00 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:16:26 -0500 Subject: [PATCH 201/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index e1e3f9c..10c44cc 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","./nr-binder 10.45.0.2 curl google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 curl google.com"] volumes: - name: 5gran-gnb-config configMap: From 47a1fce32925ab90711e682d2a8fc63dc3c5a775 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:26:05 -0500 Subject: [PATCH 202/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 10c44cc..c16adce 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 curl google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping google.com"] volumes: - name: 5gran-gnb-config configMap: From dd7bdfa52af64ddfe80161e0727fffe934b2a505 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:34:22 -0500 Subject: [PATCH 203/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index c16adce..822c7c1 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping google.com"] + command: ["/bin/sh","-c","echo fenarx tunnel start: $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+')","sh nr-binder 10.45.0.2 ping google.com"] volumes: - name: 5gran-gnb-config configMap: From 9f9b945266052ad572d1d8c332ecd254d6e9b5f5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:37:12 -0500 Subject: [PATCH 204/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 822c7c1..8e3fb70 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","echo fenarx tunnel start: $(ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+')","sh nr-binder 10.45.0.2 ping google.com"] + command: ["/bin/sh","-c","ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'","sh nr-binder 10.45.0.2 ping google.com"] volumes: - name: 5gran-gnb-config configMap: From 774fc42aaa2a3125551be7d0f75352983b033db9 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:37:41 -0500 Subject: [PATCH 205/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 8e3fb70..0027881 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'","sh nr-binder 10.45.0.2 ping google.com"] + command: ["/bin/sh","-c","ip addr show uesimtun0","sh nr-binder 10.45.0.2 ping google.com"] volumes: - name: 5gran-gnb-config configMap: From 60f76a240e0d329c6b8dc3b68e87f2ff80740a0d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:39:48 -0500 Subject: [PATCH 206/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 0027881..7fbaf6f 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","ip addr show uesimtun0","sh nr-binder 10.45.0.2 ping google.com"] + command: ["/bin/sh","-c","ip addr show uesimtun0 | grep -Po ","sh nr-binder 10.45.0.2 ping google.com"] volumes: - name: 5gran-gnb-config configMap: From c8e54f9245583ecf0aed47792a84b6f243f570ed Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:45:07 -0500 Subject: [PATCH 207/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 7fbaf6f..dac282c 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","ip addr show uesimtun0 | grep -Po ","sh nr-binder 10.45.0.2 ping google.com"] + command: ["/bin/sh","-c","ip addr show uesimtun0 | grep -Po "inet \K[\d.]+"","sh nr-binder 10.45.0.2 ping google.com"] volumes: - name: 5gran-gnb-config configMap: From 847d7f0961367cd6321919caff7780b1d265e338 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:47:01 -0500 Subject: [PATCH 208/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index dac282c..8e3fb70 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","ip addr show uesimtun0 | grep -Po "inet \K[\d.]+"","sh nr-binder 10.45.0.2 ping google.com"] + command: ["/bin/sh","-c","ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'","sh nr-binder 10.45.0.2 ping google.com"] volumes: - name: 5gran-gnb-config configMap: From 5ba8a0bf8858d55b4cc2cd007167323127ab398e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 9 May 2022 23:47:54 -0500 Subject: [PATCH 209/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 8e3fb70..c16adce 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","ip addr show uesimtun0 | grep -Po 'inet \K[\d.]+'","sh nr-binder 10.45.0.2 ping google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping google.com"] volumes: - name: 5gran-gnb-config configMap: From 80b2389e962e39e7843fb47c752dee32d90e2154 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Tue, 10 May 2022 17:25:43 -0500 Subject: [PATCH 210/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index c16adce..1424cfe 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping google.com"] + command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] volumes: - name: 5gran-gnb-config configMap: From ff9a9afc18a761133040d6a1327fe889af9ce786 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Tue, 10 May 2022 17:27:04 -0500 Subject: [PATCH 211/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 1424cfe..16bcdae 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + command: ["/bin/sh","-c","echo tunnel-ip: $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+')","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] volumes: - name: 5gran-gnb-config configMap: From 743f1a0333c88a5de4673ea06c46ca0d7c0c0cae Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Tue, 10 May 2022 17:31:04 -0500 Subject: [PATCH 212/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 16bcdae..1424cfe 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","echo tunnel-ip: $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+')","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] volumes: - name: 5gran-gnb-config configMap: From 79f0990f92e9494862b85d40b60cdc5e4f88fdfb Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Tue, 10 May 2022 17:35:30 -0500 Subject: [PATCH 213/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 1424cfe..e924897 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + command: ["/bin/sh","-c","echo $(sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com)"] volumes: - name: 5gran-gnb-config configMap: From 865f6f5b62cc74603aeadfab1ffa71742c44890b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Tue, 10 May 2022 17:37:26 -0500 Subject: [PATCH 214/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index e924897..59bd290 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","echo $(sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com)"] + command: ["/bin/sh","-c","sh echo $(sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com)"] volumes: - name: 5gran-gnb-config configMap: From ed5fe89485eceedfda442779e6c522c1849aa3cb Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Tue, 10 May 2022 17:38:44 -0500 Subject: [PATCH 215/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 59bd290..d0fb926 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh echo $(sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com)"] + command: ["/bin/sh","-c","sh echo $(nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com)"] volumes: - name: 5gran-gnb-config configMap: From af72b672c64459d29fbcb1f8c2d17658d2a3bc42 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Tue, 10 May 2022 17:43:01 -0500 Subject: [PATCH 216/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index d0fb926..1424cfe 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -40,7 +40,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh echo $(nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com)"] + command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] volumes: - name: 5gran-gnb-config configMap: From 28f19a18ad3ab49f836a340ba38d91e3751e727e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 11:54:14 -0500 Subject: [PATCH 217/449] Create scc.yaml --- 5gcore/templates/scc.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 5gcore/templates/scc.yaml diff --git a/5gcore/templates/scc.yaml b/5gcore/templates/scc.yaml new file mode 100644 index 0000000..6bcf847 --- /dev/null +++ b/5gcore/templates/scc.yaml @@ -0,0 +1,15 @@ +kind: SecurityContextConstraints +apiVersion: v1 +metadata: + name: scc-admin +allowPrivilegedContainer: true +runAsUser: + type: RunAsAny +seLinuxContext: + type: RunAsAny +fsGroup: + type: RunAsAny +supplementalGroups: + type: RunAsAny +users: +- kubeadmin From 59da32665d17d999c49df603d9961ea092c13267 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 11:56:23 -0500 Subject: [PATCH 218/449] Update scc.yaml --- 5gcore/templates/scc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/scc.yaml b/5gcore/templates/scc.yaml index 6bcf847..8f2b209 100644 --- a/5gcore/templates/scc.yaml +++ b/5gcore/templates/scc.yaml @@ -12,4 +12,4 @@ fsGroup: supplementalGroups: type: RunAsAny users: -- kubeadmin +- RunAsAny From bf12dd3696d9a1ce66847b1057740363e6d7c86e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 11:56:36 -0500 Subject: [PATCH 219/449] Update scc.yaml --- 5gcore/templates/scc.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/5gcore/templates/scc.yaml b/5gcore/templates/scc.yaml index 8f2b209..7aeb556 100644 --- a/5gcore/templates/scc.yaml +++ b/5gcore/templates/scc.yaml @@ -11,5 +11,3 @@ fsGroup: type: RunAsAny supplementalGroups: type: RunAsAny -users: -- RunAsAny From 61567d6663f4123e6fad1330e683825f761d67bf Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 11:58:30 -0500 Subject: [PATCH 220/449] Update scc.yaml --- 5gcore/templates/scc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/scc.yaml b/5gcore/templates/scc.yaml index 7aeb556..0da762c 100644 --- a/5gcore/templates/scc.yaml +++ b/5gcore/templates/scc.yaml @@ -1,7 +1,7 @@ kind: SecurityContextConstraints apiVersion: v1 metadata: - name: scc-admin + name: scc-5gcore-admin allowPrivilegedContainer: true runAsUser: type: RunAsAny From 64141eeaabe2b1e94c56ac04d90fcf8a72e46e8b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 11:58:58 -0500 Subject: [PATCH 221/449] Create scc.yaml --- 5gran/templates/scc.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 5gran/templates/scc.yaml diff --git a/5gran/templates/scc.yaml b/5gran/templates/scc.yaml new file mode 100644 index 0000000..167d66f --- /dev/null +++ b/5gran/templates/scc.yaml @@ -0,0 +1,13 @@ +kind: SecurityContextConstraints +apiVersion: v1 +metadata: + name: scc-5gran-admin +allowPrivilegedContainer: true +runAsUser: + type: RunAsAny +seLinuxContext: + type: RunAsAny +fsGroup: + type: RunAsAny +supplementalGroups: + type: RunAsAny From f5ec83db103a2ab9accd000993bc24ba26803799 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 12:02:14 -0500 Subject: [PATCH 222/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 1424cfe..27b6f83 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -5,6 +5,7 @@ metadata: labels: epc-mode: 5gran spec: + securityContext: scc-5gran-admin replicas: 1 selector: matchLabels: From be050fff88de7f755f8548c2126a1dca597dd695 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 12:09:18 -0500 Subject: [PATCH 223/449] Create project.yaml --- 5gran/templates/project.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 5gran/templates/project.yaml diff --git a/5gran/templates/project.yaml b/5gran/templates/project.yaml new file mode 100644 index 0000000..e6984d2 --- /dev/null +++ b/5gran/templates/project.yaml @@ -0,0 +1,4 @@ +apiVersion: project.openshift.io/v1 +kind: Project +metadata: + name: open5gran From e48182cf07008498d07bfa36d22f6cdd881e131f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 12:13:13 -0500 Subject: [PATCH 224/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 27b6f83..cb7e56d 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -1,3 +1,17 @@ +kind: SecurityContextConstraints +apiVersion: v1 +metadata: + name: scc-5gran-admin +allowPrivilegedContainer: true +runAsUser: + type: RunAsAny +seLinuxContext: + type: RunAsAny +fsGroup: + type: RunAsAny +supplementalGroups: + type: RunAsAny +--- apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2 kind: Deployment metadata: From b17ddc8cf987f10f9d19c22413b5556bc8eb0bcd Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 12:14:09 -0500 Subject: [PATCH 225/449] Delete scc.yaml --- 5gran/templates/scc.yaml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 5gran/templates/scc.yaml diff --git a/5gran/templates/scc.yaml b/5gran/templates/scc.yaml deleted file mode 100644 index 167d66f..0000000 --- a/5gran/templates/scc.yaml +++ /dev/null @@ -1,13 +0,0 @@ -kind: SecurityContextConstraints -apiVersion: v1 -metadata: - name: scc-5gran-admin -allowPrivilegedContainer: true -runAsUser: - type: RunAsAny -seLinuxContext: - type: RunAsAny -fsGroup: - type: RunAsAny -supplementalGroups: - type: RunAsAny From 4d987ea934b3b705182b7c99831d93043bccfd21 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 12:21:11 -0500 Subject: [PATCH 226/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index cb7e56d..18608ba 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -19,7 +19,7 @@ metadata: labels: epc-mode: 5gran spec: - securityContext: scc-5gran-admin + #securityContext: scc-5gran-admin replicas: 1 selector: matchLabels: From 14a3b4bcbfc601a6dbd31f59dea88f419d00458d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 12:23:35 -0500 Subject: [PATCH 227/449] Delete scc.yaml --- 5gcore/templates/scc.yaml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 5gcore/templates/scc.yaml diff --git a/5gcore/templates/scc.yaml b/5gcore/templates/scc.yaml deleted file mode 100644 index 0da762c..0000000 --- a/5gcore/templates/scc.yaml +++ /dev/null @@ -1,13 +0,0 @@ -kind: SecurityContextConstraints -apiVersion: v1 -metadata: - name: scc-5gcore-admin -allowPrivilegedContainer: true -runAsUser: - type: RunAsAny -seLinuxContext: - type: RunAsAny -fsGroup: - type: RunAsAny -supplementalGroups: - type: RunAsAny From ca3e2710936354c76c6505ba65faf0f1399ef65d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 12:24:29 -0500 Subject: [PATCH 228/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 18608ba..9d36ea5 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -1,17 +1,4 @@ -kind: SecurityContextConstraints -apiVersion: v1 -metadata: - name: scc-5gran-admin -allowPrivilegedContainer: true -runAsUser: - type: RunAsAny -seLinuxContext: - type: RunAsAny -fsGroup: - type: RunAsAny -supplementalGroups: - type: RunAsAny ---- + apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2 kind: Deployment metadata: From 5e6406c3ad2aec3b01b83b340e7066d81ece313c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 12:24:37 -0500 Subject: [PATCH 229/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 9d36ea5..653c461 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -1,4 +1,3 @@ - apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2 kind: Deployment metadata: From ac039f1e43ff0c2fed7f6aa7b0e7c0567fd022da Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 12:26:56 -0500 Subject: [PATCH 230/449] Delete project.yaml --- 5gran/templates/project.yaml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 5gran/templates/project.yaml diff --git a/5gran/templates/project.yaml b/5gran/templates/project.yaml deleted file mode 100644 index e6984d2..0000000 --- a/5gran/templates/project.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: project.openshift.io/v1 -kind: Project -metadata: - name: open5gran From 9c87cf92986b283ddc6b92b1c5e9e5d895a57cbd Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 13:30:06 -0500 Subject: [PATCH 231/449] Update 5gran-ue-configmap.bak --- 5gran/templates/5gran-ue-configmap.bak | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/5gran/templates/5gran-ue-configmap.bak b/5gran/templates/5gran-ue-configmap.bak index 2911138..cb0b284 100644 --- a/5gran/templates/5gran-ue-configmap.bak +++ b/5gran/templates/5gran-ue-configmap.bak @@ -27,6 +27,20 @@ data: # List of gNB IP addresses for Radio Link Simulation gnbSearchList: - 0.0.0.0 + + # UAC Access Identities Configuration + uacAic: + mps: false + mcs: false + + # UAC Access Control Class + uacAcc: + normalClass: 0 + class11: false + class12: false + class13: false + class14: false + class15: false # Initial PDU sessions to be established sessions: From f91e4de58105d57411db352caca4e98db9951bc3 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 13:52:57 -0500 Subject: [PATCH 232/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index b14c361..729cde8 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -40,6 +40,7 @@ spec: args: - ln -s /dev/net/tun /dev/tun; ip tuntap add name ogstun mode tun; + ip link set dev ogstun mtu 1400; ip addr add 10.45.0.1/16 dev ogstun; sysctl -w net.ipv6.conf.all.disable_ipv6=1; ip link set ogstun up; From 7808cb4320ddb6819f6032b90ebda71016dae41c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 13:58:29 -0500 Subject: [PATCH 233/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 97cd997..abfa1aa 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -14,3 +14,4 @@ data: subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} + dev: ogstun3 From cb07c839be52c8a2e5d303c63d58e198dbc17672 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 13:59:19 -0500 Subject: [PATCH 234/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index abfa1aa..0ae16a2 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -14,4 +14,4 @@ data: subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} - dev: ogstun3 + dev: ogstun From 6a12ea5acf859b9942799a1766f7dd1a2376f4ee Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 14:09:52 -0500 Subject: [PATCH 235/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 653c461..53ac040 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -41,7 +41,8 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + #command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From b4b5517847a76a95c87e75b40aeab359f8a6040e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 14:12:53 -0500 Subject: [PATCH 236/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 53ac040..a1e8294 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -41,8 +41,8 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - #command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] - command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] + command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + #command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From df15f78c9eb4d520e70c64a12ec06230f0bb58ef Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 14:13:28 -0500 Subject: [PATCH 237/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 729cde8..b14c361 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -40,7 +40,6 @@ spec: args: - ln -s /dev/net/tun /dev/tun; ip tuntap add name ogstun mode tun; - ip link set dev ogstun mtu 1400; ip addr add 10.45.0.1/16 dev ogstun; sysctl -w net.ipv6.conf.all.disable_ipv6=1; ip link set ogstun up; From 634c96fa47f39e12490b1edc8488202c817207cc Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 14:20:11 -0500 Subject: [PATCH 238/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index a1e8294..653c461 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -42,7 +42,6 @@ spec: securityContext: privileged: true command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] - #command: ["/bin/sh","-c","sh nr-binder 10.45.0.2 ping www.google.com"] volumes: - name: 5gran-gnb-config configMap: From f42cf33133b396fd794a8beb1463516262364180 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 14:24:04 -0500 Subject: [PATCH 239/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 0ae16a2..97cd997 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -14,4 +14,3 @@ data: subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} - dev: ogstun From edd64c1cad504dde5b217b9131d253541c67505c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 14:27:08 -0500 Subject: [PATCH 240/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 97cd997..0ae16a2 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -14,3 +14,4 @@ data: subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} + dev: ogstun From 5f771b07af83b70d62d9e61ccebab9c639d5d500 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 14:38:43 -0500 Subject: [PATCH 241/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index b14c361..e6dd332 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -43,6 +43,7 @@ spec: ip addr add 10.45.0.1/16 dev ogstun; sysctl -w net.ipv6.conf.all.disable_ipv6=1; ip link set ogstun up; + ip link set dev ogstun mtu 1400 sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; open5gs-upfd -c /open5gs/config-map/upf.yaml; From bd1738f3e19989d149b8eed652612da390588886 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 14:42:03 -0500 Subject: [PATCH 242/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index e6dd332..9c4836e 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -43,7 +43,7 @@ spec: ip addr add 10.45.0.1/16 dev ogstun; sysctl -w net.ipv6.conf.all.disable_ipv6=1; ip link set ogstun up; - ip link set dev ogstun mtu 1400 + ip link set dev ogstun mtu 1400; sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; open5gs-upfd -c /open5gs/config-map/upf.yaml; From 4b6e5b0ef658517b3bdba8f7975d92d83ea42f47 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 14:50:30 -0500 Subject: [PATCH 243/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 0ae16a2..560bed4 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -14,4 +14,4 @@ data: subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} - dev: ogstun + dev: {{ .Values.tunnel }} From ae4b8a6fd5c81e3ca3b53cd61023a14621fecd31 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 14:56:14 -0500 Subject: [PATCH 244/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 560bed4..c734172 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -14,4 +14,4 @@ data: subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} - dev: {{ .Values.tunnel }} + dev: {{ .Values.k8s.tuninterface }} From 945431678aad7a391bef6fd08941ce9b54cb7d25 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 14:58:58 -0500 Subject: [PATCH 245/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index c734172..97cd997 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -14,4 +14,3 @@ data: subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} - dev: {{ .Values.k8s.tuninterface }} From a56d14ed5ced7ad04cc3866a522fed3fe0b7b20e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 15:39:18 -0500 Subject: [PATCH 246/449] Update smf-configmap.yaml --- 5gcore/templates/smf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/smf-configmap.yaml b/5gcore/templates/smf-configmap.yaml index 70c201e..b90afc2 100644 --- a/5gcore/templates/smf-configmap.yaml +++ b/5gcore/templates/smf-configmap.yaml @@ -19,7 +19,7 @@ data: gtpc: dev: {{ .Values.k8s.interface }} gtpu: - dev: {{ .Values.k8s.interface }} + dev: {{ .Values.k8s.tuninterface }} subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} From f2bfca6c6867261a34bdab591aa4cdb728d8bd2d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 15:43:40 -0500 Subject: [PATCH 247/449] Update smf-configmap.yaml --- 5gcore/templates/smf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/smf-configmap.yaml b/5gcore/templates/smf-configmap.yaml index b90afc2..429ce6f 100644 --- a/5gcore/templates/smf-configmap.yaml +++ b/5gcore/templates/smf-configmap.yaml @@ -19,7 +19,7 @@ data: gtpc: dev: {{ .Values.k8s.interface }} gtpu: - dev: {{ .Values.k8s.tuninterface }} + dev: {{ .Values.k8s.interface }} subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} From a30199685f7b5fb9f5d2b1d64ed555ba41ba828a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 15:43:53 -0500 Subject: [PATCH 248/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 97cd997..5769476 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -10,7 +10,7 @@ data: pfcp: dev: {{ .Values.k8s.interface }} gtpu: - dev: {{ .Values.k8s.tuninterface }} + dev: {{ .Values.k8s.interface }} subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} From 2df2391e967fe1fcc5458ee4b497ecbf73929b0b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 15:59:13 -0500 Subject: [PATCH 249/449] Update smf-configmap.yaml --- 5gcore/templates/smf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/smf-configmap.yaml b/5gcore/templates/smf-configmap.yaml index 429ce6f..6cafa65 100644 --- a/5gcore/templates/smf-configmap.yaml +++ b/5gcore/templates/smf-configmap.yaml @@ -15,7 +15,7 @@ data: - addr: 0.0.0.0 advertise: open5gs-smf pfcp: - dev: {{ .Values.k8s.interface }} + dev: {{ .Values.k8s.interface }} gtpc: dev: {{ .Values.k8s.interface }} gtpu: From 31e255720d3e09c7a3420f9242e517b6f7728a9c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 16:31:14 -0500 Subject: [PATCH 250/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 653c461..9a2e307 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -41,7 +41,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + command: ["/bin/sh","-c","sysctl -w net.ipv6.conf.all.disable_ipv6=1;","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] volumes: - name: 5gran-gnb-config configMap: From d3bc897a0ef0fd7b271567e19464a2f3b5edb8c2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 16:37:29 -0500 Subject: [PATCH 251/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 9a2e307..653c461 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -41,7 +41,7 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sysctl -w net.ipv6.conf.all.disable_ipv6=1;","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] volumes: - name: 5gran-gnb-config configMap: From 623701f96a687d183ad384220c2aaeba2ccb608f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 16:44:47 -0500 Subject: [PATCH 252/449] Update smf-configmap.yaml --- 5gcore/templates/smf-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/smf-configmap.yaml b/5gcore/templates/smf-configmap.yaml index 6cafa65..3d46f59 100644 --- a/5gcore/templates/smf-configmap.yaml +++ b/5gcore/templates/smf-configmap.yaml @@ -19,13 +19,13 @@ data: gtpc: dev: {{ .Values.k8s.interface }} gtpu: - dev: {{ .Values.k8s.interface }} + dev: {{ .Values.k8s.tuninterface }} subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} + dev: {{ .Values.k8s.tuninterface }} dns: - 8.8.8.8 - - 8.8.4.4 mtu: 1400 nrf: sbi: From 39d023f44854bee0997bb6553980d67a478a7ef6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 16:45:19 -0500 Subject: [PATCH 253/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 5769476..20507f2 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -10,7 +10,7 @@ data: pfcp: dev: {{ .Values.k8s.interface }} gtpu: - dev: {{ .Values.k8s.interface }} + dev: {{ .Values.k8s.tuninterface }} subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} From 1977a928465dc2a8981133cf453305856d555154 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 16:57:29 -0500 Subject: [PATCH 254/449] Update smf-configmap.yaml --- 5gcore/templates/smf-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/smf-configmap.yaml b/5gcore/templates/smf-configmap.yaml index 3d46f59..ac475ce 100644 --- a/5gcore/templates/smf-configmap.yaml +++ b/5gcore/templates/smf-configmap.yaml @@ -23,7 +23,6 @@ data: subnet: - addr: 10.45.0.1/16 dnn: {{ .Values.dnn }} - dev: {{ .Values.k8s.tuninterface }} dns: - 8.8.8.8 mtu: 1400 From 875ce3e66563fa2cc07f1685431a36c00c41fccc Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 19:22:38 -0500 Subject: [PATCH 255/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 9c4836e..46e0322 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "true" + sidecar.istio.io/inject: "false" labels: epc-mode: upf spec: From 38b4aa383e6b2efbc2136bc6763102d0d84485f6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 19:28:29 -0500 Subject: [PATCH 256/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 46e0322..b1ec80d 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -44,7 +44,7 @@ spec: sysctl -w net.ipv6.conf.all.disable_ipv6=1; ip link set ogstun up; ip link set dev ogstun mtu 1400; - sh -c "echo 1 > /proc/sys/net/ipv4/ip_forward"; + sysctl -w net.ipv4.ip_forward=1; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: From 5de67cba9558169bb5270852af282d54e8d856ea Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 22:51:35 -0500 Subject: [PATCH 257/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index b1ec80d..420d526 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -46,6 +46,7 @@ spec: ip link set dev ogstun mtu 1400; sysctl -w net.ipv4.ip_forward=1; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; + iptables -t nat -A POSTROUTING -d 10.45.0.0/16 ! -o eth0 -j MASQUERADE; open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: - name: open5gs-upf-config From 06b4b70676fbfbe33d2d3018d97165bbb4cfe29c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 22:59:28 -0500 Subject: [PATCH 258/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 420d526..b38dd89 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -45,8 +45,8 @@ spec: ip link set ogstun up; ip link set dev ogstun mtu 1400; sysctl -w net.ipv4.ip_forward=1; + iptables -I INPUT -i ogstun -j ACCEPT; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; - iptables -t nat -A POSTROUTING -d 10.45.0.0/16 ! -o eth0 -j MASQUERADE; open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: - name: open5gs-upf-config From 279ca2272e15aefda2ad7fc34b8b160e0ea28a12 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 22:59:55 -0500 Subject: [PATCH 259/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index b38dd89..40ca5bf 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -45,6 +45,7 @@ spec: ip link set ogstun up; ip link set dev ogstun mtu 1400; sysctl -w net.ipv4.ip_forward=1; + ufw disable; iptables -I INPUT -i ogstun -j ACCEPT; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; open5gs-upfd -c /open5gs/config-map/upf.yaml; From a54311d24fd8c4ebd1bacecb55666518802b29ad Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 23:10:19 -0500 Subject: [PATCH 260/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 40ca5bf..95c62e6 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -45,8 +45,9 @@ spec: ip link set ogstun up; ip link set dev ogstun mtu 1400; sysctl -w net.ipv4.ip_forward=1; - ufw disable; - iptables -I INPUT -i ogstun -j ACCEPT; + iptables -I INPUT -j ACCEPT; + iptables -I FORWARD -j ACCEPT; + iptables -I OUTPUT -j ACCEPT; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: From dd9468d5865ffad245c2b32dd6f8c10e16e3e6d1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 23:16:59 -0500 Subject: [PATCH 261/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 653c461..798b5c1 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -42,6 +42,21 @@ spec: securityContext: privileged: true command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + - name: debug + imagePullPolicy: {{ .Values.ran.image.pullPolicy }} + image: quay.io/wcaban/net-toolbox:latest + securityContext: + privileged: true + command: ["/bin/sh", "-c"] + args: + - sysctl -w net.ipv6.conf.all.disable_ipv6=1; + ip link set uesimtun0 down; + ip link set dev uesimtun0 mtu 1400; + ip link set uesimtun0 down; + iptables -I INPUT -j ACCEPT; + iptables -I FORWARD -j ACCEPT; + iptables -I OUTPUT -j ACCEPT; + ufw disable; volumes: - name: 5gran-gnb-config configMap: From 1ef6c9feb88b2fc89b1cdb87a2b7d36ac4dc8a2a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 23:26:00 -0500 Subject: [PATCH 262/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 798b5c1..e33d383 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -47,16 +47,16 @@ spec: image: quay.io/wcaban/net-toolbox:latest securityContext: privileged: true - command: ["/bin/sh", "-c"] - args: - - sysctl -w net.ipv6.conf.all.disable_ipv6=1; - ip link set uesimtun0 down; - ip link set dev uesimtun0 mtu 1400; - ip link set uesimtun0 down; - iptables -I INPUT -j ACCEPT; - iptables -I FORWARD -j ACCEPT; - iptables -I OUTPUT -j ACCEPT; - ufw disable; + command: ["/bin/sh", "-c"] + args: + - sysctl -w net.ipv6.conf.all.disable_ipv6=1; + ip link set uesimtun0 down; + ip link set dev uesimtun0 mtu 1400; + ip link set uesimtun0 down; + iptables -I INPUT -j ACCEPT; + iptables -I FORWARD -j ACCEPT; + iptables -I OUTPUT -j ACCEPT; + ufw disable; volumes: - name: 5gran-gnb-config configMap: From 9e159f815b0d090394b9f7a0755472564f2393b4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 23:27:15 -0500 Subject: [PATCH 263/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index e33d383..fa996f6 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -56,7 +56,6 @@ spec: iptables -I INPUT -j ACCEPT; iptables -I FORWARD -j ACCEPT; iptables -I OUTPUT -j ACCEPT; - ufw disable; volumes: - name: 5gran-gnb-config configMap: From dc7446b1118767b07f2307c1ce5421758d36dc1d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 23:28:47 -0500 Subject: [PATCH 264/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index fa996f6..c8e4667 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -49,11 +49,7 @@ spec: privileged: true command: ["/bin/sh", "-c"] args: - - sysctl -w net.ipv6.conf.all.disable_ipv6=1; - ip link set uesimtun0 down; - ip link set dev uesimtun0 mtu 1400; - ip link set uesimtun0 down; - iptables -I INPUT -j ACCEPT; + - iptables -I INPUT -j ACCEPT; iptables -I FORWARD -j ACCEPT; iptables -I OUTPUT -j ACCEPT; volumes: From edab82a0b99bebd1a3f9b3c10ecbcb4f811c2d27 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 23:35:01 -0500 Subject: [PATCH 265/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index c8e4667..631f1d0 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -52,6 +52,8 @@ spec: - iptables -I INPUT -j ACCEPT; iptables -I FORWARD -j ACCEPT; iptables -I OUTPUT -j ACCEPT; + sysctl -w net.ipv6.conf.all.disable_ipv6=1; + while true; do sleep 30; done; volumes: - name: 5gran-gnb-config configMap: From 8e1bff4ec02864da6a849929c4354498575fff33 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 23:38:29 -0500 Subject: [PATCH 266/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 631f1d0..de29347 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -50,8 +50,6 @@ spec: command: ["/bin/sh", "-c"] args: - iptables -I INPUT -j ACCEPT; - iptables -I FORWARD -j ACCEPT; - iptables -I OUTPUT -j ACCEPT; sysctl -w net.ipv6.conf.all.disable_ipv6=1; while true; do sleep 30; done; volumes: From dc2e51e025648e0bcaf50e8269cbc1dc82b0739e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 23:40:23 -0500 Subject: [PATCH 267/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index de29347..6e0bf26 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -49,9 +49,7 @@ spec: privileged: true command: ["/bin/sh", "-c"] args: - - iptables -I INPUT -j ACCEPT; - sysctl -w net.ipv6.conf.all.disable_ipv6=1; - while true; do sleep 30; done; + - while true; do sleep 30; done; volumes: - name: 5gran-gnb-config configMap: From 17e2ec845ed4de24fc08969a0611f2ca076a7861 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 23:47:27 -0500 Subject: [PATCH 268/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 6e0bf26..aca0c15 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -49,7 +49,8 @@ spec: privileged: true command: ["/bin/sh", "-c"] args: - - while true; do sleep 30; done; + - iptables -I INPUT -i uesimtun0 -j ACCEPT; + while true; do sleep 30; done; volumes: - name: 5gran-gnb-config configMap: From 5919a1c659177f2ac9179ed271c5b929776dd4be Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 13 May 2022 23:49:39 -0500 Subject: [PATCH 269/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index aca0c15..027971c 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -50,6 +50,7 @@ spec: command: ["/bin/sh", "-c"] args: - iptables -I INPUT -i uesimtun0 -j ACCEPT; + sysctl -w net.ipv6.conf.all.disable_ipv6=1; while true; do sleep 30; done; volumes: - name: 5gran-gnb-config From 5ea951c937799802d7f6a671021e557bfaf790b2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 22:51:55 -0500 Subject: [PATCH 270/449] Update values.yaml --- 5gran/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/5gran/values.yaml b/5gran/values.yaml index 64c2900..176aa47 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -7,6 +7,9 @@ ran: amf: address: 172.27.201.37 port: 30412 + upf: + address: 172.27.201.37 + port: 30412 user: imsi: "imsi-208930000000001" imei: "356938035643801" From c88cb2514056c4a45eeb92768aed3d67067a6abd Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 22:55:59 -0500 Subject: [PATCH 271/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 95c62e6..2f72c6b 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -11,7 +11,23 @@ spec: - protocol: UDP port: 8805 targetPort: 8805 ---- +--- +apiVersion: v1 +kind: Service +metadata: + name: open5gs-upf-np + labels: + epc-mode: upf +spec: + type: NodePort + selector: + epc-mode: upf + ports: + - protocol: UDP + port: 8805 + targetPort: 8805 + nodePort: {{ .Values.cnf.upf.nodeport }} +--- apiVersion: apps/v1 kind: Deployment metadata: From c8397de0f478cb196897ab06e8ee260d5ebc2b9d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 22:57:47 -0500 Subject: [PATCH 272/449] Update values.yaml --- 5gcore/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/5gcore/values.yaml b/5gcore/values.yaml index f05eadb..56253a1 100644 --- a/5gcore/values.yaml +++ b/5gcore/values.yaml @@ -32,3 +32,5 @@ cnf: http: nodeport: 30080 port: 80 + upf: + nodeport: 30423 From 3381f47401fd3f9ca92ea66842d8b960b6b611f2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:02:19 -0500 Subject: [PATCH 273/449] Update values.yaml --- 5gran/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index 176aa47..cc01946 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -9,7 +9,7 @@ ran: port: 30412 upf: address: 172.27.201.37 - port: 30412 + port: 30423 user: imsi: "imsi-208930000000001" imei: "356938035643801" From 633f9c1f18a40c43b735e6ca2c0c3aac16920b1f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:07:09 -0500 Subject: [PATCH 274/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index 07049c4..69f8473 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -9,9 +9,9 @@ data: nci: '0x000000010' # NR Cell Identity (36-bit) idLength: 32 # NR gNB ID length in bits [22...32] tac: {{ .Values.ran.tac }} # Tracking Area Code - linkIp: 0.0.0.0 - ngapIp: 0.0.0.0 - gtpIp: 0.0.0.0 + linkIp: {{ .Values.ran.amf.address }} + ngapIp: {{ .Values.ran.amf.address }} + gtpIp: {{ .Values.ran.upf.address }} # List of AMF address information amfConfigs: - address: {{ .Values.ran.amf.address }} From 51af917efac151abbd37da0a50bcad65bdaa91de Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:14:27 -0500 Subject: [PATCH 275/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index 69f8473..e7b1e96 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -9,8 +9,8 @@ data: nci: '0x000000010' # NR Cell Identity (36-bit) idLength: 32 # NR gNB ID length in bits [22...32] tac: {{ .Values.ran.tac }} # Tracking Area Code - linkIp: {{ .Values.ran.amf.address }} - ngapIp: {{ .Values.ran.amf.address }} + linkIp: {{ .Values.ran.upf.address }} + ngapIp: {{ .Values.ran.upf.address }} gtpIp: {{ .Values.ran.upf.address }} # List of AMF address information amfConfigs: From d8b979a7869513ef880d1df232cbbf40384552f6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:17:51 -0500 Subject: [PATCH 276/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index e7b1e96..e30d59d 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -9,9 +9,9 @@ data: nci: '0x000000010' # NR Cell Identity (36-bit) idLength: 32 # NR gNB ID length in bits [22...32] tac: {{ .Values.ran.tac }} # Tracking Area Code - linkIp: {{ .Values.ran.upf.address }} - ngapIp: {{ .Values.ran.upf.address }} - gtpIp: {{ .Values.ran.upf.address }} + linkIp: {{ .Values.ran.amf.address }}:{{ .Values.ran.amf.port }} + ngapIp: {{ .Values.ran.amf.address }}:{{ .Values.ran.amf.port }} + gtpIp: {{ .Values.ran.upf.address }}:{{ .Values.ran.upf.port }} # List of AMF address information amfConfigs: - address: {{ .Values.ran.amf.address }} From b504e85332273b7dd064121a0152c219c76ea185 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:20:15 -0500 Subject: [PATCH 277/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index e30d59d..f904b68 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -9,9 +9,9 @@ data: nci: '0x000000010' # NR Cell Identity (36-bit) idLength: 32 # NR gNB ID length in bits [22...32] tac: {{ .Values.ran.tac }} # Tracking Area Code - linkIp: {{ .Values.ran.amf.address }}:{{ .Values.ran.amf.port }} - ngapIp: {{ .Values.ran.amf.address }}:{{ .Values.ran.amf.port }} - gtpIp: {{ .Values.ran.upf.address }}:{{ .Values.ran.upf.port }} + linkIp: {{ .Values.ran.amf.address }} + ngapIp: {{ .Values.ran.amf.address }} + gtpIp: {{ .Values.ran.upf.address }} # List of AMF address information amfConfigs: - address: {{ .Values.ran.amf.address }} From a93b6e7d73204e69fbf0f627f2aac2445a7463da Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:21:50 -0500 Subject: [PATCH 278/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index f904b68..d24e448 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -9,8 +9,8 @@ data: nci: '0x000000010' # NR Cell Identity (36-bit) idLength: 32 # NR gNB ID length in bits [22...32] tac: {{ .Values.ran.tac }} # Tracking Area Code - linkIp: {{ .Values.ran.amf.address }} - ngapIp: {{ .Values.ran.amf.address }} + linkIp: {{ .Values.ran.upf.address }} + ngapIp: {{ .Values.ran.upf.address }} gtpIp: {{ .Values.ran.upf.address }} # List of AMF address information amfConfigs: From c6581d38cf9eb5a56eecafbd09618223ca8deef4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:22:28 -0500 Subject: [PATCH 279/449] Update values.yaml --- 5gran/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index cc01946..0739cf5 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -8,8 +8,7 @@ ran: address: 172.27.201.37 port: 30412 upf: - address: 172.27.201.37 - port: 30423 + address: 172.30.88.120 user: imsi: "imsi-208930000000001" imei: "356938035643801" From e38f428ad56a1a925bb098fb870d2bec248504c8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:27:26 -0500 Subject: [PATCH 280/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index d24e448..7791922 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -9,8 +9,8 @@ data: nci: '0x000000010' # NR Cell Identity (36-bit) idLength: 32 # NR gNB ID length in bits [22...32] tac: {{ .Values.ran.tac }} # Tracking Area Code - linkIp: {{ .Values.ran.upf.address }} - ngapIp: {{ .Values.ran.upf.address }} + linkIp: 0.0.0.0 + ngapIp: 0.0.0.0 gtpIp: {{ .Values.ran.upf.address }} # List of AMF address information amfConfigs: From 52b4e9d795c6241d205185eb8abb7d74a2ed7c3c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:34:13 -0500 Subject: [PATCH 281/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index 7791922..d24e448 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -9,8 +9,8 @@ data: nci: '0x000000010' # NR Cell Identity (36-bit) idLength: 32 # NR gNB ID length in bits [22...32] tac: {{ .Values.ran.tac }} # Tracking Area Code - linkIp: 0.0.0.0 - ngapIp: 0.0.0.0 + linkIp: {{ .Values.ran.upf.address }} + ngapIp: {{ .Values.ran.upf.address }} gtpIp: {{ .Values.ran.upf.address }} # List of AMF address information amfConfigs: From 827fa03025448fbcd159263d480c3693a56a517e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:39:36 -0500 Subject: [PATCH 282/449] Update values.yaml --- 5gran/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index 0739cf5..faaeff6 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -7,8 +7,8 @@ ran: amf: address: 172.27.201.37 port: 30412 - upf: - address: 172.30.88.120 + gtp: + local-address: 172.27.201.37 user: imsi: "imsi-208930000000001" imei: "356938035643801" From 9108552954ad28d171fcee5bb706523a21117d7b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:40:18 -0500 Subject: [PATCH 283/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index d24e448..2f6439a 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -9,9 +9,9 @@ data: nci: '0x000000010' # NR Cell Identity (36-bit) idLength: 32 # NR gNB ID length in bits [22...32] tac: {{ .Values.ran.tac }} # Tracking Area Code - linkIp: {{ .Values.ran.upf.address }} - ngapIp: {{ .Values.ran.upf.address }} - gtpIp: {{ .Values.ran.upf.address }} + linkIp: {{ .Values.ran.gtp.localaddress }} + ngapIp: {{ .Values.ran.gtp.localaddress }} + gtpIp: {{ .Values.ran.gtp.localaddress }} # List of AMF address information amfConfigs: - address: {{ .Values.ran.amf.address }} From 6daddbae1142c6949051b32dfcf7316195cd71d0 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:40:42 -0500 Subject: [PATCH 284/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index 2f6439a..7b1c31a 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -9,9 +9,9 @@ data: nci: '0x000000010' # NR Cell Identity (36-bit) idLength: 32 # NR gNB ID length in bits [22...32] tac: {{ .Values.ran.tac }} # Tracking Area Code - linkIp: {{ .Values.ran.gtp.localaddress }} - ngapIp: {{ .Values.ran.gtp.localaddress }} - gtpIp: {{ .Values.ran.gtp.localaddress }} + linkIp: {{ .Values.ran.gtp.local-address }} + ngapIp: {{ .Values.ran.gtp.local-address }} + gtpIp: {{ .Values.ran.gtp.local-address }} # List of AMF address information amfConfigs: - address: {{ .Values.ran.amf.address }} From 2002f300c13c282b8abdc3edec1b8164df98c0dd Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:42:09 -0500 Subject: [PATCH 285/449] Update values.yaml --- 5gran/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index faaeff6..6aba658 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -8,7 +8,7 @@ ran: address: 172.27.201.37 port: 30412 gtp: - local-address: 172.27.201.37 + localaddress: 172.27.201.37 user: imsi: "imsi-208930000000001" imei: "356938035643801" From 580e9ebebb8889f57420116e70a08383322de48b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:42:34 -0500 Subject: [PATCH 286/449] Update 5gran-gnb-configmap.yaml --- 5gran/templates/5gran-gnb-configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5gran/templates/5gran-gnb-configmap.yaml b/5gran/templates/5gran-gnb-configmap.yaml index 7b1c31a..2f6439a 100644 --- a/5gran/templates/5gran-gnb-configmap.yaml +++ b/5gran/templates/5gran-gnb-configmap.yaml @@ -9,9 +9,9 @@ data: nci: '0x000000010' # NR Cell Identity (36-bit) idLength: 32 # NR gNB ID length in bits [22...32] tac: {{ .Values.ran.tac }} # Tracking Area Code - linkIp: {{ .Values.ran.gtp.local-address }} - ngapIp: {{ .Values.ran.gtp.local-address }} - gtpIp: {{ .Values.ran.gtp.local-address }} + linkIp: {{ .Values.ran.gtp.localaddress }} + ngapIp: {{ .Values.ran.gtp.localaddress }} + gtpIp: {{ .Values.ran.gtp.localaddress }} # List of AMF address information amfConfigs: - address: {{ .Values.ran.amf.address }} From 69090e66786d8f4ad4ed172256de332259165533 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:44:40 -0500 Subject: [PATCH 287/449] Update values.yaml --- 5gran/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index 6aba658..653b043 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -8,7 +8,7 @@ ran: address: 172.27.201.37 port: 30412 gtp: - localaddress: 172.27.201.37 + localaddress: 0.0.0.0 user: imsi: "imsi-208930000000001" imei: "356938035643801" From d0169240b39071fc429e90dbe2df3c6f5de5fde8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:48:28 -0500 Subject: [PATCH 288/449] Update values.yaml --- 5gran/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index 653b043..a67cdd8 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -8,7 +8,7 @@ ran: address: 172.27.201.37 port: 30412 gtp: - localaddress: 0.0.0.0 + localaddress: 127.0.0.1 user: imsi: "imsi-208930000000001" imei: "356938035643801" From f497d05add8d2befbf8bab15e48b408fbbc3f04c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sat, 14 May 2022 23:49:10 -0500 Subject: [PATCH 289/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 7beae83..7046409 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -27,7 +27,7 @@ data: # List of gNB IP addresses for Radio Link Simulation gnbSearchList: - - 0.0.0.0 + - {{ .Values.ran.gtp.localaddress }} # UAC Access Identities Configuration uacAic: From 617715c2c1776adf23f555dae21a1683517c2415 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:08:57 -0500 Subject: [PATCH 290/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 7046409..96332e4 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -49,14 +49,17 @@ data: apn: 'internet' slice: sst: 1 + sd: 0x010203 # Configured NSSAI for this UE by HPLMN configured-nssai: - sst: 1 + sd: 0x010203 # Default Configured NSSAI for this UE default-nssai: - sst: 1 + sd: 1 # Supported encryption algorithms by this UE integrity: From 7279a4eb927cc3ee5235a7661a534e1135f5e20d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:20:04 -0500 Subject: [PATCH 291/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 2f72c6b..4a6ce9d 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -61,9 +61,9 @@ spec: ip link set ogstun up; ip link set dev ogstun mtu 1400; sysctl -w net.ipv4.ip_forward=1; - iptables -I INPUT -j ACCEPT; - iptables -I FORWARD -j ACCEPT; - iptables -I OUTPUT -j ACCEPT; + iptables -A FORWARD -j ACCEPT; + systemctl stop ufw; + systemctl disable ufw; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: From 7b2f116bb20c5cec515c79408be5a8d651c4ad8d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:27:25 -0500 Subject: [PATCH 292/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index 96332e4..b660075 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -54,7 +54,6 @@ data: # Configured NSSAI for this UE by HPLMN configured-nssai: - sst: 1 - sd: 0x010203 # Default Configured NSSAI for this UE default-nssai: From 741afe1f5cfffaeea778abcc6608f8f48b892680 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:28:25 -0500 Subject: [PATCH 293/449] Update 5gran-ue-configmap.yaml --- 5gran/templates/5gran-ue-configmap.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/5gran/templates/5gran-ue-configmap.yaml b/5gran/templates/5gran-ue-configmap.yaml index b660075..7046409 100644 --- a/5gran/templates/5gran-ue-configmap.yaml +++ b/5gran/templates/5gran-ue-configmap.yaml @@ -49,7 +49,6 @@ data: apn: 'internet' slice: sst: 1 - sd: 0x010203 # Configured NSSAI for this UE by HPLMN configured-nssai: @@ -58,7 +57,6 @@ data: # Default Configured NSSAI for this UE default-nssai: - sst: 1 - sd: 1 # Supported encryption algorithms by this UE integrity: From 762f141a79cdf513cba7daa4d4026ff6f7ad48bf Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:32:39 -0500 Subject: [PATCH 294/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 4a6ce9d..7448c38 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -61,7 +61,11 @@ spec: ip link set ogstun up; ip link set dev ogstun mtu 1400; sysctl -w net.ipv4.ip_forward=1; + apt install iptables-persistent netfilter-persistent; iptables -A FORWARD -j ACCEPT; + netfilter-persistent save; + systemctl enable netfilter-persistent; + systemctl restart netfilter-persistent; systemctl stop ufw; systemctl disable ufw; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; From 413c465f7650f1847637ac185991406830a443fc Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:39:38 -0500 Subject: [PATCH 295/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 7448c38..7a542d4 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -64,10 +64,6 @@ spec: apt install iptables-persistent netfilter-persistent; iptables -A FORWARD -j ACCEPT; netfilter-persistent save; - systemctl enable netfilter-persistent; - systemctl restart netfilter-persistent; - systemctl stop ufw; - systemctl disable ufw; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: From 35b8e3f5d9ccd3e94f2f17ff653898abf5907141 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:43:50 -0500 Subject: [PATCH 296/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 7a542d4..78daea8 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -61,10 +61,9 @@ spec: ip link set ogstun up; ip link set dev ogstun mtu 1400; sysctl -w net.ipv4.ip_forward=1; - apt install iptables-persistent netfilter-persistent; iptables -A FORWARD -j ACCEPT; - netfilter-persistent save; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; + iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: - name: open5gs-upf-config From dc94299630c028e86175bb707f924617171deff6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:48:03 -0500 Subject: [PATCH 297/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 78daea8..ffe44aa 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -57,7 +57,6 @@ spec: - ln -s /dev/net/tun /dev/tun; ip tuntap add name ogstun mode tun; ip addr add 10.45.0.1/16 dev ogstun; - sysctl -w net.ipv6.conf.all.disable_ipv6=1; ip link set ogstun up; ip link set dev ogstun mtu 1400; sysctl -w net.ipv4.ip_forward=1; From 63a1b6e125055f55382f13428cdd0973f887c9c2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:49:16 -0500 Subject: [PATCH 298/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index ffe44aa..78daea8 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -57,6 +57,7 @@ spec: - ln -s /dev/net/tun /dev/tun; ip tuntap add name ogstun mode tun; ip addr add 10.45.0.1/16 dev ogstun; + sysctl -w net.ipv6.conf.all.disable_ipv6=1; ip link set ogstun up; ip link set dev ogstun mtu 1400; sysctl -w net.ipv4.ip_forward=1; From b0adb95579d40f435efd288c83d2df1f07d927c8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:53:28 -0500 Subject: [PATCH 299/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 78daea8..1736159 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -62,8 +62,7 @@ spec: ip link set dev ogstun mtu 1400; sysctl -w net.ipv4.ip_forward=1; iptables -A FORWARD -j ACCEPT; - iptables -t nat -A POSTROUTING -s 10.45.0.0/16 ! -o ogstun -j MASQUERADE; - iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE + iptables -t nat -A POSTROUTING -s 10.45.0.0/16 -o eth0 -j MASQUERADE; open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: - name: open5gs-upf-config From 00f92437b3ce9f74a590f79cc5d00b51d766b7ee Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:57:52 -0500 Subject: [PATCH 300/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 1736159..ca5ebfd 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -63,6 +63,9 @@ spec: sysctl -w net.ipv4.ip_forward=1; iptables -A FORWARD -j ACCEPT; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 -o eth0 -j MASQUERADE; + apt-get install --reinstall systemd; + systemctl stop ufw; + systemctl disable ufw; open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: - name: open5gs-upf-config From 1bdaf231b0cd958213179e151c618e6bf7c8aa89 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 00:59:51 -0500 Subject: [PATCH 301/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index ca5ebfd..3273bb0 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -63,7 +63,7 @@ spec: sysctl -w net.ipv4.ip_forward=1; iptables -A FORWARD -j ACCEPT; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 -o eth0 -j MASQUERADE; - apt-get install --reinstall systemd; + apt-get install --reinstall systemd -y; systemctl stop ufw; systemctl disable ufw; open5gs-upfd -c /open5gs/config-map/upf.yaml; From da7c72b604656dadf6501a72fb3f918861e3f019 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 01:01:00 -0500 Subject: [PATCH 302/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 3273bb0..b43fd7e 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -63,7 +63,7 @@ spec: sysctl -w net.ipv4.ip_forward=1; iptables -A FORWARD -j ACCEPT; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 -o eth0 -j MASQUERADE; - apt-get install --reinstall systemd -y; + apt-get install --reinstall systemd --fix-missing -y; systemctl stop ufw; systemctl disable ufw; open5gs-upfd -c /open5gs/config-map/upf.yaml; From 5e798662bd8cfec8f981218bd45657287a4290ee Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 01:02:29 -0500 Subject: [PATCH 303/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index b43fd7e..d5492d4 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -63,6 +63,8 @@ spec: sysctl -w net.ipv4.ip_forward=1; iptables -A FORWARD -j ACCEPT; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 -o eth0 -j MASQUERADE; + apt-get update; + apt-get upgrade -y; apt-get install --reinstall systemd --fix-missing -y; systemctl stop ufw; systemctl disable ufw; From a1dae329c965ce05b601be5d638194522da4b88c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 01:06:18 -0500 Subject: [PATCH 304/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index d5492d4..1736159 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -63,11 +63,6 @@ spec: sysctl -w net.ipv4.ip_forward=1; iptables -A FORWARD -j ACCEPT; iptables -t nat -A POSTROUTING -s 10.45.0.0/16 -o eth0 -j MASQUERADE; - apt-get update; - apt-get upgrade -y; - apt-get install --reinstall systemd --fix-missing -y; - systemctl stop ufw; - systemctl disable ufw; open5gs-upfd -c /open5gs/config-map/upf.yaml; volumeMounts: - name: open5gs-upf-config From fc1ab1c15a0505f6fcac5c6967306a30d680fe6f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 01:11:41 -0500 Subject: [PATCH 305/449] Update upf-configmap.yaml --- 5gcore/templates/upf-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/upf-configmap.yaml b/5gcore/templates/upf-configmap.yaml index 20507f2..496c7c2 100644 --- a/5gcore/templates/upf-configmap.yaml +++ b/5gcore/templates/upf-configmap.yaml @@ -8,7 +8,7 @@ data: upf.yaml: | upf: pfcp: - dev: {{ .Values.k8s.interface }} + dev: {{ .Values.k8s.tuninterface }} gtpu: dev: {{ .Values.k8s.tuninterface }} subnet: From bedfecf03d205da1fd7acf67ac8868437eb0e9ee Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 01:58:11 -0500 Subject: [PATCH 306/449] Update values.yaml --- 5gran/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index a67cdd8..a7184dc 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -8,11 +8,11 @@ ran: address: 172.27.201.37 port: 30412 gtp: - localaddress: 127.0.0.1 + localaddress: 0.0.0.0 user: imsi: "imsi-208930000000001" imei: "356938035643801" imeiSv: "4370816125816151" - subscriptionKey: "465B5CE8B199B49FAA5F0A2EE238A6BC" - opCode: "E8ED289DEBA952E4283B54E88E6183CA" + subscriptionKey: "465B5CE8 B199B49F AA5F0A2E E238A6BC" + opCode: "E8ED289D EBA952E4 283B54E8 8E6183CA" tac: 7 From 5c915a44199976541f57d0f8ba1784a41fd2536e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Sun, 15 May 2022 02:00:09 -0500 Subject: [PATCH 307/449] Update values.yaml --- 5gran/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index a7184dc..653b043 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -13,6 +13,6 @@ ran: imsi: "imsi-208930000000001" imei: "356938035643801" imeiSv: "4370816125816151" - subscriptionKey: "465B5CE8 B199B49F AA5F0A2E E238A6BC" - opCode: "E8ED289D EBA952E4 283B54E8 8E6183CA" + subscriptionKey: "465B5CE8B199B49FAA5F0A2EE238A6BC" + opCode: "E8ED289DEBA952E4283B54E88E6183CA" tac: 7 From f1c3037605ead404809a84b6936bff442b4134f4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:02:26 -0500 Subject: [PATCH 308/449] Create deploy-prodmesh.sh --- 5gcore/mesh/deploy-prodmesh.sh | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 5gcore/mesh/deploy-prodmesh.sh diff --git a/5gcore/mesh/deploy-prodmesh.sh b/5gcore/mesh/deploy-prodmesh.sh new file mode 100644 index 0000000..9d935b4 --- /dev/null +++ b/5gcore/mesh/deploy-prodmesh.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +set -e + +log() { + echo + echo "##### $*" +} + +log "Creating projects for prod1-mesh" +oc new-project prod1-mesh || true +oc new-project prod1-5gcore || true + +log "Installing control plane for prod-mesh" +oc apply -f prod1-smcp.yaml +oc apply -f prod1-smmr.yaml + +log "Waiting for prod-mesh installation to complete" +oc wait --for condition=Ready -n prod1-mesh smmr/default --timeout 300s + +log "Installing 5gcore application in prod-mesh" +./0-deploy5gcore.sh + +log "Retrieving Istio CA Root certificates" +PROD_MESH_CERT=$(oc get configmap -n prod1-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') + +log "Enabling federation for prod-mesh" +sed "s:{{STAGE_MESH_CERT}}:$STAGE_MESH_CERT:g" prod1-stage-mesh-ca-root-cert.yaml | oc apply -f - +oc apply -f prod1-smp.yaml +oc apply -f prod1-iss.yaml + +log "Installing VirtualService for prod-mesh" +oc apply -n prod1-5gcore -f prod-vs-mirror-details.yaml + +log "INSTALLATION COMPLETE" +oc -n prod1-mesh get servicemeshpeer prod2-mesh -o json | jq .status +oc -n prod1-mesh get importedservicesets prod2-mesh -o json | jq .status + + + From e197ddf65aca64c599e0f9329967a8ca474c0bb7 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:04:10 -0500 Subject: [PATCH 309/449] Create prod1-iss.yaml --- 5gcore/mesh/prod1-iss.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 5gcore/mesh/prod1-iss.yaml diff --git a/5gcore/mesh/prod1-iss.yaml b/5gcore/mesh/prod1-iss.yaml new file mode 100644 index 0000000..c51c4bf --- /dev/null +++ b/5gcore/mesh/prod1-iss.yaml @@ -0,0 +1,15 @@ +apiVersion: federation.maistra.io/v1 +kind: ImportedServiceSet +metadata: + name: prod2-mesh + namespace: prod1-mesh +spec: + importRules: + - importAsLocal: false + nameSelector: + alias: + name: details-v2 + namespace: prod1-5gcore + name: details + namespace: prod2-5gcore + type: NameSelector From 78e5669968351be2b5273f98f6eb37b9b15686fe Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:05:47 -0500 Subject: [PATCH 310/449] Create prod1-smcp.yaml --- 5gcore/mesh/prod1-smcp.yaml | 68 +++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 5gcore/mesh/prod1-smcp.yaml diff --git a/5gcore/mesh/prod1-smcp.yaml b/5gcore/mesh/prod1-smcp.yaml new file mode 100644 index 0000000..5d1e671 --- /dev/null +++ b/5gcore/mesh/prod1-smcp.yaml @@ -0,0 +1,68 @@ +apiVersion: maistra.io/v2 +kind: ServiceMeshControlPlane +metadata: + namespace: prod1-mesh + name: prod1-mesh +spec: + cluster: + name: production-cluster + addons: + grafana: + enabled: true + jaeger: + install: + storage: + type: Memory + kiali: + enabled: true + prometheus: + enabled: true + policy: + type: Istiod + telemetry: + type: Istiod + tracing: + sampling: 10000 + type: Jaeger + version: v2.1 + runtime: + defaults: + container: + imagePullPolicy: Always + proxy: + accessLogging: + file: + name: /dev/stdout + gateways: + additionalEgress: + stage-mesh-egress: + enabled: true + requestedNetworkView: + - network-stage-mesh + routerMode: sni-dnat + service: + metadata: + labels: + federation.maistra.io/egress-for: prod2-mesh + ports: + - port: 15443 + name: tls + - port: 8188 + name: http-discovery #note HTTP here + additionalIngress: + stage-mesh-ingress: + enabled: true + routerMode: sni-dnat + service: + type: ClusterIP + metadata: + labels: + federation.maistra.io/ingress-for: prod2-mesh + ports: + - port: 15443 + name: tls + - port: 8188 + name: https-discovery #note HTTPS here + security: + trust: + domain: prod1-mesh.local From 0b4af590e78e5fcbe4fd436fd52204648e5b0ccf Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:06:31 -0500 Subject: [PATCH 311/449] Create prod1-smmr.yaml --- 5gcore/mesh/prod1-smmr.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 5gcore/mesh/prod1-smmr.yaml diff --git a/5gcore/mesh/prod1-smmr.yaml b/5gcore/mesh/prod1-smmr.yaml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/5gcore/mesh/prod1-smmr.yaml @@ -0,0 +1 @@ + From e9811519d8ac2f29b99da725baa1b9c32ce398e4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:06:58 -0500 Subject: [PATCH 312/449] Update prod1-smmr.yaml --- 5gcore/mesh/prod1-smmr.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/5gcore/mesh/prod1-smmr.yaml b/5gcore/mesh/prod1-smmr.yaml index 8b13789..ca0bb5a 100644 --- a/5gcore/mesh/prod1-smmr.yaml +++ b/5gcore/mesh/prod1-smmr.yaml @@ -1 +1,8 @@ - +apiVersion: maistra.io/v1 +kind: ServiceMeshMemberRoll +metadata: + name: default + namespace: prod1-mesh +spec: + members: + - prod1-5gcore From 53fe11d626c1f20d4280077114494b2f3a2d0d2b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:09:37 -0500 Subject: [PATCH 313/449] Create prod1-smp.yaml --- 5gcore/mesh/prod1-smp.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 5gcore/mesh/prod1-smp.yaml diff --git a/5gcore/mesh/prod1-smp.yaml b/5gcore/mesh/prod1-smp.yaml new file mode 100644 index 0000000..7dece77 --- /dev/null +++ b/5gcore/mesh/prod1-smp.yaml @@ -0,0 +1,22 @@ +kind: ServiceMeshPeer +apiVersion: federation.maistra.io/v1 +metadata: + name: prod2-mesh + namespace: prod1-mesh +spec: + remote: + addresses: + - prod1-mesh-ingress.prod2-mesh.svc.cluster.local + discoveryPort: 8188 + servicePort: 15443 + gateways: + ingress: + name: prod2-mesh-ingress + egress: + name: prod2-mesh-egress + security: + trustDomain: prod2-mesh.local + clientID: prod2-mesh.local/ns/prod2-mesh/sa/prod1-mesh-egress-service-account + certificateChain: + kind: ConfigMap + name: prod2-mesh-ca-root-cert From 102480561b669b6317b1020777178f842fd211b1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:11:01 -0500 Subject: [PATCH 314/449] Create prod2-mesh-ca-root-cert.yaml --- 5gcore/mesh/prod2-mesh-ca-root-cert.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 5gcore/mesh/prod2-mesh-ca-root-cert.yaml diff --git a/5gcore/mesh/prod2-mesh-ca-root-cert.yaml b/5gcore/mesh/prod2-mesh-ca-root-cert.yaml new file mode 100644 index 0000000..86c0854 --- /dev/null +++ b/5gcore/mesh/prod2-mesh-ca-root-cert.yaml @@ -0,0 +1,10 @@ + + +kind: ConfigMap +apiVersion: v1 +metadata: + name: prod2-mesh-ca-root-cert + namespace: prod1-mesh +data: + root-cert.pem: |- + {{STAGE_MESH_CERT}} From 4e38eb77cc744061756b4ed45da9e62de459bdf4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:12:13 -0500 Subject: [PATCH 315/449] Create prod1-vs-mirror-details.yaml --- 5gcore/mesh/prod1-vs-mirror-details.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 5gcore/mesh/prod1-vs-mirror-details.yaml diff --git a/5gcore/mesh/prod1-vs-mirror-details.yaml b/5gcore/mesh/prod1-vs-mirror-details.yaml new file mode 100644 index 0000000..6ff6315 --- /dev/null +++ b/5gcore/mesh/prod1-vs-mirror-details.yaml @@ -0,0 +1,16 @@ +kind: VirtualService +apiVersion: networking.istio.io/v1alpha3 +metadata: + name: details + namespace: prod1-5gcore +spec: + hosts: + - details.prod1-5gcore.svc.cluster.local + http: + - mirror: + host: details-v2.prod1-5gcore.svc.prod2-mesh-imports.local + route: + - destination: + host: details.prod1-5gcore.svc.cluster.local + subset: v1 + weight: 100 From 8548d2a53ad0351f5e8d77f3f9754d47d8e175ff Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:12:33 -0500 Subject: [PATCH 316/449] Create prod1-vs-split-details.yaml --- 5gcore/mesh/prod1-vs-split-details.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 5gcore/mesh/prod1-vs-split-details.yaml diff --git a/5gcore/mesh/prod1-vs-split-details.yaml b/5gcore/mesh/prod1-vs-split-details.yaml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/5gcore/mesh/prod1-vs-split-details.yaml @@ -0,0 +1 @@ + From 353d9d74909d31c61b94664ca8dddffe4479639c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:12:52 -0500 Subject: [PATCH 317/449] Rename deploy-prodmesh.sh to deploy-prod1mesh.sh --- 5gcore/mesh/{deploy-prodmesh.sh => deploy-prod1mesh.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/{deploy-prodmesh.sh => deploy-prod1mesh.sh} (100%) diff --git a/5gcore/mesh/deploy-prodmesh.sh b/5gcore/mesh/deploy-prod1mesh.sh similarity index 100% rename from 5gcore/mesh/deploy-prodmesh.sh rename to 5gcore/mesh/deploy-prod1mesh.sh From 30e83c2f593386d9d6ed9ad4e69037a6185c2d8a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:14:05 -0500 Subject: [PATCH 318/449] Update prod1-vs-split-details.yaml --- 5gcore/mesh/prod1-vs-split-details.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/5gcore/mesh/prod1-vs-split-details.yaml b/5gcore/mesh/prod1-vs-split-details.yaml index 8b13789..62e872f 100644 --- a/5gcore/mesh/prod1-vs-split-details.yaml +++ b/5gcore/mesh/prod1-vs-split-details.yaml @@ -1 +1,17 @@ - +kind: VirtualService +apiVersion: networking.istio.io/v1alpha3 +metadata: + name: details + namespace: prod1-5gcore +spec: + hosts: + - details.prod1-5gcore.svc.cluster.local + http: + - route: + - destination: + host: details.prod1-5gcore.svc.cluster.local + subset: v1 + weight: 80 + - destination: + host: details-v2.prod1-5gcore.svc.prod2-mesh-imports.local + weight: 20 From 073c1c347541c091619ccf01ff3e6faccb3a4ca5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:14:49 -0500 Subject: [PATCH 319/449] Create intro.txt --- 5gcore/mesh/site1/intro.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 5gcore/mesh/site1/intro.txt diff --git a/5gcore/mesh/site1/intro.txt b/5gcore/mesh/site1/intro.txt new file mode 100644 index 0000000..439cc2e --- /dev/null +++ b/5gcore/mesh/site1/intro.txt @@ -0,0 +1 @@ +Site1 details From 489fe201b8735e2db0ba31d8d6073e67fe069b32 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:15:34 -0500 Subject: [PATCH 320/449] Create intro.txt --- 5gcore/mesh/site2/intro.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 5gcore/mesh/site2/intro.txt diff --git a/5gcore/mesh/site2/intro.txt b/5gcore/mesh/site2/intro.txt new file mode 100644 index 0000000..a6757ca --- /dev/null +++ b/5gcore/mesh/site2/intro.txt @@ -0,0 +1 @@ +Site2 Details From b47006ca39d38a61019430d744081cf5345237b4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:16:10 -0500 Subject: [PATCH 321/449] Create intro.txt --- 5gcore/mesh/site3/intro.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 5gcore/mesh/site3/intro.txt diff --git a/5gcore/mesh/site3/intro.txt b/5gcore/mesh/site3/intro.txt new file mode 100644 index 0000000..9e7d828 --- /dev/null +++ b/5gcore/mesh/site3/intro.txt @@ -0,0 +1 @@ +Site3 Details From 48bd175d2ef25a71d1e99e5977d668c06d39d573 Mon Sep 17 00:00:00 2001 From: FATIH NAR Date: Mon, 23 May 2022 09:25:39 -0500 Subject: [PATCH 322/449] commit --- 5gcore/mesh/{ => site1}/deploy-prod1mesh.sh | 0 5gcore/mesh/{ => site1}/prod1-iss.yaml | 0 5gcore/mesh/{ => site1}/prod1-smcp.yaml | 0 5gcore/mesh/{ => site1}/prod1-smmr.yaml | 0 5gcore/mesh/{ => site1}/prod1-smp.yaml | 0 .../{ => site1}/prod1-vs-mirror-details.yaml | 0 .../{ => site1}/prod1-vs-split-details.yaml | 0 .../{ => site1}/prod2-mesh-ca-root-cert.yaml | 0 5gcore/mesh/site2/deploy-prod2mesh.sh | 40 +++++++++++ .../mesh/site2/prod1-mesh-ca-root-cert.yaml | 10 +++ 5gcore/mesh/site2/prod2-iss.yaml | 15 ++++ 5gcore/mesh/site2/prod2-smcp.yaml | 68 +++++++++++++++++++ 5gcore/mesh/site2/prod2-smmr.yaml | 8 +++ 5gcore/mesh/site2/prod2-smp.yaml | 22 ++++++ .../mesh/site2/prod2-vs-mirror-details.yaml | 16 +++++ 5gcore/mesh/site2/prod2-vs-split-details.yaml | 17 +++++ 5gcore/mesh/site3/intro.txt | 1 - 17 files changed, 196 insertions(+), 1 deletion(-) rename 5gcore/mesh/{ => site1}/deploy-prod1mesh.sh (100%) rename 5gcore/mesh/{ => site1}/prod1-iss.yaml (100%) rename 5gcore/mesh/{ => site1}/prod1-smcp.yaml (100%) rename 5gcore/mesh/{ => site1}/prod1-smmr.yaml (100%) rename 5gcore/mesh/{ => site1}/prod1-smp.yaml (100%) rename 5gcore/mesh/{ => site1}/prod1-vs-mirror-details.yaml (100%) rename 5gcore/mesh/{ => site1}/prod1-vs-split-details.yaml (100%) rename 5gcore/mesh/{ => site1}/prod2-mesh-ca-root-cert.yaml (100%) create mode 100644 5gcore/mesh/site2/deploy-prod2mesh.sh create mode 100644 5gcore/mesh/site2/prod1-mesh-ca-root-cert.yaml create mode 100644 5gcore/mesh/site2/prod2-iss.yaml create mode 100644 5gcore/mesh/site2/prod2-smcp.yaml create mode 100644 5gcore/mesh/site2/prod2-smmr.yaml create mode 100644 5gcore/mesh/site2/prod2-smp.yaml create mode 100644 5gcore/mesh/site2/prod2-vs-mirror-details.yaml create mode 100644 5gcore/mesh/site2/prod2-vs-split-details.yaml delete mode 100644 5gcore/mesh/site3/intro.txt diff --git a/5gcore/mesh/deploy-prod1mesh.sh b/5gcore/mesh/site1/deploy-prod1mesh.sh similarity index 100% rename from 5gcore/mesh/deploy-prod1mesh.sh rename to 5gcore/mesh/site1/deploy-prod1mesh.sh diff --git a/5gcore/mesh/prod1-iss.yaml b/5gcore/mesh/site1/prod1-iss.yaml similarity index 100% rename from 5gcore/mesh/prod1-iss.yaml rename to 5gcore/mesh/site1/prod1-iss.yaml diff --git a/5gcore/mesh/prod1-smcp.yaml b/5gcore/mesh/site1/prod1-smcp.yaml similarity index 100% rename from 5gcore/mesh/prod1-smcp.yaml rename to 5gcore/mesh/site1/prod1-smcp.yaml diff --git a/5gcore/mesh/prod1-smmr.yaml b/5gcore/mesh/site1/prod1-smmr.yaml similarity index 100% rename from 5gcore/mesh/prod1-smmr.yaml rename to 5gcore/mesh/site1/prod1-smmr.yaml diff --git a/5gcore/mesh/prod1-smp.yaml b/5gcore/mesh/site1/prod1-smp.yaml similarity index 100% rename from 5gcore/mesh/prod1-smp.yaml rename to 5gcore/mesh/site1/prod1-smp.yaml diff --git a/5gcore/mesh/prod1-vs-mirror-details.yaml b/5gcore/mesh/site1/prod1-vs-mirror-details.yaml similarity index 100% rename from 5gcore/mesh/prod1-vs-mirror-details.yaml rename to 5gcore/mesh/site1/prod1-vs-mirror-details.yaml diff --git a/5gcore/mesh/prod1-vs-split-details.yaml b/5gcore/mesh/site1/prod1-vs-split-details.yaml similarity index 100% rename from 5gcore/mesh/prod1-vs-split-details.yaml rename to 5gcore/mesh/site1/prod1-vs-split-details.yaml diff --git a/5gcore/mesh/prod2-mesh-ca-root-cert.yaml b/5gcore/mesh/site1/prod2-mesh-ca-root-cert.yaml similarity index 100% rename from 5gcore/mesh/prod2-mesh-ca-root-cert.yaml rename to 5gcore/mesh/site1/prod2-mesh-ca-root-cert.yaml diff --git a/5gcore/mesh/site2/deploy-prod2mesh.sh b/5gcore/mesh/site2/deploy-prod2mesh.sh new file mode 100644 index 0000000..9d935b4 --- /dev/null +++ b/5gcore/mesh/site2/deploy-prod2mesh.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +set -e + +log() { + echo + echo "##### $*" +} + +log "Creating projects for prod1-mesh" +oc new-project prod1-mesh || true +oc new-project prod1-5gcore || true + +log "Installing control plane for prod-mesh" +oc apply -f prod1-smcp.yaml +oc apply -f prod1-smmr.yaml + +log "Waiting for prod-mesh installation to complete" +oc wait --for condition=Ready -n prod1-mesh smmr/default --timeout 300s + +log "Installing 5gcore application in prod-mesh" +./0-deploy5gcore.sh + +log "Retrieving Istio CA Root certificates" +PROD_MESH_CERT=$(oc get configmap -n prod1-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') + +log "Enabling federation for prod-mesh" +sed "s:{{STAGE_MESH_CERT}}:$STAGE_MESH_CERT:g" prod1-stage-mesh-ca-root-cert.yaml | oc apply -f - +oc apply -f prod1-smp.yaml +oc apply -f prod1-iss.yaml + +log "Installing VirtualService for prod-mesh" +oc apply -n prod1-5gcore -f prod-vs-mirror-details.yaml + +log "INSTALLATION COMPLETE" +oc -n prod1-mesh get servicemeshpeer prod2-mesh -o json | jq .status +oc -n prod1-mesh get importedservicesets prod2-mesh -o json | jq .status + + + diff --git a/5gcore/mesh/site2/prod1-mesh-ca-root-cert.yaml b/5gcore/mesh/site2/prod1-mesh-ca-root-cert.yaml new file mode 100644 index 0000000..86c0854 --- /dev/null +++ b/5gcore/mesh/site2/prod1-mesh-ca-root-cert.yaml @@ -0,0 +1,10 @@ + + +kind: ConfigMap +apiVersion: v1 +metadata: + name: prod2-mesh-ca-root-cert + namespace: prod1-mesh +data: + root-cert.pem: |- + {{STAGE_MESH_CERT}} diff --git a/5gcore/mesh/site2/prod2-iss.yaml b/5gcore/mesh/site2/prod2-iss.yaml new file mode 100644 index 0000000..c51c4bf --- /dev/null +++ b/5gcore/mesh/site2/prod2-iss.yaml @@ -0,0 +1,15 @@ +apiVersion: federation.maistra.io/v1 +kind: ImportedServiceSet +metadata: + name: prod2-mesh + namespace: prod1-mesh +spec: + importRules: + - importAsLocal: false + nameSelector: + alias: + name: details-v2 + namespace: prod1-5gcore + name: details + namespace: prod2-5gcore + type: NameSelector diff --git a/5gcore/mesh/site2/prod2-smcp.yaml b/5gcore/mesh/site2/prod2-smcp.yaml new file mode 100644 index 0000000..5d1e671 --- /dev/null +++ b/5gcore/mesh/site2/prod2-smcp.yaml @@ -0,0 +1,68 @@ +apiVersion: maistra.io/v2 +kind: ServiceMeshControlPlane +metadata: + namespace: prod1-mesh + name: prod1-mesh +spec: + cluster: + name: production-cluster + addons: + grafana: + enabled: true + jaeger: + install: + storage: + type: Memory + kiali: + enabled: true + prometheus: + enabled: true + policy: + type: Istiod + telemetry: + type: Istiod + tracing: + sampling: 10000 + type: Jaeger + version: v2.1 + runtime: + defaults: + container: + imagePullPolicy: Always + proxy: + accessLogging: + file: + name: /dev/stdout + gateways: + additionalEgress: + stage-mesh-egress: + enabled: true + requestedNetworkView: + - network-stage-mesh + routerMode: sni-dnat + service: + metadata: + labels: + federation.maistra.io/egress-for: prod2-mesh + ports: + - port: 15443 + name: tls + - port: 8188 + name: http-discovery #note HTTP here + additionalIngress: + stage-mesh-ingress: + enabled: true + routerMode: sni-dnat + service: + type: ClusterIP + metadata: + labels: + federation.maistra.io/ingress-for: prod2-mesh + ports: + - port: 15443 + name: tls + - port: 8188 + name: https-discovery #note HTTPS here + security: + trust: + domain: prod1-mesh.local diff --git a/5gcore/mesh/site2/prod2-smmr.yaml b/5gcore/mesh/site2/prod2-smmr.yaml new file mode 100644 index 0000000..ca0bb5a --- /dev/null +++ b/5gcore/mesh/site2/prod2-smmr.yaml @@ -0,0 +1,8 @@ +apiVersion: maistra.io/v1 +kind: ServiceMeshMemberRoll +metadata: + name: default + namespace: prod1-mesh +spec: + members: + - prod1-5gcore diff --git a/5gcore/mesh/site2/prod2-smp.yaml b/5gcore/mesh/site2/prod2-smp.yaml new file mode 100644 index 0000000..7dece77 --- /dev/null +++ b/5gcore/mesh/site2/prod2-smp.yaml @@ -0,0 +1,22 @@ +kind: ServiceMeshPeer +apiVersion: federation.maistra.io/v1 +metadata: + name: prod2-mesh + namespace: prod1-mesh +spec: + remote: + addresses: + - prod1-mesh-ingress.prod2-mesh.svc.cluster.local + discoveryPort: 8188 + servicePort: 15443 + gateways: + ingress: + name: prod2-mesh-ingress + egress: + name: prod2-mesh-egress + security: + trustDomain: prod2-mesh.local + clientID: prod2-mesh.local/ns/prod2-mesh/sa/prod1-mesh-egress-service-account + certificateChain: + kind: ConfigMap + name: prod2-mesh-ca-root-cert diff --git a/5gcore/mesh/site2/prod2-vs-mirror-details.yaml b/5gcore/mesh/site2/prod2-vs-mirror-details.yaml new file mode 100644 index 0000000..6ff6315 --- /dev/null +++ b/5gcore/mesh/site2/prod2-vs-mirror-details.yaml @@ -0,0 +1,16 @@ +kind: VirtualService +apiVersion: networking.istio.io/v1alpha3 +metadata: + name: details + namespace: prod1-5gcore +spec: + hosts: + - details.prod1-5gcore.svc.cluster.local + http: + - mirror: + host: details-v2.prod1-5gcore.svc.prod2-mesh-imports.local + route: + - destination: + host: details.prod1-5gcore.svc.cluster.local + subset: v1 + weight: 100 diff --git a/5gcore/mesh/site2/prod2-vs-split-details.yaml b/5gcore/mesh/site2/prod2-vs-split-details.yaml new file mode 100644 index 0000000..62e872f --- /dev/null +++ b/5gcore/mesh/site2/prod2-vs-split-details.yaml @@ -0,0 +1,17 @@ +kind: VirtualService +apiVersion: networking.istio.io/v1alpha3 +metadata: + name: details + namespace: prod1-5gcore +spec: + hosts: + - details.prod1-5gcore.svc.cluster.local + http: + - route: + - destination: + host: details.prod1-5gcore.svc.cluster.local + subset: v1 + weight: 80 + - destination: + host: details-v2.prod1-5gcore.svc.prod2-mesh-imports.local + weight: 20 diff --git a/5gcore/mesh/site3/intro.txt b/5gcore/mesh/site3/intro.txt deleted file mode 100644 index 9e7d828..0000000 --- a/5gcore/mesh/site3/intro.txt +++ /dev/null @@ -1 +0,0 @@ -Site3 Details From d205feec2755d4a1463e42c204bbab7e1a384310 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:34:26 -0500 Subject: [PATCH 323/449] Delete intro.txt --- 5gcore/mesh/site2/intro.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 5gcore/mesh/site2/intro.txt diff --git a/5gcore/mesh/site2/intro.txt b/5gcore/mesh/site2/intro.txt deleted file mode 100644 index a6757ca..0000000 --- a/5gcore/mesh/site2/intro.txt +++ /dev/null @@ -1 +0,0 @@ -Site2 Details From bc03264b4060b0400efd5fb370aa24c3d4edb188 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:34:34 -0500 Subject: [PATCH 324/449] Delete intro.txt --- 5gcore/mesh/site1/intro.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 5gcore/mesh/site1/intro.txt diff --git a/5gcore/mesh/site1/intro.txt b/5gcore/mesh/site1/intro.txt deleted file mode 100644 index 439cc2e..0000000 --- a/5gcore/mesh/site1/intro.txt +++ /dev/null @@ -1 +0,0 @@ -Site1 details From 29a816a6ca36533a42672df778d4707230ebc6dd Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:36:16 -0500 Subject: [PATCH 325/449] Update deploy-prod2mesh.sh --- 5gcore/mesh/site2/deploy-prod2mesh.sh | 29 ++++++++++++--------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/5gcore/mesh/site2/deploy-prod2mesh.sh b/5gcore/mesh/site2/deploy-prod2mesh.sh index 9d935b4..3a48fb9 100644 --- a/5gcore/mesh/site2/deploy-prod2mesh.sh +++ b/5gcore/mesh/site2/deploy-prod2mesh.sh @@ -7,34 +7,31 @@ log() { echo "##### $*" } -log "Creating projects for prod1-mesh" -oc new-project prod1-mesh || true -oc new-project prod1-5gcore || true +log "Creating projects for prod2-mesh" +oc new-project prod2-mesh || true +oc new-project prod2-5gcore || true log "Installing control plane for prod-mesh" -oc apply -f prod1-smcp.yaml -oc apply -f prod1-smmr.yaml +oc apply -f prod2-smcp.yaml +oc apply -f prod2-smmr.yaml log "Waiting for prod-mesh installation to complete" -oc wait --for condition=Ready -n prod1-mesh smmr/default --timeout 300s +oc wait --for condition=Ready -n prod2-mesh smmr/default --timeout 300s log "Installing 5gcore application in prod-mesh" ./0-deploy5gcore.sh log "Retrieving Istio CA Root certificates" -PROD_MESH_CERT=$(oc get configmap -n prod1-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') +PROD_MESH_CERT=$(oc get configmap -n prod2-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') log "Enabling federation for prod-mesh" -sed "s:{{STAGE_MESH_CERT}}:$STAGE_MESH_CERT:g" prod1-stage-mesh-ca-root-cert.yaml | oc apply -f - -oc apply -f prod1-smp.yaml -oc apply -f prod1-iss.yaml +sed "s:{{STAGE_MESH_CERT}}:$STAGE_MESH_CERT:g" prod2-stage-mesh-ca-root-cert.yaml | oc apply -f - +oc apply -f prod2-smp.yaml +oc apply -f prod2-iss.yaml log "Installing VirtualService for prod-mesh" -oc apply -n prod1-5gcore -f prod-vs-mirror-details.yaml +oc apply -n prod2-5gcore -f prod2-vs-mirror-details.yaml log "INSTALLATION COMPLETE" -oc -n prod1-mesh get servicemeshpeer prod2-mesh -o json | jq .status -oc -n prod1-mesh get importedservicesets prod2-mesh -o json | jq .status - - - +oc -n prod2-mesh get servicemeshpeer prod1-mesh -o json | jq .status +oc -n prod2-mesh get importedservicesets prod1-mesh -o json | jq .status From 26e35465f98d69db033fa2ad18e472a4efcd5810 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:44:37 -0500 Subject: [PATCH 326/449] Create deploy-prod1-5gcore.sh --- 5gcore/mesh/site1/deploy-prod1-5gcore.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 5gcore/mesh/site1/deploy-prod1-5gcore.sh diff --git a/5gcore/mesh/site1/deploy-prod1-5gcore.sh b/5gcore/mesh/site1/deploy-prod1-5gcore.sh new file mode 100644 index 0000000..861abda --- /dev/null +++ b/5gcore/mesh/site1/deploy-prod1-5gcore.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +#Author: fenar +echo -e "Configuring privileged access - Sorry it is what is....\n" +echo +oc adm policy add-scc-to-user anyuid -z default +oc adm policy add-scc-to-user hostaccess -z default +oc adm policy add-scc-to-user hostmount-anyuid -z default +oc adm policy add-scc-to-user privileged -z default +current_dir=$PWD +oc create secret generic mongodb-ca --from-file=$current_dir/5gcore/ca-tls-certificates/rds-combined-ca-bundle.pem +oc get secret +cd .. +cd .. +echo "Deploying Open5G Core Prod1" +helm install -f values.yaml prod1-5gcore ./ +echo "Enjoy The Open 5G Core on Production 1!" From 9136b12a04099d78f147179b5fdbf6c94901854b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:45:34 -0500 Subject: [PATCH 327/449] Create deploy-prod2-5gcore.sh --- 5gcore/mesh/site2/deploy-prod2-5gcore.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 5gcore/mesh/site2/deploy-prod2-5gcore.sh diff --git a/5gcore/mesh/site2/deploy-prod2-5gcore.sh b/5gcore/mesh/site2/deploy-prod2-5gcore.sh new file mode 100644 index 0000000..42e5674 --- /dev/null +++ b/5gcore/mesh/site2/deploy-prod2-5gcore.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +#Author: fenar +echo -e "Configuring privileged access - Sorry it is what is....\n" +echo +oc adm policy add-scc-to-user anyuid -z default +oc adm policy add-scc-to-user hostaccess -z default +oc adm policy add-scc-to-user hostmount-anyuid -z default +oc adm policy add-scc-to-user privileged -z default +current_dir=$PWD +oc create secret generic mongodb-ca --from-file=$current_dir/5gcore/ca-tls-certificates/rds-combined-ca-bundle.pem +oc get secret +cd .. +cd .. +echo "Deploying Open5G Core Prod1" +helm install -f values.yaml prod2-5gcore ./ +echo "Enjoy The Open 5G Core on Production 2!" From ebc997871e295140439a40d819fde518fa2e289b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:45:58 -0500 Subject: [PATCH 328/449] Update deploy-prod1mesh.sh --- 5gcore/mesh/site1/deploy-prod1mesh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/mesh/site1/deploy-prod1mesh.sh b/5gcore/mesh/site1/deploy-prod1mesh.sh index 9d935b4..eef8da1 100644 --- a/5gcore/mesh/site1/deploy-prod1mesh.sh +++ b/5gcore/mesh/site1/deploy-prod1mesh.sh @@ -19,7 +19,7 @@ log "Waiting for prod-mesh installation to complete" oc wait --for condition=Ready -n prod1-mesh smmr/default --timeout 300s log "Installing 5gcore application in prod-mesh" -./0-deploy5gcore.sh +./deploy-prod1-5gcore.sh log "Retrieving Istio CA Root certificates" PROD_MESH_CERT=$(oc get configmap -n prod1-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') From db2509a651526790ada5735098d8ab06e0eac86d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:46:24 -0500 Subject: [PATCH 329/449] Update deploy-prod2mesh.sh --- 5gcore/mesh/site2/deploy-prod2mesh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/mesh/site2/deploy-prod2mesh.sh b/5gcore/mesh/site2/deploy-prod2mesh.sh index 3a48fb9..ff1244d 100644 --- a/5gcore/mesh/site2/deploy-prod2mesh.sh +++ b/5gcore/mesh/site2/deploy-prod2mesh.sh @@ -19,7 +19,7 @@ log "Waiting for prod-mesh installation to complete" oc wait --for condition=Ready -n prod2-mesh smmr/default --timeout 300s log "Installing 5gcore application in prod-mesh" -./0-deploy5gcore.sh +./deploy-prod2-5gcore.sh log "Retrieving Istio CA Root certificates" PROD_MESH_CERT=$(oc get configmap -n prod2-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') From 299d16a4a5256a3c5abf82780d350b40187d09c5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:48:03 -0500 Subject: [PATCH 330/449] Create README.md --- 5gcore/mesh/README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 5gcore/mesh/README.md diff --git a/5gcore/mesh/README.md b/5gcore/mesh/README.md new file mode 100644 index 0000000..7152f3f --- /dev/null +++ b/5gcore/mesh/README.md @@ -0,0 +1,2 @@ +## Federated Mesh with Two 5g Core sites +Each folder has own 5g core site deployment files for 5gcore deployment inside
From 676fd2b8e13cbc072f3b662025d8ec300a948ede Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:48:31 -0500 Subject: [PATCH 331/449] Rename deploy-prod1mesh.sh to 0-deploy-prod1mesh.sh --- 5gcore/mesh/site1/{deploy-prod1mesh.sh => 0-deploy-prod1mesh.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site1/{deploy-prod1mesh.sh => 0-deploy-prod1mesh.sh} (100%) diff --git a/5gcore/mesh/site1/deploy-prod1mesh.sh b/5gcore/mesh/site1/0-deploy-prod1mesh.sh similarity index 100% rename from 5gcore/mesh/site1/deploy-prod1mesh.sh rename to 5gcore/mesh/site1/0-deploy-prod1mesh.sh From a920dcdb18534a1a5f059b937bc952b5947cd74e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:48:56 -0500 Subject: [PATCH 332/449] Rename deploy-prod2mesh.sh to 0-deploy-prod2mesh.sh --- 5gcore/mesh/site2/{deploy-prod2mesh.sh => 0-deploy-prod2mesh.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site2/{deploy-prod2mesh.sh => 0-deploy-prod2mesh.sh} (100%) diff --git a/5gcore/mesh/site2/deploy-prod2mesh.sh b/5gcore/mesh/site2/0-deploy-prod2mesh.sh similarity index 100% rename from 5gcore/mesh/site2/deploy-prod2mesh.sh rename to 5gcore/mesh/site2/0-deploy-prod2mesh.sh From 1ba841eae4bd3aa206f12579c811aa5464c22152 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:50:11 -0500 Subject: [PATCH 333/449] Update README.md --- 5gcore/mesh/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/5gcore/mesh/README.md b/5gcore/mesh/README.md index 7152f3f..92fd120 100644 --- a/5gcore/mesh/README.md +++ b/5gcore/mesh/README.md @@ -1,2 +1,4 @@ ## Federated Mesh with Two 5g Core sites Each folder has own 5g core site deployment files for 5gcore deployment inside
+0-deploy-prod1mesh.sh -> Site1 deployment
+0-deploy-prod2mesh.sh -> Site2 deployment
From 6d7e3079eed9e235fe492274f752e6a108d4247d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:53:09 -0500 Subject: [PATCH 334/449] Delete 0-deploy-prod1mesh.sh --- 5gcore/mesh/site1/0-deploy-prod1mesh.sh | 40 ------------------------- 1 file changed, 40 deletions(-) delete mode 100644 5gcore/mesh/site1/0-deploy-prod1mesh.sh diff --git a/5gcore/mesh/site1/0-deploy-prod1mesh.sh b/5gcore/mesh/site1/0-deploy-prod1mesh.sh deleted file mode 100644 index eef8da1..0000000 --- a/5gcore/mesh/site1/0-deploy-prod1mesh.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -set -e - -log() { - echo - echo "##### $*" -} - -log "Creating projects for prod1-mesh" -oc new-project prod1-mesh || true -oc new-project prod1-5gcore || true - -log "Installing control plane for prod-mesh" -oc apply -f prod1-smcp.yaml -oc apply -f prod1-smmr.yaml - -log "Waiting for prod-mesh installation to complete" -oc wait --for condition=Ready -n prod1-mesh smmr/default --timeout 300s - -log "Installing 5gcore application in prod-mesh" -./deploy-prod1-5gcore.sh - -log "Retrieving Istio CA Root certificates" -PROD_MESH_CERT=$(oc get configmap -n prod1-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') - -log "Enabling federation for prod-mesh" -sed "s:{{STAGE_MESH_CERT}}:$STAGE_MESH_CERT:g" prod1-stage-mesh-ca-root-cert.yaml | oc apply -f - -oc apply -f prod1-smp.yaml -oc apply -f prod1-iss.yaml - -log "Installing VirtualService for prod-mesh" -oc apply -n prod1-5gcore -f prod-vs-mirror-details.yaml - -log "INSTALLATION COMPLETE" -oc -n prod1-mesh get servicemeshpeer prod2-mesh -o json | jq .status -oc -n prod1-mesh get importedservicesets prod2-mesh -o json | jq .status - - - From af393db5d7600991702b4fbff536af2a784e4af5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:53:24 -0500 Subject: [PATCH 335/449] Delete 0-deploy-prod2mesh.sh --- 5gcore/mesh/site2/0-deploy-prod2mesh.sh | 37 ------------------------- 1 file changed, 37 deletions(-) delete mode 100644 5gcore/mesh/site2/0-deploy-prod2mesh.sh diff --git a/5gcore/mesh/site2/0-deploy-prod2mesh.sh b/5gcore/mesh/site2/0-deploy-prod2mesh.sh deleted file mode 100644 index ff1244d..0000000 --- a/5gcore/mesh/site2/0-deploy-prod2mesh.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -set -e - -log() { - echo - echo "##### $*" -} - -log "Creating projects for prod2-mesh" -oc new-project prod2-mesh || true -oc new-project prod2-5gcore || true - -log "Installing control plane for prod-mesh" -oc apply -f prod2-smcp.yaml -oc apply -f prod2-smmr.yaml - -log "Waiting for prod-mesh installation to complete" -oc wait --for condition=Ready -n prod2-mesh smmr/default --timeout 300s - -log "Installing 5gcore application in prod-mesh" -./deploy-prod2-5gcore.sh - -log "Retrieving Istio CA Root certificates" -PROD_MESH_CERT=$(oc get configmap -n prod2-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') - -log "Enabling federation for prod-mesh" -sed "s:{{STAGE_MESH_CERT}}:$STAGE_MESH_CERT:g" prod2-stage-mesh-ca-root-cert.yaml | oc apply -f - -oc apply -f prod2-smp.yaml -oc apply -f prod2-iss.yaml - -log "Installing VirtualService for prod-mesh" -oc apply -n prod2-5gcore -f prod2-vs-mirror-details.yaml - -log "INSTALLATION COMPLETE" -oc -n prod2-mesh get servicemeshpeer prod1-mesh -o json | jq .status -oc -n prod2-mesh get importedservicesets prod1-mesh -o json | jq .status From afba581b606d25d9864a5c4fb95975753f9e38f8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:54:55 -0500 Subject: [PATCH 336/449] Update prod1-mesh-ca-root-cert.yaml --- 5gcore/mesh/site2/prod1-mesh-ca-root-cert.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5gcore/mesh/site2/prod1-mesh-ca-root-cert.yaml b/5gcore/mesh/site2/prod1-mesh-ca-root-cert.yaml index 86c0854..f1b9532 100644 --- a/5gcore/mesh/site2/prod1-mesh-ca-root-cert.yaml +++ b/5gcore/mesh/site2/prod1-mesh-ca-root-cert.yaml @@ -3,8 +3,8 @@ kind: ConfigMap apiVersion: v1 metadata: - name: prod2-mesh-ca-root-cert - namespace: prod1-mesh + name: prod1-mesh-ca-root-cert + namespace: prod2-mesh data: root-cert.pem: |- - {{STAGE_MESH_CERT}} + {{PROD_MESH_CERT}} From 6e929bef3d52600b8f06ce609c090b1bebd69780 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:56:29 -0500 Subject: [PATCH 337/449] Update and rename prod2-iss.yaml to prod2-ess.yaml --- 5gcore/mesh/site2/prod2-ess.yaml | 15 +++++++++++++++ 5gcore/mesh/site2/prod2-iss.yaml | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 5gcore/mesh/site2/prod2-ess.yaml delete mode 100644 5gcore/mesh/site2/prod2-iss.yaml diff --git a/5gcore/mesh/site2/prod2-ess.yaml b/5gcore/mesh/site2/prod2-ess.yaml new file mode 100644 index 0000000..fbde882 --- /dev/null +++ b/5gcore/mesh/site2/prod2-ess.yaml @@ -0,0 +1,15 @@ +kind: ExportedServiceSet +apiVersion: federation.maistra.io/v1 +metadata: + name: prod1-mesh + namespace: prod2-mesh +spec: + exportRules: + - type: LabelSelector + labelSelector: + namespace: prod2-5gcore + selector: + matchLabels: + app: details + alias: + namespace: 5gcore diff --git a/5gcore/mesh/site2/prod2-iss.yaml b/5gcore/mesh/site2/prod2-iss.yaml deleted file mode 100644 index c51c4bf..0000000 --- a/5gcore/mesh/site2/prod2-iss.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: federation.maistra.io/v1 -kind: ImportedServiceSet -metadata: - name: prod2-mesh - namespace: prod1-mesh -spec: - importRules: - - importAsLocal: false - nameSelector: - alias: - name: details-v2 - namespace: prod1-5gcore - name: details - namespace: prod2-5gcore - type: NameSelector From 57765b0abcd4d2db3943ea98500c038081465794 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:58:55 -0500 Subject: [PATCH 338/449] Update prod2-smcp.yaml --- 5gcore/mesh/site2/prod2-smcp.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/5gcore/mesh/site2/prod2-smcp.yaml b/5gcore/mesh/site2/prod2-smcp.yaml index 5d1e671..5609797 100644 --- a/5gcore/mesh/site2/prod2-smcp.yaml +++ b/5gcore/mesh/site2/prod2-smcp.yaml @@ -1,11 +1,11 @@ apiVersion: maistra.io/v2 kind: ServiceMeshControlPlane metadata: - namespace: prod1-mesh - name: prod1-mesh + namespace: prod2-mesh + name: prod2-mesh spec: cluster: - name: production-cluster + name: production2-cluster addons: grafana: enabled: true @@ -38,12 +38,12 @@ spec: stage-mesh-egress: enabled: true requestedNetworkView: - - network-stage-mesh + - network-prod1-mesh routerMode: sni-dnat service: metadata: labels: - federation.maistra.io/egress-for: prod2-mesh + federation.maistra.io/egress-for: prod1-mesh ports: - port: 15443 name: tls @@ -57,7 +57,7 @@ spec: type: ClusterIP metadata: labels: - federation.maistra.io/ingress-for: prod2-mesh + federation.maistra.io/ingress-for: prod1-mesh ports: - port: 15443 name: tls @@ -65,4 +65,4 @@ spec: name: https-discovery #note HTTPS here security: trust: - domain: prod1-mesh.local + domain: prod2-mesh.local From 88fcdc243d72222404bfc39a7488d440258f61fa Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 09:59:16 -0500 Subject: [PATCH 339/449] Update prod2-smmr.yaml --- 5gcore/mesh/site2/prod2-smmr.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/mesh/site2/prod2-smmr.yaml b/5gcore/mesh/site2/prod2-smmr.yaml index ca0bb5a..0dabfdf 100644 --- a/5gcore/mesh/site2/prod2-smmr.yaml +++ b/5gcore/mesh/site2/prod2-smmr.yaml @@ -2,7 +2,7 @@ apiVersion: maistra.io/v1 kind: ServiceMeshMemberRoll metadata: name: default - namespace: prod1-mesh + namespace: prod2-mesh spec: members: - - prod1-5gcore + - prod2-5gcore From c9b4da9327842a0bb61f9d52992ef263726fcdf3 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:00:11 -0500 Subject: [PATCH 340/449] Update prod2-smp.yaml --- 5gcore/mesh/site2/prod2-smp.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/5gcore/mesh/site2/prod2-smp.yaml b/5gcore/mesh/site2/prod2-smp.yaml index 7dece77..0e52150 100644 --- a/5gcore/mesh/site2/prod2-smp.yaml +++ b/5gcore/mesh/site2/prod2-smp.yaml @@ -1,22 +1,22 @@ kind: ServiceMeshPeer apiVersion: federation.maistra.io/v1 metadata: - name: prod2-mesh - namespace: prod1-mesh + name: prod1-mesh + namespace: prod2-mesh spec: remote: addresses: - - prod1-mesh-ingress.prod2-mesh.svc.cluster.local + - prod2-mesh-ingress.prod2-mesh.svc.cluster.local discoveryPort: 8188 servicePort: 15443 gateways: ingress: - name: prod2-mesh-ingress + name: prod1-mesh-ingress egress: - name: prod2-mesh-egress + name: prod1-mesh-egress security: - trustDomain: prod2-mesh.local - clientID: prod2-mesh.local/ns/prod2-mesh/sa/prod1-mesh-egress-service-account + trustDomain: prod1-mesh.local + clientID: prod1-mesh.local/ns/prod1-mesh/sa/prod2-mesh-egress-service-account certificateChain: kind: ConfigMap - name: prod2-mesh-ca-root-cert + name: prod1-mesh-ca-root-cert From b7b71c909cdfe0559b4a829eaacda436b16e9985 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:03:52 -0500 Subject: [PATCH 341/449] Update prod2-vs-mirror-details.yaml --- 5gcore/mesh/site2/prod2-vs-mirror-details.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/5gcore/mesh/site2/prod2-vs-mirror-details.yaml b/5gcore/mesh/site2/prod2-vs-mirror-details.yaml index 6ff6315..e8e1527 100644 --- a/5gcore/mesh/site2/prod2-vs-mirror-details.yaml +++ b/5gcore/mesh/site2/prod2-vs-mirror-details.yaml @@ -2,15 +2,15 @@ kind: VirtualService apiVersion: networking.istio.io/v1alpha3 metadata: name: details - namespace: prod1-5gcore + namespace: prod2-5gcore spec: hosts: - - details.prod1-5gcore.svc.cluster.local + - details.prod2-5gcore.svc.cluster.local http: - mirror: - host: details-v2.prod1-5gcore.svc.prod2-mesh-imports.local + host: details-v1.prod2-5gcore.svc.prod1-mesh-imports.local route: - destination: - host: details.prod1-5gcore.svc.cluster.local + host: details.prod2-5gcore.svc.cluster.local subset: v1 weight: 100 From 5bff96d34f52d5003f3ff2352a68b63ae10838ce Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:04:37 -0500 Subject: [PATCH 342/449] Update prod2-vs-split-details.yaml --- 5gcore/mesh/site2/prod2-vs-split-details.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/5gcore/mesh/site2/prod2-vs-split-details.yaml b/5gcore/mesh/site2/prod2-vs-split-details.yaml index 62e872f..403794e 100644 --- a/5gcore/mesh/site2/prod2-vs-split-details.yaml +++ b/5gcore/mesh/site2/prod2-vs-split-details.yaml @@ -2,16 +2,16 @@ kind: VirtualService apiVersion: networking.istio.io/v1alpha3 metadata: name: details - namespace: prod1-5gcore + namespace: prod2-5gcore spec: hosts: - - details.prod1-5gcore.svc.cluster.local + - details.prod2-5gcore.svc.cluster.local http: - route: - destination: - host: details.prod1-5gcore.svc.cluster.local + host: details.prod2-5gcore.svc.cluster.local subset: v1 weight: 80 - destination: - host: details-v2.prod1-5gcore.svc.prod2-mesh-imports.local + host: details-v2.prod2-5gcore.svc.prod1-mesh-imports.local weight: 20 From 451c246aec5f8d73c0d511ed03c4ad0fe31d23e6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:04:54 -0500 Subject: [PATCH 343/449] Update prod2-vs-mirror-details.yaml --- 5gcore/mesh/site2/prod2-vs-mirror-details.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/mesh/site2/prod2-vs-mirror-details.yaml b/5gcore/mesh/site2/prod2-vs-mirror-details.yaml index e8e1527..93d5b57 100644 --- a/5gcore/mesh/site2/prod2-vs-mirror-details.yaml +++ b/5gcore/mesh/site2/prod2-vs-mirror-details.yaml @@ -8,7 +8,7 @@ spec: - details.prod2-5gcore.svc.cluster.local http: - mirror: - host: details-v1.prod2-5gcore.svc.prod1-mesh-imports.local + host: details-v2.prod2-5gcore.svc.prod1-mesh-imports.local route: - destination: host: details.prod2-5gcore.svc.cluster.local From 6ab00c05e5b59f13bf08906bae5ebebb9108355f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:12:20 -0500 Subject: [PATCH 344/449] Delete deploy-prod2-5gcore.sh --- 5gcore/mesh/site2/deploy-prod2-5gcore.sh | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 5gcore/mesh/site2/deploy-prod2-5gcore.sh diff --git a/5gcore/mesh/site2/deploy-prod2-5gcore.sh b/5gcore/mesh/site2/deploy-prod2-5gcore.sh deleted file mode 100644 index 42e5674..0000000 --- a/5gcore/mesh/site2/deploy-prod2-5gcore.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -#Author: fenar -echo -e "Configuring privileged access - Sorry it is what is....\n" -echo -oc adm policy add-scc-to-user anyuid -z default -oc adm policy add-scc-to-user hostaccess -z default -oc adm policy add-scc-to-user hostmount-anyuid -z default -oc adm policy add-scc-to-user privileged -z default -current_dir=$PWD -oc create secret generic mongodb-ca --from-file=$current_dir/5gcore/ca-tls-certificates/rds-combined-ca-bundle.pem -oc get secret -cd .. -cd .. -echo "Deploying Open5G Core Prod1" -helm install -f values.yaml prod2-5gcore ./ -echo "Enjoy The Open 5G Core on Production 2!" From 0558ccc9a3e37d1067abce191091a96bd1800525 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:12:34 -0500 Subject: [PATCH 345/449] Delete prod2-vs-split-details.yaml --- 5gcore/mesh/site2/prod2-vs-split-details.yaml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 5gcore/mesh/site2/prod2-vs-split-details.yaml diff --git a/5gcore/mesh/site2/prod2-vs-split-details.yaml b/5gcore/mesh/site2/prod2-vs-split-details.yaml deleted file mode 100644 index 403794e..0000000 --- a/5gcore/mesh/site2/prod2-vs-split-details.yaml +++ /dev/null @@ -1,17 +0,0 @@ -kind: VirtualService -apiVersion: networking.istio.io/v1alpha3 -metadata: - name: details - namespace: prod2-5gcore -spec: - hosts: - - details.prod2-5gcore.svc.cluster.local - http: - - route: - - destination: - host: details.prod2-5gcore.svc.cluster.local - subset: v1 - weight: 80 - - destination: - host: details-v2.prod2-5gcore.svc.prod1-mesh-imports.local - weight: 20 From 61912fd242ee615ba780959797b3c4920fbc9c08 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:12:45 -0500 Subject: [PATCH 346/449] Delete prod2-vs-mirror-details.yaml --- 5gcore/mesh/site2/prod2-vs-mirror-details.yaml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 5gcore/mesh/site2/prod2-vs-mirror-details.yaml diff --git a/5gcore/mesh/site2/prod2-vs-mirror-details.yaml b/5gcore/mesh/site2/prod2-vs-mirror-details.yaml deleted file mode 100644 index 93d5b57..0000000 --- a/5gcore/mesh/site2/prod2-vs-mirror-details.yaml +++ /dev/null @@ -1,16 +0,0 @@ -kind: VirtualService -apiVersion: networking.istio.io/v1alpha3 -metadata: - name: details - namespace: prod2-5gcore -spec: - hosts: - - details.prod2-5gcore.svc.cluster.local - http: - - mirror: - host: details-v2.prod2-5gcore.svc.prod1-mesh-imports.local - route: - - destination: - host: details.prod2-5gcore.svc.cluster.local - subset: v1 - weight: 100 From 677f53fabbfee84a23324a9fb8a79c19d384d814 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:21:04 -0500 Subject: [PATCH 347/449] Create prod2-amf-v2.yaml --- 5gcore/mesh/site2/prod2-amf-v2.yaml | 82 +++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 5gcore/mesh/site2/prod2-amf-v2.yaml diff --git a/5gcore/mesh/site2/prod2-amf-v2.yaml b/5gcore/mesh/site2/prod2-amf-v2.yaml new file mode 100644 index 0000000..ef8a835 --- /dev/null +++ b/5gcore/mesh/site2/prod2-amf-v2.yaml @@ -0,0 +1,82 @@ +apiVersion: v1 +kind: Service +metadata: + name: amf-open5gs-sctp + labels: + epc-mode: amf + version: v2 +spec: + type: NodePort + selector: + epc-mode: amf + ports: + - protocol: SCTP + port: 38412 + targetPort: 38412 + nodePort: 30412 +--- +apiVersion: v1 +kind: Service +metadata: + name: open5gs-amf + labels: + epc-mode: amf + version: v2 +spec: + type: NodePort + selector: + epc-mode: amf + ports: + - protocol: TCP + port: 80 + targetPort: 80 + nodePort: 30080 +--- +kind: NetworkPolicy +apiVersion: networking.k8s.io/v1 +metadata: + name: allow-sctp-on-http +spec: + podSelector: + matchLabels: + epc-mode: amf + ingress: + - ports: + - protocol: SCTP + port: 80 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: open5gs-amf-d + labels: + epc-mode: amf + version: v2 +spec: + replicas: 1 + selector: + matchLabels: + epc-mode: amf + version: v2 + template: + metadata: + annotations: + k8s.v1.cni.cncf.io/networks: '[{"name": "macvlan-multus", "ips": [ "192.168.100.201/24"]}]' + sidecar.istio.io/inject: "true" + labels: + epc-mode: amf + version: v2 + spec: + containers: + - name: amf + image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" + imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} + command: ["open5gs-amfd", "-d", "-c", "/open5gs/config-map/amf.yaml"] + volumeMounts: + - name: open5gs-amf-config + mountPath: /open5gs/config-map/amf.yaml + subPath: "amf.yaml" + volumes: + - name: open5gs-amf-config + configMap: + name: open5gs-amf-config From 922fb18ec2bc6f2c70e28e52a612932d70b0c403 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:27:38 -0500 Subject: [PATCH 348/449] Delete prod1-vs-split-details.yaml --- 5gcore/mesh/site1/prod1-vs-split-details.yaml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 5gcore/mesh/site1/prod1-vs-split-details.yaml diff --git a/5gcore/mesh/site1/prod1-vs-split-details.yaml b/5gcore/mesh/site1/prod1-vs-split-details.yaml deleted file mode 100644 index 62e872f..0000000 --- a/5gcore/mesh/site1/prod1-vs-split-details.yaml +++ /dev/null @@ -1,17 +0,0 @@ -kind: VirtualService -apiVersion: networking.istio.io/v1alpha3 -metadata: - name: details - namespace: prod1-5gcore -spec: - hosts: - - details.prod1-5gcore.svc.cluster.local - http: - - route: - - destination: - host: details.prod1-5gcore.svc.cluster.local - subset: v1 - weight: 80 - - destination: - host: details-v2.prod1-5gcore.svc.prod2-mesh-imports.local - weight: 20 From 94fdbf10f8868035a0ae5de264c083b1bfe75c51 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:29:55 -0500 Subject: [PATCH 349/449] Create deploy-federated5gcore.sh --- 5gcore/mesh/deploy-federated5gcore.sh | 73 +++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 5gcore/mesh/deploy-federated5gcore.sh diff --git a/5gcore/mesh/deploy-federated5gcore.sh b/5gcore/mesh/deploy-federated5gcore.sh new file mode 100644 index 0000000..56ef6a5 --- /dev/null +++ b/5gcore/mesh/deploy-federated5gcore.sh @@ -0,0 +1,73 @@ +#!/bin/bash + +set -e + +log() { + echo + echo "##### $*" +} + +log "Creating projects for prod-mesh" +oc new-project prod1-mesh || true +oc new-project prod1-5gcore || true +oc adm policy add-scc-to-user anyuid -z default +oc adm policy add-scc-to-user hostaccess -z default +oc adm policy add-scc-to-user hostmount-anyuid -z default +oc adm policy add-scc-to-user privileged -z default + +log "Installing control plane for prod-mesh" +oc apply -f site1/smcp.yaml +oc apply -f site1/smmr.yaml + +log "Creating projects for stage-mesh" +oc new-project prod2-mesh || true +oc new-project prod2-5gcore|| true + +oc adm policy add-scc-to-user anyuid -z default +oc adm policy add-scc-to-user hostaccess -z default +oc adm policy add-scc-to-user hostmount-anyuid -z default +oc adm policy add-scc-to-user privileged -z default + +log "Installing control plane for stage-mesh" +oc apply -f site2/smcp.yaml +oc apply -f site2/smmr.yaml + +log "Waiting for prod1-mesh installation to complete" +oc wait --for condition=Ready -n prod1-mesh smmr/default --timeout 300s + +log "Waiting for prod2-mesh installation to complete" +oc wait --for condition=Ready -n prod2-mesh smmr/default --timeout 300s + +log "Installing AMF v2 service in prod2-mesh" +oc apply -n prod2-5gcore -f site2/prod2-amf-v2.yaml + +log "Installing 5gcore in prod1-mesh" +./site1/deploy-prod1-5gcore.sh + +log "Retrieving Istio CA Root certificates" +PROD1_MESH_CERT=$(oc get configmap -n prod1-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') +PROD2_MESH_CERT=$(oc get configmap -n prod2-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') + +log "Enabling federation for prod-mesh" +sed "s:{{PROD2_MESH_CERT}}:$PROD2_MESH_CERT:g" prod1-mesh/prod2-mesh-ca-root-cert.yaml | oc apply -f - +oc apply -f site1/prod1-smp.yaml +oc apply -f site1/prod1-iss.yaml + +log "Enabling federation for prod2-mesh" +sed "s:{{PROD1_MESH_CERT}}:$PROD1_MESH_CERT:g" prod2-mesh/prod1-mesh-ca-root-cert.yaml | oc apply -f - +oc apply -f site2/prod2-smp.yaml +oc apply -f site2/prod2-ess.yaml + +log "Installing VirtualService for prod-mesh" +oc apply -n prod1-5gcore -f site1/prod1-vs-mirror-details.yaml + +log "INSTALLATION COMPLETE +#Run the following command in the prod-mesh to check the connection status: + oc -n prod1-mesh get servicemeshpeer prod2-mesh -o json | jq .status +#Run the following command to check the connection status in stage-mesh: + oc -n prod2-mesh get servicemeshpeer prod1-mesh -o json | jq .status +#Check if services from stage-mesh are imported into prod-mesh: + oc -n prod1-mesh get importedservicesets prod2-mesh -o json | jq .status +#Check if services from stage-mesh are exported: + oc -n prod2-mesh get exportedservicesets prod1-mesh -o json | jq .status +" From 81afc2515c180a0026111bd6be44d9fd9e12ff80 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:30:40 -0500 Subject: [PATCH 350/449] Delete README.md --- 5gcore/mesh/README.md | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 5gcore/mesh/README.md diff --git a/5gcore/mesh/README.md b/5gcore/mesh/README.md deleted file mode 100644 index 92fd120..0000000 --- a/5gcore/mesh/README.md +++ /dev/null @@ -1,4 +0,0 @@ -## Federated Mesh with Two 5g Core sites -Each folder has own 5g core site deployment files for 5gcore deployment inside
-0-deploy-prod1mesh.sh -> Site1 deployment
-0-deploy-prod2mesh.sh -> Site2 deployment
From 7db26012c983fd05854022dc9682e55234a526f2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:33:36 -0500 Subject: [PATCH 351/449] Update deploy-federated5gcore.sh --- 5gcore/mesh/deploy-federated5gcore.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/5gcore/mesh/deploy-federated5gcore.sh b/5gcore/mesh/deploy-federated5gcore.sh index 56ef6a5..569c563 100644 --- a/5gcore/mesh/deploy-federated5gcore.sh +++ b/5gcore/mesh/deploy-federated5gcore.sh @@ -19,7 +19,7 @@ log "Installing control plane for prod-mesh" oc apply -f site1/smcp.yaml oc apply -f site1/smmr.yaml -log "Creating projects for stage-mesh" +log "Creating projects for prod2-mesh" oc new-project prod2-mesh || true oc new-project prod2-5gcore|| true @@ -28,7 +28,7 @@ oc adm policy add-scc-to-user hostaccess -z default oc adm policy add-scc-to-user hostmount-anyuid -z default oc adm policy add-scc-to-user privileged -z default -log "Installing control plane for stage-mesh" +log "Installing control plane for prod2-mesh" oc apply -f site2/smcp.yaml oc apply -f site2/smmr.yaml @@ -64,10 +64,10 @@ oc apply -n prod1-5gcore -f site1/prod1-vs-mirror-details.yaml log "INSTALLATION COMPLETE #Run the following command in the prod-mesh to check the connection status: oc -n prod1-mesh get servicemeshpeer prod2-mesh -o json | jq .status -#Run the following command to check the connection status in stage-mesh: +#Run the following command to check the connection status in prod2-mesh: oc -n prod2-mesh get servicemeshpeer prod1-mesh -o json | jq .status -#Check if services from stage-mesh are imported into prod-mesh: +#Check if services from prod2-mesh are imported into prod-mesh: oc -n prod1-mesh get importedservicesets prod2-mesh -o json | jq .status -#Check if services from stage-mesh are exported: +#Check if services from prod2-mesh are exported: oc -n prod2-mesh get exportedservicesets prod1-mesh -o json | jq .status " From 1104e4a1cec7ebd7ec4bccab612de24193971cff Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:34:00 -0500 Subject: [PATCH 352/449] Rename prod1-smcp.yaml to smcp.yaml --- 5gcore/mesh/site1/{prod1-smcp.yaml => smcp.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site1/{prod1-smcp.yaml => smcp.yaml} (100%) diff --git a/5gcore/mesh/site1/prod1-smcp.yaml b/5gcore/mesh/site1/smcp.yaml similarity index 100% rename from 5gcore/mesh/site1/prod1-smcp.yaml rename to 5gcore/mesh/site1/smcp.yaml From 36e1fc2f13735fcd4854ddaa3af7b7b26b30a08b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:34:20 -0500 Subject: [PATCH 353/449] Rename prod1-smmr.yaml to smmr.yaml --- 5gcore/mesh/site1/{prod1-smmr.yaml => smmr.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site1/{prod1-smmr.yaml => smmr.yaml} (100%) diff --git a/5gcore/mesh/site1/prod1-smmr.yaml b/5gcore/mesh/site1/smmr.yaml similarity index 100% rename from 5gcore/mesh/site1/prod1-smmr.yaml rename to 5gcore/mesh/site1/smmr.yaml From 974c031aa669b5e246a786d22b8dcd352c3cd1a1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:34:57 -0500 Subject: [PATCH 354/449] Rename prod1-smp.yaml to smp.yaml --- 5gcore/mesh/site1/{prod1-smp.yaml => smp.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site1/{prod1-smp.yaml => smp.yaml} (100%) diff --git a/5gcore/mesh/site1/prod1-smp.yaml b/5gcore/mesh/site1/smp.yaml similarity index 100% rename from 5gcore/mesh/site1/prod1-smp.yaml rename to 5gcore/mesh/site1/smp.yaml From 7464d54393027cebd359b19da9a1f1b0df9642b3 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:35:10 -0500 Subject: [PATCH 355/449] Rename prod1-iss.yaml to iss.yaml --- 5gcore/mesh/site1/{prod1-iss.yaml => iss.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site1/{prod1-iss.yaml => iss.yaml} (100%) diff --git a/5gcore/mesh/site1/prod1-iss.yaml b/5gcore/mesh/site1/iss.yaml similarity index 100% rename from 5gcore/mesh/site1/prod1-iss.yaml rename to 5gcore/mesh/site1/iss.yaml From 7a2b1bf495f07d08224d5382d24329e096831d27 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:35:52 -0500 Subject: [PATCH 356/449] Update deploy-prod1-5gcore.sh --- 5gcore/mesh/site1/deploy-prod1-5gcore.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/5gcore/mesh/site1/deploy-prod1-5gcore.sh b/5gcore/mesh/site1/deploy-prod1-5gcore.sh index 861abda..e5bea03 100644 --- a/5gcore/mesh/site1/deploy-prod1-5gcore.sh +++ b/5gcore/mesh/site1/deploy-prod1-5gcore.sh @@ -1,11 +1,5 @@ #!/usr/bin/env bash #Author: fenar -echo -e "Configuring privileged access - Sorry it is what is....\n" -echo -oc adm policy add-scc-to-user anyuid -z default -oc adm policy add-scc-to-user hostaccess -z default -oc adm policy add-scc-to-user hostmount-anyuid -z default -oc adm policy add-scc-to-user privileged -z default current_dir=$PWD oc create secret generic mongodb-ca --from-file=$current_dir/5gcore/ca-tls-certificates/rds-combined-ca-bundle.pem oc get secret From 861a9c3f1c9c7d38ec634ad4ad2fd5c0a3aa2fe3 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:36:29 -0500 Subject: [PATCH 357/449] Update and rename prod1-vs-mirror-details.yaml to vs-mirror-details.yaml --- .../{prod1-vs-mirror-details.yaml => vs-mirror-details.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site1/{prod1-vs-mirror-details.yaml => vs-mirror-details.yaml} (100%) diff --git a/5gcore/mesh/site1/prod1-vs-mirror-details.yaml b/5gcore/mesh/site1/vs-mirror-details.yaml similarity index 100% rename from 5gcore/mesh/site1/prod1-vs-mirror-details.yaml rename to 5gcore/mesh/site1/vs-mirror-details.yaml From 3855a70f108a1cae8b823c6f0cca7a8d4e35c827 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:37:00 -0500 Subject: [PATCH 358/449] Update and rename prod2-mesh-ca-root-cert.yaml to mesh-ca-root-cert.yaml --- .../{prod2-mesh-ca-root-cert.yaml => mesh-ca-root-cert.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename 5gcore/mesh/site1/{prod2-mesh-ca-root-cert.yaml => mesh-ca-root-cert.yaml} (84%) diff --git a/5gcore/mesh/site1/prod2-mesh-ca-root-cert.yaml b/5gcore/mesh/site1/mesh-ca-root-cert.yaml similarity index 84% rename from 5gcore/mesh/site1/prod2-mesh-ca-root-cert.yaml rename to 5gcore/mesh/site1/mesh-ca-root-cert.yaml index 86c0854..797d309 100644 --- a/5gcore/mesh/site1/prod2-mesh-ca-root-cert.yaml +++ b/5gcore/mesh/site1/mesh-ca-root-cert.yaml @@ -7,4 +7,4 @@ metadata: namespace: prod1-mesh data: root-cert.pem: |- - {{STAGE_MESH_CERT}} + {{PROD2_MESH_CERT}} From b1b552fd4155922422e4e9bc2bc233e3a5449dec Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:38:16 -0500 Subject: [PATCH 359/449] Update deploy-federated5gcore.sh --- 5gcore/mesh/deploy-federated5gcore.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/mesh/deploy-federated5gcore.sh b/5gcore/mesh/deploy-federated5gcore.sh index 569c563..7128f75 100644 --- a/5gcore/mesh/deploy-federated5gcore.sh +++ b/5gcore/mesh/deploy-federated5gcore.sh @@ -38,10 +38,10 @@ oc wait --for condition=Ready -n prod1-mesh smmr/default --timeout 300s log "Waiting for prod2-mesh installation to complete" oc wait --for condition=Ready -n prod2-mesh smmr/default --timeout 300s -log "Installing AMF v2 service in prod2-mesh" +log "Installing AMF CNF service in prod2-mesh" oc apply -n prod2-5gcore -f site2/prod2-amf-v2.yaml -log "Installing 5gcore in prod1-mesh" +log "Installing Full 5gcore in prod1-mesh" ./site1/deploy-prod1-5gcore.sh log "Retrieving Istio CA Root certificates" From 83414d0c510894056f2a3e8b422bcdbdc7693795 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 10:38:55 -0500 Subject: [PATCH 360/449] Update deploy-federated5gcore.sh --- 5gcore/mesh/deploy-federated5gcore.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/mesh/deploy-federated5gcore.sh b/5gcore/mesh/deploy-federated5gcore.sh index 7128f75..6d2ccb4 100644 --- a/5gcore/mesh/deploy-federated5gcore.sh +++ b/5gcore/mesh/deploy-federated5gcore.sh @@ -59,7 +59,7 @@ oc apply -f site2/prod2-smp.yaml oc apply -f site2/prod2-ess.yaml log "Installing VirtualService for prod-mesh" -oc apply -n prod1-5gcore -f site1/prod1-vs-mirror-details.yaml +oc apply -n prod1-5gcore -f site1/vs-mirror-details.yaml log "INSTALLATION COMPLETE #Run the following command in the prod-mesh to check the connection status: From 9ff20d3474354302c6a6e1938812ccdc71f72c8c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:16:54 -0500 Subject: [PATCH 361/449] Rename prod2-smmr.yaml to smmr.yaml --- 5gcore/mesh/site2/{prod2-smmr.yaml => smmr.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site2/{prod2-smmr.yaml => smmr.yaml} (100%) diff --git a/5gcore/mesh/site2/prod2-smmr.yaml b/5gcore/mesh/site2/smmr.yaml similarity index 100% rename from 5gcore/mesh/site2/prod2-smmr.yaml rename to 5gcore/mesh/site2/smmr.yaml From c35d3553490740db07358ed8eae15787944eaad3 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:17:06 -0500 Subject: [PATCH 362/449] Rename prod2-smcp.yaml to smcp.yaml --- 5gcore/mesh/site2/{prod2-smcp.yaml => smcp.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site2/{prod2-smcp.yaml => smcp.yaml} (100%) diff --git a/5gcore/mesh/site2/prod2-smcp.yaml b/5gcore/mesh/site2/smcp.yaml similarity index 100% rename from 5gcore/mesh/site2/prod2-smcp.yaml rename to 5gcore/mesh/site2/smcp.yaml From 957745ca3411c8e9d959f93bbb349989cae8efea Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:17:21 -0500 Subject: [PATCH 363/449] Rename prod2-ess.yaml to ess.yaml --- 5gcore/mesh/site2/{prod2-ess.yaml => ess.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site2/{prod2-ess.yaml => ess.yaml} (100%) diff --git a/5gcore/mesh/site2/prod2-ess.yaml b/5gcore/mesh/site2/ess.yaml similarity index 100% rename from 5gcore/mesh/site2/prod2-ess.yaml rename to 5gcore/mesh/site2/ess.yaml From d7472b22bcc42dc9e76b879b134b87136104577d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:17:32 -0500 Subject: [PATCH 364/449] Rename prod2-smp.yaml to smp.yaml --- 5gcore/mesh/site2/{prod2-smp.yaml => smp.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site2/{prod2-smp.yaml => smp.yaml} (100%) diff --git a/5gcore/mesh/site2/prod2-smp.yaml b/5gcore/mesh/site2/smp.yaml similarity index 100% rename from 5gcore/mesh/site2/prod2-smp.yaml rename to 5gcore/mesh/site2/smp.yaml From 6959e39c6e460f235eb680760f02921ba2534c31 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:17:47 -0500 Subject: [PATCH 365/449] Rename prod1-mesh-ca-root-cert.yaml to mesh-ca-root-cert.yaml --- .../{prod1-mesh-ca-root-cert.yaml => mesh-ca-root-cert.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site2/{prod1-mesh-ca-root-cert.yaml => mesh-ca-root-cert.yaml} (100%) diff --git a/5gcore/mesh/site2/prod1-mesh-ca-root-cert.yaml b/5gcore/mesh/site2/mesh-ca-root-cert.yaml similarity index 100% rename from 5gcore/mesh/site2/prod1-mesh-ca-root-cert.yaml rename to 5gcore/mesh/site2/mesh-ca-root-cert.yaml From 1835826a2d2df997e98f4b13797d6a9b266b075d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:18:12 -0500 Subject: [PATCH 366/449] Rename prod2-amf-v2.yaml to amf-v2-deploy.yaml --- 5gcore/mesh/site2/{prod2-amf-v2.yaml => amf-v2-deploy.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 5gcore/mesh/site2/{prod2-amf-v2.yaml => amf-v2-deploy.yaml} (100%) diff --git a/5gcore/mesh/site2/prod2-amf-v2.yaml b/5gcore/mesh/site2/amf-v2-deploy.yaml similarity index 100% rename from 5gcore/mesh/site2/prod2-amf-v2.yaml rename to 5gcore/mesh/site2/amf-v2-deploy.yaml From e0b2613f52a290e234902149af5061c5feed0614 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:18:36 -0500 Subject: [PATCH 367/449] Create amf-v2-configmap.yaml --- 5gcore/mesh/site2/amf-v2-configmap.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 5gcore/mesh/site2/amf-v2-configmap.yaml diff --git a/5gcore/mesh/site2/amf-v2-configmap.yaml b/5gcore/mesh/site2/amf-v2-configmap.yaml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/5gcore/mesh/site2/amf-v2-configmap.yaml @@ -0,0 +1 @@ + From f5fa8ddab3519107a5ca85c8ecc3d74be7c4edf5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:19:40 -0500 Subject: [PATCH 368/449] Update amf-v2-configmap.yaml --- 5gcore/mesh/site2/amf-v2-configmap.yaml | 43 ++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/5gcore/mesh/site2/amf-v2-configmap.yaml b/5gcore/mesh/site2/amf-v2-configmap.yaml index 8b13789..9500b5d 100644 --- a/5gcore/mesh/site2/amf-v2-configmap.yaml +++ b/5gcore/mesh/site2/amf-v2-configmap.yaml @@ -1 +1,42 @@ - +apiVersion: v1 +kind: ConfigMap +metadata: + name: open5gs-amf-config + labels: + epc-mode: amf + version: v2 +data: + amf.yaml: | + amf: + sbi: + - addr: 0.0.0.0 + advertise: open5gs-amf + ngap: + dev: {{ .Values.k8s.interface }} + guami: + - plmn_id: + mcc: {{ .Values.amf.mcc }} + mnc: {{ .Values.amf.mnc }} + amf_id: + region: 2 + set: 1 + tai: + - plmn_id: + mcc: {{ .Values.amf.mcc }} + mnc: {{ .Values.amf.mnc }} + tac: {{ .Values.amf.tac }} + plmn_support: + - plmn_id: + mcc: {{ .Values.amf.mcc }} + mnc: {{ .Values.amf.mnc }} + s_nssai: + - sst: 1 + security: + integrity_order : [ NIA2, NIA1, NIA0 ] + ciphering_order : [ NEA0, NEA1, NEA2 ] + network_name: + full: Open5GS + amf_name: open5gs-amf + nrf: + sbi: + name: open5gs-nrf From ba2252188a6f496af45899ecc85c9236a35f7f40 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:21:13 -0500 Subject: [PATCH 369/449] Update deploy-federated5gcore.sh --- 5gcore/mesh/deploy-federated5gcore.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/5gcore/mesh/deploy-federated5gcore.sh b/5gcore/mesh/deploy-federated5gcore.sh index 6d2ccb4..8effd21 100644 --- a/5gcore/mesh/deploy-federated5gcore.sh +++ b/5gcore/mesh/deploy-federated5gcore.sh @@ -39,7 +39,8 @@ log "Waiting for prod2-mesh installation to complete" oc wait --for condition=Ready -n prod2-mesh smmr/default --timeout 300s log "Installing AMF CNF service in prod2-mesh" -oc apply -n prod2-5gcore -f site2/prod2-amf-v2.yaml +oc apply -n prod2-5gcore -f site2/amf-v2-configmap.yaml +oc apply -n prod2-5gcore -f site2/amf-v2-deploy.yaml log "Installing Full 5gcore in prod1-mesh" ./site1/deploy-prod1-5gcore.sh From 20d65922e85637508adb68007a20a84fb09cc4fa Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:22:02 -0500 Subject: [PATCH 370/449] Update deploy-federated5gcore.sh --- 5gcore/mesh/deploy-federated5gcore.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/5gcore/mesh/deploy-federated5gcore.sh b/5gcore/mesh/deploy-federated5gcore.sh index 8effd21..f9f1ba0 100644 --- a/5gcore/mesh/deploy-federated5gcore.sh +++ b/5gcore/mesh/deploy-federated5gcore.sh @@ -51,13 +51,13 @@ PROD2_MESH_CERT=$(oc get configmap -n prod2-mesh istio-ca-root-cert -o jsonpath= log "Enabling federation for prod-mesh" sed "s:{{PROD2_MESH_CERT}}:$PROD2_MESH_CERT:g" prod1-mesh/prod2-mesh-ca-root-cert.yaml | oc apply -f - -oc apply -f site1/prod1-smp.yaml -oc apply -f site1/prod1-iss.yaml +oc apply -f site1/smp.yaml +oc apply -f site1/iss.yaml log "Enabling federation for prod2-mesh" sed "s:{{PROD1_MESH_CERT}}:$PROD1_MESH_CERT:g" prod2-mesh/prod1-mesh-ca-root-cert.yaml | oc apply -f - -oc apply -f site2/prod2-smp.yaml -oc apply -f site2/prod2-ess.yaml +oc apply -f site2/smp.yaml +oc apply -f site2/ess.yaml log "Installing VirtualService for prod-mesh" oc apply -n prod1-5gcore -f site1/vs-mirror-details.yaml From e20cc1232667523c7bdd8797789a247eeede1aa4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:23:37 -0500 Subject: [PATCH 371/449] Create upf-v2-configmap.yaml --- 5gcore/mesh/site2/upf-v2-configmap.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 5gcore/mesh/site2/upf-v2-configmap.yaml diff --git a/5gcore/mesh/site2/upf-v2-configmap.yaml b/5gcore/mesh/site2/upf-v2-configmap.yaml new file mode 100644 index 0000000..3a4a5d1 --- /dev/null +++ b/5gcore/mesh/site2/upf-v2-configmap.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: open5gs-upf-config + labels: + epc-mode: upf + version: v2 +data: + upf.yaml: | + upf: + pfcp: + dev: {{ .Values.k8s.tuninterface }} + gtpu: + dev: {{ .Values.k8s.tuninterface }} + subnet: + - addr: 10.45.0.1/16 + dnn: {{ .Values.dnn }} From c7077ab51397fbc527a5f48fdd13ef8d0544501a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:24:29 -0500 Subject: [PATCH 372/449] Update upf-v2-configmap.yaml --- 5gcore/mesh/site2/upf-v2-configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/5gcore/mesh/site2/upf-v2-configmap.yaml b/5gcore/mesh/site2/upf-v2-configmap.yaml index 3a4a5d1..fe14f21 100644 --- a/5gcore/mesh/site2/upf-v2-configmap.yaml +++ b/5gcore/mesh/site2/upf-v2-configmap.yaml @@ -9,9 +9,9 @@ data: upf.yaml: | upf: pfcp: - dev: {{ .Values.k8s.tuninterface }} + dev: eth0 gtpu: - dev: {{ .Values.k8s.tuninterface }} + dev: ogstun subnet: - addr: 10.45.0.1/16 - dnn: {{ .Values.dnn }} + dnn: internet From 0a13fc438c57ad17e7531d83140ccea0cfa003c0 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:25:40 -0500 Subject: [PATCH 373/449] Update amf-v2-configmap.yaml --- 5gcore/mesh/site2/amf-v2-configmap.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/5gcore/mesh/site2/amf-v2-configmap.yaml b/5gcore/mesh/site2/amf-v2-configmap.yaml index 9500b5d..4d88a00 100644 --- a/5gcore/mesh/site2/amf-v2-configmap.yaml +++ b/5gcore/mesh/site2/amf-v2-configmap.yaml @@ -12,23 +12,23 @@ data: - addr: 0.0.0.0 advertise: open5gs-amf ngap: - dev: {{ .Values.k8s.interface }} + dev: eth0 guami: - plmn_id: - mcc: {{ .Values.amf.mcc }} - mnc: {{ .Values.amf.mnc }} + mcc: 208 + mnc: 93 amf_id: region: 2 set: 1 tai: - plmn_id: - mcc: {{ .Values.amf.mcc }} - mnc: {{ .Values.amf.mnc }} - tac: {{ .Values.amf.tac }} + mcc: 208 + mnc: 93 + tac: 7 plmn_support: - plmn_id: - mcc: {{ .Values.amf.mcc }} - mnc: {{ .Values.amf.mnc }} + mcc: 208 + mnc: 93 s_nssai: - sst: 1 security: From ac7f331ba2c133fa515d993110789eb6ac254442 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:26:30 -0500 Subject: [PATCH 374/449] Update amf-v2-deploy.yaml --- 5gcore/mesh/site2/amf-v2-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/mesh/site2/amf-v2-deploy.yaml b/5gcore/mesh/site2/amf-v2-deploy.yaml index ef8a835..27aa05f 100644 --- a/5gcore/mesh/site2/amf-v2-deploy.yaml +++ b/5gcore/mesh/site2/amf-v2-deploy.yaml @@ -61,7 +61,6 @@ spec: template: metadata: annotations: - k8s.v1.cni.cncf.io/networks: '[{"name": "macvlan-multus", "ips": [ "192.168.100.201/24"]}]' sidecar.istio.io/inject: "true" labels: epc-mode: amf From 633c9616dcec4b7221372ff8af2aeaecc7bce751 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:28:18 -0500 Subject: [PATCH 375/449] Update amf-v2-deploy.yaml --- 5gcore/mesh/site2/amf-v2-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/mesh/site2/amf-v2-deploy.yaml b/5gcore/mesh/site2/amf-v2-deploy.yaml index 27aa05f..30c7f61 100644 --- a/5gcore/mesh/site2/amf-v2-deploy.yaml +++ b/5gcore/mesh/site2/amf-v2-deploy.yaml @@ -68,8 +68,8 @@ spec: spec: containers: - name: amf - image: "{{ .Values.open5gcore.image.repository }}:{{ .Values.open5gcore.image.tag }}" - imagePullPolicy: {{ .Values.open5gcore.image.pullPolicy }} + image: "docker.io/efatnar/open5gcore:v1.1" + imagePullPolicy: IfNotPresent command: ["open5gs-amfd", "-d", "-c", "/open5gs/config-map/amf.yaml"] volumeMounts: - name: open5gs-amf-config From 3e5b89be56edb51e277dd895d60b1bbd08cac644 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:31:13 -0500 Subject: [PATCH 376/449] Create upf-v2-deploy.yaml --- 5gcore/mesh/site2/upf-v2-deploy.yaml | 97 ++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 5gcore/mesh/site2/upf-v2-deploy.yaml diff --git a/5gcore/mesh/site2/upf-v2-deploy.yaml b/5gcore/mesh/site2/upf-v2-deploy.yaml new file mode 100644 index 0000000..42050e2 --- /dev/null +++ b/5gcore/mesh/site2/upf-v2-deploy.yaml @@ -0,0 +1,97 @@ +apiVersion: v1 +kind: Service +metadata: + name: open5gs-upf + labels: + epc-mode: upf + version: v2 +spec: + selector: + epc-mode: upf + ports: + - protocol: UDP + port: 8805 + targetPort: 8805 +--- +apiVersion: v1 +kind: Service +metadata: + name: open5gs-upf-np + labels: + epc-mode: upf + version: v2 +spec: + type: NodePort + selector: + epc-mode: upf + ports: + - protocol: UDP + port: 8805 + targetPort: 8805 + nodePort: 30423 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: open5gs-upf-d + labels: + epc-mode: upf + version: v2 +spec: + #replicas: 1 + selector: + matchLabels: + epc-mode: upf + version: v2 + template: + metadata: + annotations: + sidecar.istio.io/inject: "false" + labels: + epc-mode: upf + version: v2 + spec: + containers: + - name: upf + image: "docker.io/efatnar/open5gcore:v1.1" + imagePullPolicy: IfNotPresent + securityContext: + privileged: true + command: ["/bin/sh", "-c"] + args: + - ln -s /dev/net/tun /dev/tun; + ip tuntap add name ogstun mode tun; + ip addr add 10.45.0.1/16 dev ogstun; + sysctl -w net.ipv6.conf.all.disable_ipv6=1; + ip link set ogstun up; + ip link set dev ogstun mtu 1400; + sysctl -w net.ipv4.ip_forward=1; + iptables -A FORWARD -j ACCEPT; + iptables -t nat -A POSTROUTING -s 10.45.0.0/16 -o eth0 -j MASQUERADE; + open5gs-upfd -c /open5gs/config-map/upf.yaml; + volumeMounts: + - name: open5gs-upf-config + mountPath: /open5gs/config-map/upf.yaml + subPath: "upf.yaml" + - mountPath: /dev/net/tun + name: dev-net-tun + volumes: + - name: open5gs-upf-config + configMap: + name: open5gs-upf-config + - name: dev-net-tun + hostPath: + path: /dev/net/tun +--- +apiVersion: autoscaling/v1 +kind: HorizontalPodAutoscaler +metadata: + name: open5gs-upf-d +spec: + maxReplicas: 2 + minReplicas: 1 + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: open5gs-upf-d + targetCPUUtilizationPercentage: 80 From f581e1e34aba7f6055334672049fecf2c6df7d56 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:32:43 -0500 Subject: [PATCH 377/449] Update amf-v2-deploy.yaml --- 5gcore/mesh/site2/amf-v2-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/mesh/site2/amf-v2-deploy.yaml b/5gcore/mesh/site2/amf-v2-deploy.yaml index 30c7f61..1dd5e36 100644 --- a/5gcore/mesh/site2/amf-v2-deploy.yaml +++ b/5gcore/mesh/site2/amf-v2-deploy.yaml @@ -40,6 +40,7 @@ spec: podSelector: matchLabels: epc-mode: amf + version: v2 ingress: - ports: - protocol: SCTP From 5f3e75a02ce3870eb8c8390fb5cdc86253b75937 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:37:20 -0500 Subject: [PATCH 378/449] Update amf-v2-configmap.yaml --- 5gcore/mesh/site2/amf-v2-configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/mesh/site2/amf-v2-configmap.yaml b/5gcore/mesh/site2/amf-v2-configmap.yaml index 4d88a00..6f0e119 100644 --- a/5gcore/mesh/site2/amf-v2-configmap.yaml +++ b/5gcore/mesh/site2/amf-v2-configmap.yaml @@ -40,3 +40,4 @@ data: nrf: sbi: name: open5gs-nrf + domain: prod1-mesh.local From b1b5bf238df5c541f9d7dda75de0b379b27b2317 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:38:52 -0500 Subject: [PATCH 379/449] Update deploy-federated5gcore.sh --- 5gcore/mesh/deploy-federated5gcore.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/5gcore/mesh/deploy-federated5gcore.sh b/5gcore/mesh/deploy-federated5gcore.sh index f9f1ba0..1f014c1 100644 --- a/5gcore/mesh/deploy-federated5gcore.sh +++ b/5gcore/mesh/deploy-federated5gcore.sh @@ -38,9 +38,12 @@ oc wait --for condition=Ready -n prod1-mesh smmr/default --timeout 300s log "Waiting for prod2-mesh installation to complete" oc wait --for condition=Ready -n prod2-mesh smmr/default --timeout 300s -log "Installing AMF CNF service in prod2-mesh" +log "Installing AMF, UPF CNF service in prod2-mesh" oc apply -n prod2-5gcore -f site2/amf-v2-configmap.yaml oc apply -n prod2-5gcore -f site2/amf-v2-deploy.yaml +oc apply -n prod2-5gcore -f site2/upf-v2-configmap.yaml +oc apply -n prod2-5gcore -f site2/upf-v2-deploy.yaml + log "Installing Full 5gcore in prod1-mesh" ./site1/deploy-prod1-5gcore.sh From 2ea18379379692b8e087fc075c4e6613ec49d431 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 11:44:04 -0500 Subject: [PATCH 380/449] Update amf-v2-configmap.yaml --- 5gcore/mesh/site2/amf-v2-configmap.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/5gcore/mesh/site2/amf-v2-configmap.yaml b/5gcore/mesh/site2/amf-v2-configmap.yaml index 6f0e119..a8d3e31 100644 --- a/5gcore/mesh/site2/amf-v2-configmap.yaml +++ b/5gcore/mesh/site2/amf-v2-configmap.yaml @@ -39,5 +39,4 @@ data: amf_name: open5gs-amf nrf: sbi: - name: open5gs-nrf - domain: prod1-mesh.local + name: open5gs-nrf.prod1-mesh.local From af769507ae93b45d1ac883bb875450d0db726253 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 12:06:58 -0500 Subject: [PATCH 381/449] Create README.md --- 5gcore/mesh/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 5gcore/mesh/README.md diff --git a/5gcore/mesh/README.md b/5gcore/mesh/README.md new file mode 100644 index 0000000..e4bd328 --- /dev/null +++ b/5gcore/mesh/README.md @@ -0,0 +1 @@ +# Federated Service Mesh Based 5g Core Deployment over two clusters. From c7eb4144f4b1c3229321200ec47c9e0411fb0be1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 12:07:48 -0500 Subject: [PATCH 382/449] Update smcp.yaml --- 5gcore/mesh/site1/smcp.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/mesh/site1/smcp.yaml b/5gcore/mesh/site1/smcp.yaml index 5d1e671..d63cc84 100644 --- a/5gcore/mesh/site1/smcp.yaml +++ b/5gcore/mesh/site1/smcp.yaml @@ -38,7 +38,7 @@ spec: stage-mesh-egress: enabled: true requestedNetworkView: - - network-stage-mesh + - network-prod2-mesh routerMode: sni-dnat service: metadata: From d0ed881010a30d99405a19bb42bb15d4c9f2a6da Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 12:11:58 -0500 Subject: [PATCH 383/449] Update deploy-federated5gcore.sh --- 5gcore/mesh/deploy-federated5gcore.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/5gcore/mesh/deploy-federated5gcore.sh b/5gcore/mesh/deploy-federated5gcore.sh index 1f014c1..729b013 100644 --- a/5gcore/mesh/deploy-federated5gcore.sh +++ b/5gcore/mesh/deploy-federated5gcore.sh @@ -7,6 +7,7 @@ log() { echo "##### $*" } +# to do: switch context: oc config use-context prod1-cluster log "Creating projects for prod-mesh" oc new-project prod1-mesh || true oc new-project prod1-5gcore || true @@ -19,6 +20,7 @@ log "Installing control plane for prod-mesh" oc apply -f site1/smcp.yaml oc apply -f site1/smmr.yaml +# to do: switch context: oc config use-context prod2-cluster log "Creating projects for prod2-mesh" oc new-project prod2-mesh || true oc new-project prod2-5gcore|| true @@ -32,9 +34,11 @@ log "Installing control plane for prod2-mesh" oc apply -f site2/smcp.yaml oc apply -f site2/smmr.yaml +# to do: switch context: oc config use-context prod1-cluster log "Waiting for prod1-mesh installation to complete" oc wait --for condition=Ready -n prod1-mesh smmr/default --timeout 300s +# to do: switch context: oc config use-context prod2-cluster log "Waiting for prod2-mesh installation to complete" oc wait --for condition=Ready -n prod2-mesh smmr/default --timeout 300s @@ -48,10 +52,13 @@ oc apply -n prod2-5gcore -f site2/upf-v2-deploy.yaml log "Installing Full 5gcore in prod1-mesh" ./site1/deploy-prod1-5gcore.sh +# to do: switch context: oc config use-context prod1-cluster log "Retrieving Istio CA Root certificates" PROD1_MESH_CERT=$(oc get configmap -n prod1-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') +# to do: switch context: oc config use-context prod2-cluster PROD2_MESH_CERT=$(oc get configmap -n prod2-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') +# to do: switch context: oc config use-context prod1-cluster log "Enabling federation for prod-mesh" sed "s:{{PROD2_MESH_CERT}}:$PROD2_MESH_CERT:g" prod1-mesh/prod2-mesh-ca-root-cert.yaml | oc apply -f - oc apply -f site1/smp.yaml From 75db1ec40c79dd9835c3d64f49ec17be43492279 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 16:40:07 -0500 Subject: [PATCH 384/449] Update deploy-federated5gcore.sh --- 5gcore/mesh/deploy-federated5gcore.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/mesh/deploy-federated5gcore.sh b/5gcore/mesh/deploy-federated5gcore.sh index 729b013..0a76bf6 100644 --- a/5gcore/mesh/deploy-federated5gcore.sh +++ b/5gcore/mesh/deploy-federated5gcore.sh @@ -48,7 +48,7 @@ oc apply -n prod2-5gcore -f site2/amf-v2-deploy.yaml oc apply -n prod2-5gcore -f site2/upf-v2-configmap.yaml oc apply -n prod2-5gcore -f site2/upf-v2-deploy.yaml - +# to do: switch context: oc config use-context prod1-cluster log "Installing Full 5gcore in prod1-mesh" ./site1/deploy-prod1-5gcore.sh From 72a6341f1841c669d6272e37648b3bf1b35975b4 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 23 May 2022 19:24:39 -0500 Subject: [PATCH 385/449] Delete 5gcore/mesh directory --- 5gcore/mesh/README.md | 1 - 5gcore/mesh/deploy-federated5gcore.sh | 84 -------------------- 5gcore/mesh/site1/deploy-prod1-5gcore.sh | 10 --- 5gcore/mesh/site1/iss.yaml | 15 ---- 5gcore/mesh/site1/mesh-ca-root-cert.yaml | 10 --- 5gcore/mesh/site1/smcp.yaml | 68 ----------------- 5gcore/mesh/site1/smmr.yaml | 8 -- 5gcore/mesh/site1/smp.yaml | 22 ------ 5gcore/mesh/site1/vs-mirror-details.yaml | 16 ---- 5gcore/mesh/site2/amf-v2-configmap.yaml | 42 ---------- 5gcore/mesh/site2/amf-v2-deploy.yaml | 82 -------------------- 5gcore/mesh/site2/ess.yaml | 15 ---- 5gcore/mesh/site2/mesh-ca-root-cert.yaml | 10 --- 5gcore/mesh/site2/smcp.yaml | 68 ----------------- 5gcore/mesh/site2/smmr.yaml | 8 -- 5gcore/mesh/site2/smp.yaml | 22 ------ 5gcore/mesh/site2/upf-v2-configmap.yaml | 17 ----- 5gcore/mesh/site2/upf-v2-deploy.yaml | 97 ------------------------ 18 files changed, 595 deletions(-) delete mode 100644 5gcore/mesh/README.md delete mode 100644 5gcore/mesh/deploy-federated5gcore.sh delete mode 100644 5gcore/mesh/site1/deploy-prod1-5gcore.sh delete mode 100644 5gcore/mesh/site1/iss.yaml delete mode 100644 5gcore/mesh/site1/mesh-ca-root-cert.yaml delete mode 100644 5gcore/mesh/site1/smcp.yaml delete mode 100644 5gcore/mesh/site1/smmr.yaml delete mode 100644 5gcore/mesh/site1/smp.yaml delete mode 100644 5gcore/mesh/site1/vs-mirror-details.yaml delete mode 100644 5gcore/mesh/site2/amf-v2-configmap.yaml delete mode 100644 5gcore/mesh/site2/amf-v2-deploy.yaml delete mode 100644 5gcore/mesh/site2/ess.yaml delete mode 100644 5gcore/mesh/site2/mesh-ca-root-cert.yaml delete mode 100644 5gcore/mesh/site2/smcp.yaml delete mode 100644 5gcore/mesh/site2/smmr.yaml delete mode 100644 5gcore/mesh/site2/smp.yaml delete mode 100644 5gcore/mesh/site2/upf-v2-configmap.yaml delete mode 100644 5gcore/mesh/site2/upf-v2-deploy.yaml diff --git a/5gcore/mesh/README.md b/5gcore/mesh/README.md deleted file mode 100644 index e4bd328..0000000 --- a/5gcore/mesh/README.md +++ /dev/null @@ -1 +0,0 @@ -# Federated Service Mesh Based 5g Core Deployment over two clusters. diff --git a/5gcore/mesh/deploy-federated5gcore.sh b/5gcore/mesh/deploy-federated5gcore.sh deleted file mode 100644 index 0a76bf6..0000000 --- a/5gcore/mesh/deploy-federated5gcore.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -set -e - -log() { - echo - echo "##### $*" -} - -# to do: switch context: oc config use-context prod1-cluster -log "Creating projects for prod-mesh" -oc new-project prod1-mesh || true -oc new-project prod1-5gcore || true -oc adm policy add-scc-to-user anyuid -z default -oc adm policy add-scc-to-user hostaccess -z default -oc adm policy add-scc-to-user hostmount-anyuid -z default -oc adm policy add-scc-to-user privileged -z default - -log "Installing control plane for prod-mesh" -oc apply -f site1/smcp.yaml -oc apply -f site1/smmr.yaml - -# to do: switch context: oc config use-context prod2-cluster -log "Creating projects for prod2-mesh" -oc new-project prod2-mesh || true -oc new-project prod2-5gcore|| true - -oc adm policy add-scc-to-user anyuid -z default -oc adm policy add-scc-to-user hostaccess -z default -oc adm policy add-scc-to-user hostmount-anyuid -z default -oc adm policy add-scc-to-user privileged -z default - -log "Installing control plane for prod2-mesh" -oc apply -f site2/smcp.yaml -oc apply -f site2/smmr.yaml - -# to do: switch context: oc config use-context prod1-cluster -log "Waiting for prod1-mesh installation to complete" -oc wait --for condition=Ready -n prod1-mesh smmr/default --timeout 300s - -# to do: switch context: oc config use-context prod2-cluster -log "Waiting for prod2-mesh installation to complete" -oc wait --for condition=Ready -n prod2-mesh smmr/default --timeout 300s - -log "Installing AMF, UPF CNF service in prod2-mesh" -oc apply -n prod2-5gcore -f site2/amf-v2-configmap.yaml -oc apply -n prod2-5gcore -f site2/amf-v2-deploy.yaml -oc apply -n prod2-5gcore -f site2/upf-v2-configmap.yaml -oc apply -n prod2-5gcore -f site2/upf-v2-deploy.yaml - -# to do: switch context: oc config use-context prod1-cluster -log "Installing Full 5gcore in prod1-mesh" -./site1/deploy-prod1-5gcore.sh - -# to do: switch context: oc config use-context prod1-cluster -log "Retrieving Istio CA Root certificates" -PROD1_MESH_CERT=$(oc get configmap -n prod1-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') -# to do: switch context: oc config use-context prod2-cluster -PROD2_MESH_CERT=$(oc get configmap -n prod2-mesh istio-ca-root-cert -o jsonpath='{.data.root-cert\.pem}' | sed ':a;N;$!ba;s/\n/\\\n /g') - -# to do: switch context: oc config use-context prod1-cluster -log "Enabling federation for prod-mesh" -sed "s:{{PROD2_MESH_CERT}}:$PROD2_MESH_CERT:g" prod1-mesh/prod2-mesh-ca-root-cert.yaml | oc apply -f - -oc apply -f site1/smp.yaml -oc apply -f site1/iss.yaml - -log "Enabling federation for prod2-mesh" -sed "s:{{PROD1_MESH_CERT}}:$PROD1_MESH_CERT:g" prod2-mesh/prod1-mesh-ca-root-cert.yaml | oc apply -f - -oc apply -f site2/smp.yaml -oc apply -f site2/ess.yaml - -log "Installing VirtualService for prod-mesh" -oc apply -n prod1-5gcore -f site1/vs-mirror-details.yaml - -log "INSTALLATION COMPLETE -#Run the following command in the prod-mesh to check the connection status: - oc -n prod1-mesh get servicemeshpeer prod2-mesh -o json | jq .status -#Run the following command to check the connection status in prod2-mesh: - oc -n prod2-mesh get servicemeshpeer prod1-mesh -o json | jq .status -#Check if services from prod2-mesh are imported into prod-mesh: - oc -n prod1-mesh get importedservicesets prod2-mesh -o json | jq .status -#Check if services from prod2-mesh are exported: - oc -n prod2-mesh get exportedservicesets prod1-mesh -o json | jq .status -" diff --git a/5gcore/mesh/site1/deploy-prod1-5gcore.sh b/5gcore/mesh/site1/deploy-prod1-5gcore.sh deleted file mode 100644 index e5bea03..0000000 --- a/5gcore/mesh/site1/deploy-prod1-5gcore.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -#Author: fenar -current_dir=$PWD -oc create secret generic mongodb-ca --from-file=$current_dir/5gcore/ca-tls-certificates/rds-combined-ca-bundle.pem -oc get secret -cd .. -cd .. -echo "Deploying Open5G Core Prod1" -helm install -f values.yaml prod1-5gcore ./ -echo "Enjoy The Open 5G Core on Production 1!" diff --git a/5gcore/mesh/site1/iss.yaml b/5gcore/mesh/site1/iss.yaml deleted file mode 100644 index c51c4bf..0000000 --- a/5gcore/mesh/site1/iss.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: federation.maistra.io/v1 -kind: ImportedServiceSet -metadata: - name: prod2-mesh - namespace: prod1-mesh -spec: - importRules: - - importAsLocal: false - nameSelector: - alias: - name: details-v2 - namespace: prod1-5gcore - name: details - namespace: prod2-5gcore - type: NameSelector diff --git a/5gcore/mesh/site1/mesh-ca-root-cert.yaml b/5gcore/mesh/site1/mesh-ca-root-cert.yaml deleted file mode 100644 index 797d309..0000000 --- a/5gcore/mesh/site1/mesh-ca-root-cert.yaml +++ /dev/null @@ -1,10 +0,0 @@ - - -kind: ConfigMap -apiVersion: v1 -metadata: - name: prod2-mesh-ca-root-cert - namespace: prod1-mesh -data: - root-cert.pem: |- - {{PROD2_MESH_CERT}} diff --git a/5gcore/mesh/site1/smcp.yaml b/5gcore/mesh/site1/smcp.yaml deleted file mode 100644 index d63cc84..0000000 --- a/5gcore/mesh/site1/smcp.yaml +++ /dev/null @@ -1,68 +0,0 @@ -apiVersion: maistra.io/v2 -kind: ServiceMeshControlPlane -metadata: - namespace: prod1-mesh - name: prod1-mesh -spec: - cluster: - name: production-cluster - addons: - grafana: - enabled: true - jaeger: - install: - storage: - type: Memory - kiali: - enabled: true - prometheus: - enabled: true - policy: - type: Istiod - telemetry: - type: Istiod - tracing: - sampling: 10000 - type: Jaeger - version: v2.1 - runtime: - defaults: - container: - imagePullPolicy: Always - proxy: - accessLogging: - file: - name: /dev/stdout - gateways: - additionalEgress: - stage-mesh-egress: - enabled: true - requestedNetworkView: - - network-prod2-mesh - routerMode: sni-dnat - service: - metadata: - labels: - federation.maistra.io/egress-for: prod2-mesh - ports: - - port: 15443 - name: tls - - port: 8188 - name: http-discovery #note HTTP here - additionalIngress: - stage-mesh-ingress: - enabled: true - routerMode: sni-dnat - service: - type: ClusterIP - metadata: - labels: - federation.maistra.io/ingress-for: prod2-mesh - ports: - - port: 15443 - name: tls - - port: 8188 - name: https-discovery #note HTTPS here - security: - trust: - domain: prod1-mesh.local diff --git a/5gcore/mesh/site1/smmr.yaml b/5gcore/mesh/site1/smmr.yaml deleted file mode 100644 index ca0bb5a..0000000 --- a/5gcore/mesh/site1/smmr.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: maistra.io/v1 -kind: ServiceMeshMemberRoll -metadata: - name: default - namespace: prod1-mesh -spec: - members: - - prod1-5gcore diff --git a/5gcore/mesh/site1/smp.yaml b/5gcore/mesh/site1/smp.yaml deleted file mode 100644 index 7dece77..0000000 --- a/5gcore/mesh/site1/smp.yaml +++ /dev/null @@ -1,22 +0,0 @@ -kind: ServiceMeshPeer -apiVersion: federation.maistra.io/v1 -metadata: - name: prod2-mesh - namespace: prod1-mesh -spec: - remote: - addresses: - - prod1-mesh-ingress.prod2-mesh.svc.cluster.local - discoveryPort: 8188 - servicePort: 15443 - gateways: - ingress: - name: prod2-mesh-ingress - egress: - name: prod2-mesh-egress - security: - trustDomain: prod2-mesh.local - clientID: prod2-mesh.local/ns/prod2-mesh/sa/prod1-mesh-egress-service-account - certificateChain: - kind: ConfigMap - name: prod2-mesh-ca-root-cert diff --git a/5gcore/mesh/site1/vs-mirror-details.yaml b/5gcore/mesh/site1/vs-mirror-details.yaml deleted file mode 100644 index 6ff6315..0000000 --- a/5gcore/mesh/site1/vs-mirror-details.yaml +++ /dev/null @@ -1,16 +0,0 @@ -kind: VirtualService -apiVersion: networking.istio.io/v1alpha3 -metadata: - name: details - namespace: prod1-5gcore -spec: - hosts: - - details.prod1-5gcore.svc.cluster.local - http: - - mirror: - host: details-v2.prod1-5gcore.svc.prod2-mesh-imports.local - route: - - destination: - host: details.prod1-5gcore.svc.cluster.local - subset: v1 - weight: 100 diff --git a/5gcore/mesh/site2/amf-v2-configmap.yaml b/5gcore/mesh/site2/amf-v2-configmap.yaml deleted file mode 100644 index a8d3e31..0000000 --- a/5gcore/mesh/site2/amf-v2-configmap.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: open5gs-amf-config - labels: - epc-mode: amf - version: v2 -data: - amf.yaml: | - amf: - sbi: - - addr: 0.0.0.0 - advertise: open5gs-amf - ngap: - dev: eth0 - guami: - - plmn_id: - mcc: 208 - mnc: 93 - amf_id: - region: 2 - set: 1 - tai: - - plmn_id: - mcc: 208 - mnc: 93 - tac: 7 - plmn_support: - - plmn_id: - mcc: 208 - mnc: 93 - s_nssai: - - sst: 1 - security: - integrity_order : [ NIA2, NIA1, NIA0 ] - ciphering_order : [ NEA0, NEA1, NEA2 ] - network_name: - full: Open5GS - amf_name: open5gs-amf - nrf: - sbi: - name: open5gs-nrf.prod1-mesh.local diff --git a/5gcore/mesh/site2/amf-v2-deploy.yaml b/5gcore/mesh/site2/amf-v2-deploy.yaml deleted file mode 100644 index 1dd5e36..0000000 --- a/5gcore/mesh/site2/amf-v2-deploy.yaml +++ /dev/null @@ -1,82 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: amf-open5gs-sctp - labels: - epc-mode: amf - version: v2 -spec: - type: NodePort - selector: - epc-mode: amf - ports: - - protocol: SCTP - port: 38412 - targetPort: 38412 - nodePort: 30412 ---- -apiVersion: v1 -kind: Service -metadata: - name: open5gs-amf - labels: - epc-mode: amf - version: v2 -spec: - type: NodePort - selector: - epc-mode: amf - ports: - - protocol: TCP - port: 80 - targetPort: 80 - nodePort: 30080 ---- -kind: NetworkPolicy -apiVersion: networking.k8s.io/v1 -metadata: - name: allow-sctp-on-http -spec: - podSelector: - matchLabels: - epc-mode: amf - version: v2 - ingress: - - ports: - - protocol: SCTP - port: 80 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: open5gs-amf-d - labels: - epc-mode: amf - version: v2 -spec: - replicas: 1 - selector: - matchLabels: - epc-mode: amf - version: v2 - template: - metadata: - annotations: - sidecar.istio.io/inject: "true" - labels: - epc-mode: amf - version: v2 - spec: - containers: - - name: amf - image: "docker.io/efatnar/open5gcore:v1.1" - imagePullPolicy: IfNotPresent - command: ["open5gs-amfd", "-d", "-c", "/open5gs/config-map/amf.yaml"] - volumeMounts: - - name: open5gs-amf-config - mountPath: /open5gs/config-map/amf.yaml - subPath: "amf.yaml" - volumes: - - name: open5gs-amf-config - configMap: - name: open5gs-amf-config diff --git a/5gcore/mesh/site2/ess.yaml b/5gcore/mesh/site2/ess.yaml deleted file mode 100644 index fbde882..0000000 --- a/5gcore/mesh/site2/ess.yaml +++ /dev/null @@ -1,15 +0,0 @@ -kind: ExportedServiceSet -apiVersion: federation.maistra.io/v1 -metadata: - name: prod1-mesh - namespace: prod2-mesh -spec: - exportRules: - - type: LabelSelector - labelSelector: - namespace: prod2-5gcore - selector: - matchLabels: - app: details - alias: - namespace: 5gcore diff --git a/5gcore/mesh/site2/mesh-ca-root-cert.yaml b/5gcore/mesh/site2/mesh-ca-root-cert.yaml deleted file mode 100644 index f1b9532..0000000 --- a/5gcore/mesh/site2/mesh-ca-root-cert.yaml +++ /dev/null @@ -1,10 +0,0 @@ - - -kind: ConfigMap -apiVersion: v1 -metadata: - name: prod1-mesh-ca-root-cert - namespace: prod2-mesh -data: - root-cert.pem: |- - {{PROD_MESH_CERT}} diff --git a/5gcore/mesh/site2/smcp.yaml b/5gcore/mesh/site2/smcp.yaml deleted file mode 100644 index 5609797..0000000 --- a/5gcore/mesh/site2/smcp.yaml +++ /dev/null @@ -1,68 +0,0 @@ -apiVersion: maistra.io/v2 -kind: ServiceMeshControlPlane -metadata: - namespace: prod2-mesh - name: prod2-mesh -spec: - cluster: - name: production2-cluster - addons: - grafana: - enabled: true - jaeger: - install: - storage: - type: Memory - kiali: - enabled: true - prometheus: - enabled: true - policy: - type: Istiod - telemetry: - type: Istiod - tracing: - sampling: 10000 - type: Jaeger - version: v2.1 - runtime: - defaults: - container: - imagePullPolicy: Always - proxy: - accessLogging: - file: - name: /dev/stdout - gateways: - additionalEgress: - stage-mesh-egress: - enabled: true - requestedNetworkView: - - network-prod1-mesh - routerMode: sni-dnat - service: - metadata: - labels: - federation.maistra.io/egress-for: prod1-mesh - ports: - - port: 15443 - name: tls - - port: 8188 - name: http-discovery #note HTTP here - additionalIngress: - stage-mesh-ingress: - enabled: true - routerMode: sni-dnat - service: - type: ClusterIP - metadata: - labels: - federation.maistra.io/ingress-for: prod1-mesh - ports: - - port: 15443 - name: tls - - port: 8188 - name: https-discovery #note HTTPS here - security: - trust: - domain: prod2-mesh.local diff --git a/5gcore/mesh/site2/smmr.yaml b/5gcore/mesh/site2/smmr.yaml deleted file mode 100644 index 0dabfdf..0000000 --- a/5gcore/mesh/site2/smmr.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: maistra.io/v1 -kind: ServiceMeshMemberRoll -metadata: - name: default - namespace: prod2-mesh -spec: - members: - - prod2-5gcore diff --git a/5gcore/mesh/site2/smp.yaml b/5gcore/mesh/site2/smp.yaml deleted file mode 100644 index 0e52150..0000000 --- a/5gcore/mesh/site2/smp.yaml +++ /dev/null @@ -1,22 +0,0 @@ -kind: ServiceMeshPeer -apiVersion: federation.maistra.io/v1 -metadata: - name: prod1-mesh - namespace: prod2-mesh -spec: - remote: - addresses: - - prod2-mesh-ingress.prod2-mesh.svc.cluster.local - discoveryPort: 8188 - servicePort: 15443 - gateways: - ingress: - name: prod1-mesh-ingress - egress: - name: prod1-mesh-egress - security: - trustDomain: prod1-mesh.local - clientID: prod1-mesh.local/ns/prod1-mesh/sa/prod2-mesh-egress-service-account - certificateChain: - kind: ConfigMap - name: prod1-mesh-ca-root-cert diff --git a/5gcore/mesh/site2/upf-v2-configmap.yaml b/5gcore/mesh/site2/upf-v2-configmap.yaml deleted file mode 100644 index fe14f21..0000000 --- a/5gcore/mesh/site2/upf-v2-configmap.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: open5gs-upf-config - labels: - epc-mode: upf - version: v2 -data: - upf.yaml: | - upf: - pfcp: - dev: eth0 - gtpu: - dev: ogstun - subnet: - - addr: 10.45.0.1/16 - dnn: internet diff --git a/5gcore/mesh/site2/upf-v2-deploy.yaml b/5gcore/mesh/site2/upf-v2-deploy.yaml deleted file mode 100644 index 42050e2..0000000 --- a/5gcore/mesh/site2/upf-v2-deploy.yaml +++ /dev/null @@ -1,97 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: open5gs-upf - labels: - epc-mode: upf - version: v2 -spec: - selector: - epc-mode: upf - ports: - - protocol: UDP - port: 8805 - targetPort: 8805 ---- -apiVersion: v1 -kind: Service -metadata: - name: open5gs-upf-np - labels: - epc-mode: upf - version: v2 -spec: - type: NodePort - selector: - epc-mode: upf - ports: - - protocol: UDP - port: 8805 - targetPort: 8805 - nodePort: 30423 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: open5gs-upf-d - labels: - epc-mode: upf - version: v2 -spec: - #replicas: 1 - selector: - matchLabels: - epc-mode: upf - version: v2 - template: - metadata: - annotations: - sidecar.istio.io/inject: "false" - labels: - epc-mode: upf - version: v2 - spec: - containers: - - name: upf - image: "docker.io/efatnar/open5gcore:v1.1" - imagePullPolicy: IfNotPresent - securityContext: - privileged: true - command: ["/bin/sh", "-c"] - args: - - ln -s /dev/net/tun /dev/tun; - ip tuntap add name ogstun mode tun; - ip addr add 10.45.0.1/16 dev ogstun; - sysctl -w net.ipv6.conf.all.disable_ipv6=1; - ip link set ogstun up; - ip link set dev ogstun mtu 1400; - sysctl -w net.ipv4.ip_forward=1; - iptables -A FORWARD -j ACCEPT; - iptables -t nat -A POSTROUTING -s 10.45.0.0/16 -o eth0 -j MASQUERADE; - open5gs-upfd -c /open5gs/config-map/upf.yaml; - volumeMounts: - - name: open5gs-upf-config - mountPath: /open5gs/config-map/upf.yaml - subPath: "upf.yaml" - - mountPath: /dev/net/tun - name: dev-net-tun - volumes: - - name: open5gs-upf-config - configMap: - name: open5gs-upf-config - - name: dev-net-tun - hostPath: - path: /dev/net/tun ---- -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open5gs-upf-d -spec: - maxReplicas: 2 - minReplicas: 1 - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open5gs-upf-d - targetCPUUtilizationPercentage: 80 From eb0f200c80965b4f521a44ca906456eae3baa5e8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 2 Jun 2022 11:50:20 -0500 Subject: [PATCH 386/449] Update web-ui-deploy.yaml --- 5gcore/templates/web-ui-deploy.yaml | 44 +++++++++++------------------ 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/5gcore/templates/web-ui-deploy.yaml b/5gcore/templates/web-ui-deploy.yaml index 9e8b8a1..4780754 100644 --- a/5gcore/templates/web-ui-deploy.yaml +++ b/5gcore/templates/web-ui-deploy.yaml @@ -1,33 +1,21 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: Gateway +kind: Route +apiVersion: route.openshift.io/v1 metadata: - name: open5gswebui-gateway -spec: - selector: - istio: ingressgateway # use Istio default gateway implementation - servers: - - port: - number: 80 - name: http - protocol: HTTP - hosts: - - "*" ---- -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: open5gswebui-ingress + name: open5gcoreweb + labels: + epc-mode: webui spec: - hosts: - - "*" - gateways: - - open5gswebui-gateway - http: - - route: - - destination: - host: open5gs-webui - port: - number: 80 + host: open5gcoreweb-open5gcore.apps.acmhub.narlabs.io + to: + kind: Service + name: open5gs-webui + weight: 100 + port: + targetPort: 3000 + tls: + termination: edge + insecureEdgeTerminationPolicy: Allow + wildcardPolicy: None --- apiVersion: v1 kind: Service From c97ab327a4f98aba0dee04c06f5091f2d0b56b8a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 2 Jun 2022 11:51:03 -0500 Subject: [PATCH 387/449] Update web-ui-deploy.yaml --- 5gcore/templates/web-ui-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/web-ui-deploy.yaml b/5gcore/templates/web-ui-deploy.yaml index 4780754..9bbcb0a 100644 --- a/5gcore/templates/web-ui-deploy.yaml +++ b/5gcore/templates/web-ui-deploy.yaml @@ -5,7 +5,6 @@ metadata: labels: epc-mode: webui spec: - host: open5gcoreweb-open5gcore.apps.acmhub.narlabs.io to: kind: Service name: open5gs-webui From 455404115289200e580e0873c766af1bdd719e1a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 2 Jun 2022 11:57:45 -0500 Subject: [PATCH 388/449] Update web-ui-deploy.yaml --- 5gcore/templates/web-ui-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/web-ui-deploy.yaml b/5gcore/templates/web-ui-deploy.yaml index 9bbcb0a..2cfa32c 100644 --- a/5gcore/templates/web-ui-deploy.yaml +++ b/5gcore/templates/web-ui-deploy.yaml @@ -25,7 +25,7 @@ metadata: spec: type: ClusterIP ports: - - port: 80 + - port: 8088 targetPort: 3000 selector: epc-mode: webui From 180b3a215f323f1d143fde421dff9f0ae01288d7 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 27 Jun 2022 11:52:52 -0500 Subject: [PATCH 389/449] Create debug-app.yaml --- 5gcore/templates/debug-app.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 5gcore/templates/debug-app.yaml diff --git a/5gcore/templates/debug-app.yaml b/5gcore/templates/debug-app.yaml new file mode 100644 index 0000000..022c461 --- /dev/null +++ b/5gcore/templates/debug-app.yaml @@ -0,0 +1,22 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + name: debug-app + name: debug-app +spec: + replicas: 1 + selector: + matchLabels: + name: debug-app + template: + metadata: + annotations: + labels: + name: debug-app + spec: + containers: + - image: quay.io/wcaban/net-toolbox:latest + name: debug-app + command: [ "/bin/bash", "-c", "--" ] + args: [ "while true; do sleep 30; done;" ] From 3836db0414d34697617fd935f5bd8081938cefc0 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 29 Aug 2022 14:57:43 -0500 Subject: [PATCH 390/449] Create speedtest.yaml --- 5gcore/templates/speedtest.yaml | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 5gcore/templates/speedtest.yaml diff --git a/5gcore/templates/speedtest.yaml b/5gcore/templates/speedtest.yaml new file mode 100644 index 0000000..f056305 --- /dev/null +++ b/5gcore/templates/speedtest.yaml @@ -0,0 +1,49 @@ +kind: Route +apiVersion: route.openshift.io/v1 +metadata: + name: speed-test + namespace: i2i-5gcore +spec: + to: + kind: Service + name: speed-test + weight: 100 + port: + targetPort: 80 +--- +kind: Service +apiVersion: v1 +metadata: + name: speed-test +spec: + ports: + - protocol: TCP + port: 80 + targetPort: 80 + selector: + app: speed-test +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + name: speed-test + name: speed-test +spec: + replicas: 1 + selector: + matchLabels: + name: speed-test + template: + metadata: + labels: + name: speed-test + app: speed-test + spec: + containers: + - image: adolfintel/speedtest:latest + name: speed-test + command: [ "/bin/bash", "-c", "--" ] + args: [ "MODE=standalone WEBPORT=80; /entrypoint.sh;" ] + ports: + - containerPort: 80 From b4a1eb6bb4bd7a1e90676c0d3f030b4c9de532e7 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 29 Aug 2022 15:07:01 -0500 Subject: [PATCH 391/449] Update speedtest.yaml --- 5gcore/templates/speedtest.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/5gcore/templates/speedtest.yaml b/5gcore/templates/speedtest.yaml index f056305..c934f84 100644 --- a/5gcore/templates/speedtest.yaml +++ b/5gcore/templates/speedtest.yaml @@ -21,7 +21,7 @@ spec: port: 80 targetPort: 80 selector: - app: speed-test + name: speed-test --- apiVersion: apps/v1 kind: Deployment @@ -38,7 +38,6 @@ spec: metadata: labels: name: speed-test - app: speed-test spec: containers: - image: adolfintel/speedtest:latest From 3d0367c54be8216c57ff7a1e1dd9cb7d2627ad8c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 28 Jul 2023 17:12:36 -0500 Subject: [PATCH 392/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 7e8062b..2067be6 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -69,7 +69,6 @@ spec: template: metadata: annotations: - cluster-autoscaler.kubernetes.io/safe-to-evict: "false" sidecar.istio.io/inject: "true" labels: epc-mode: amf From ecf96136876c99fcaa5e26417174ca89fb032d80 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Fri, 28 Jul 2023 17:32:10 -0500 Subject: [PATCH 393/449] Update speedtest.yaml --- 5gcore/templates/speedtest.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/speedtest.yaml b/5gcore/templates/speedtest.yaml index c934f84..582a0c4 100644 --- a/5gcore/templates/speedtest.yaml +++ b/5gcore/templates/speedtest.yaml @@ -2,7 +2,6 @@ kind: Route apiVersion: route.openshift.io/v1 metadata: name: speed-test - namespace: i2i-5gcore spec: to: kind: Service From f205dcd1155192e5b9fc371a4c06de58b5207ce1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 7 Mar 2024 14:50:29 -0600 Subject: [PATCH 394/449] Create scc-admin.yaml --- 5gcore/templates/scc-admin.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 5gcore/templates/scc-admin.yaml diff --git a/5gcore/templates/scc-admin.yaml b/5gcore/templates/scc-admin.yaml new file mode 100644 index 0000000..fe39443 --- /dev/null +++ b/5gcore/templates/scc-admin.yaml @@ -0,0 +1,17 @@ +kind: SecurityContextConstraints +apiVersion: security.openshift.io/v1 +metadata: + name: scc-admin +allowPrivilegedContainer: true +runAsUser: + type: RunAsAny +seLinuxContext: + type: RunAsAny +fsGroup: + type: RunAsAny +supplementalGroups: + type: RunAsAny +users: +- my-admin-user +groups: +- my-admin-group From 898dff9fa61e384d5b21f520a1bc69a0c66f1f57 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 7 Mar 2024 14:51:04 -0600 Subject: [PATCH 395/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 2067be6..93b43f3 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -69,6 +69,7 @@ spec: template: metadata: annotations: + openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "true" labels: epc-mode: amf From e84ae6d31e646afac4eb348797e8dda11df9e0b5 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 7 Mar 2024 14:51:29 -0600 Subject: [PATCH 396/449] Update ausf-deploy.yaml --- 5gcore/templates/ausf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/ausf-deploy.yaml b/5gcore/templates/ausf-deploy.yaml index cf2bb18..8042dcb 100644 --- a/5gcore/templates/ausf-deploy.yaml +++ b/5gcore/templates/ausf-deploy.yaml @@ -26,6 +26,7 @@ spec: template: metadata: annotations: + openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "true" labels: epc-mode: ausf From 3427cbdebe7b66908f97d6167b40b5f1b9589599 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 7 Mar 2024 14:51:44 -0600 Subject: [PATCH 397/449] Update nrf-deploy.yaml --- 5gcore/templates/nrf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/nrf-deploy.yaml b/5gcore/templates/nrf-deploy.yaml index 267d443..6cd345d 100644 --- a/5gcore/templates/nrf-deploy.yaml +++ b/5gcore/templates/nrf-deploy.yaml @@ -26,6 +26,7 @@ spec: template: metadata: annotations: + openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "true" labels: epc-mode: nrf From 3c4ff396479d55475d36dacbb2a22c471c857f5f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 7 Mar 2024 14:52:09 -0600 Subject: [PATCH 398/449] Update nssf-deploy.yaml --- 5gcore/templates/nssf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/nssf-deploy.yaml b/5gcore/templates/nssf-deploy.yaml index 1fa6364..985c9df 100644 --- a/5gcore/templates/nssf-deploy.yaml +++ b/5gcore/templates/nssf-deploy.yaml @@ -26,6 +26,7 @@ spec: template: metadata: annotations: + openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "true" labels: epc-mode: nssf From e4cf79abaf78872b8209c8c0d1ef4da71a0cf0e2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 7 Mar 2024 14:52:22 -0600 Subject: [PATCH 399/449] Update pcf-deploy.yaml --- 5gcore/templates/pcf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/pcf-deploy.yaml b/5gcore/templates/pcf-deploy.yaml index 7703d62..6b3b229 100644 --- a/5gcore/templates/pcf-deploy.yaml +++ b/5gcore/templates/pcf-deploy.yaml @@ -26,6 +26,7 @@ spec: template: metadata: annotations: + openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "true" labels: epc-mode: pcf From 89f738ee97eb5424b3149caeb2df0fd7f04931c0 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 7 Mar 2024 14:52:40 -0600 Subject: [PATCH 400/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index ddf4ca3..3247549 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -25,6 +25,7 @@ spec: template: metadata: annotations: + openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "true" labels: epc-mode: smf From 9aeb464e79747adfafca878131943677166c4960 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 7 Mar 2024 14:52:53 -0600 Subject: [PATCH 401/449] Update udm-deploy.yaml --- 5gcore/templates/udm-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/udm-deploy.yaml b/5gcore/templates/udm-deploy.yaml index 04d099e..d000fac 100644 --- a/5gcore/templates/udm-deploy.yaml +++ b/5gcore/templates/udm-deploy.yaml @@ -26,6 +26,7 @@ spec: template: metadata: annotations: + openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "true" labels: epc-mode: udm From fb1e7b2ddd18905045f34f04f68d3d6a702a0bff Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 7 Mar 2024 14:53:07 -0600 Subject: [PATCH 402/449] Update udr-deploy.yaml --- 5gcore/templates/udr-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/udr-deploy.yaml b/5gcore/templates/udr-deploy.yaml index e4383ab..439b811 100644 --- a/5gcore/templates/udr-deploy.yaml +++ b/5gcore/templates/udr-deploy.yaml @@ -26,6 +26,7 @@ spec: template: metadata: annotations: + openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "true" labels: epc-mode: udr From 3cd52ed38df05d54ab505c30824b9cf3109269bd Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 7 Mar 2024 14:53:23 -0600 Subject: [PATCH 403/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 1736159..4321356 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -42,6 +42,7 @@ spec: template: metadata: annotations: + openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "false" labels: epc-mode: upf From 82dbcbe2203581aff617baf4ce4e57ff5099e34c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 6 May 2024 18:37:02 -0500 Subject: [PATCH 404/449] Update scc-admin.yaml --- 5gcore/templates/scc-admin.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/scc-admin.yaml b/5gcore/templates/scc-admin.yaml index fe39443..4eb0b72 100644 --- a/5gcore/templates/scc-admin.yaml +++ b/5gcore/templates/scc-admin.yaml @@ -3,6 +3,7 @@ apiVersion: security.openshift.io/v1 metadata: name: scc-admin allowPrivilegedContainer: true +allowHostDirVolumePlugin: true runAsUser: type: RunAsAny seLinuxContext: From cb27f18e46f5dab65769c0f6bef98008410f91fa Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Mon, 6 May 2024 18:41:57 -0500 Subject: [PATCH 405/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 027971c..12e03cc 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -13,6 +13,7 @@ spec: template: metadata: annotations: + openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "false" labels: epc-mode: 5gran From 9d7fcf656a707e70a657b74742a23ee67b1d0662 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 21 Aug 2024 10:47:04 -0500 Subject: [PATCH 406/449] Create SCC-AdminRoleBinding.yaml --- 5gcore/templates/SCC-AdminRoleBinding.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 5gcore/templates/SCC-AdminRoleBinding.yaml diff --git a/5gcore/templates/SCC-AdminRoleBinding.yaml b/5gcore/templates/SCC-AdminRoleBinding.yaml new file mode 100644 index 0000000..3057e2d --- /dev/null +++ b/5gcore/templates/SCC-AdminRoleBinding.yaml @@ -0,0 +1,13 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: default-scc-admin-binding + namespace: open5gs +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: scc-admin +subjects: +- kind: ServiceAccount + name: default + namespace: open5gs From 6168fee29938008d85d707ad483b1f8747ae64c3 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 21 Aug 2024 12:40:52 -0500 Subject: [PATCH 407/449] Update values.yaml --- 5gran/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/values.yaml b/5gran/values.yaml index 653b043..4b407a3 100644 --- a/5gran/values.yaml +++ b/5gran/values.yaml @@ -5,7 +5,7 @@ ran: pullPolicy: IfNotPresent tag: "v2.0" amf: - address: 172.27.201.37 + address: 172.27.201.23 port: 30412 gtp: localaddress: 0.0.0.0 From 59e200b307d270f35ff889ab0abb80b5bbbadfb3 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 21 Aug 2024 12:43:02 -0500 Subject: [PATCH 408/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 12e03cc..193372c 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -43,16 +43,6 @@ spec: securityContext: privileged: true command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] - - name: debug - imagePullPolicy: {{ .Values.ran.image.pullPolicy }} - image: quay.io/wcaban/net-toolbox:latest - securityContext: - privileged: true - command: ["/bin/sh", "-c"] - args: - - iptables -I INPUT -i uesimtun0 -j ACCEPT; - sysctl -w net.ipv6.conf.all.disable_ipv6=1; - while true; do sleep 30; done; volumes: - name: 5gran-gnb-config configMap: From deb3e0422c54402564c8d203e8c67b21ba53def6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 21 Aug 2024 13:04:02 -0500 Subject: [PATCH 409/449] Delete 5gran/templates/5gran-ue-configmap.bak --- 5gran/templates/5gran-ue-configmap.bak | 79 -------------------------- 1 file changed, 79 deletions(-) delete mode 100644 5gran/templates/5gran-ue-configmap.bak diff --git a/5gran/templates/5gran-ue-configmap.bak b/5gran/templates/5gran-ue-configmap.bak deleted file mode 100644 index cb0b284..0000000 --- a/5gran/templates/5gran-ue-configmap.bak +++ /dev/null @@ -1,79 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: 5gran-ue-config -data: - 5gran-ue-configmap.yaml: | - # IMSI number of the UE. IMSI = [MCC|MNC|MSISDN] (In total 15 or 16 digits) - supi: 'imsi-208930000000001' - # Mobile Country Code value of HPLMN - mcc: '208' - # Mobile Network Code value of HPLMN (2 or 3 digits) - mnc: '93' - - # Permanent subscription key - key: '465B5CE8B199B49FAA5F0A2EE238A6BC' - # Operator code (OP or OPC) of the UE - op: 'E8ED289DEBA952E4283B54E88E6183CA' - # This value specifies the OP type and it can be either 'OP' or 'OPC' - opType: 'OPC' - # Authentication Management Field (AMF) value - amf: '8000' - # IMEI number of the device. It is used if no SUPI is provided - imei: '356938035643801' - # IMEISV number of the device. It is used if no SUPI and IMEI is provided - imeiSv: '4370816125816151' - - # List of gNB IP addresses for Radio Link Simulation - gnbSearchList: - - 0.0.0.0 - - # UAC Access Identities Configuration - uacAic: - mps: false - mcs: false - - # UAC Access Control Class - uacAcc: - normalClass: 0 - class11: false - class12: false - class13: false - class14: false - class15: false - - # Initial PDU sessions to be established - sessions: - - type: 'IPv4' - apn: 'internet' - slice: - sst: 1 - sd: 1 - emergency: false - - # Configured NSSAI for this UE by HPLMN - configured-nssai: - - sst: 1 - sd: 1 - - # Default Configured NSSAI for this UE - default-nssai: - - sst: 1 - sd: 1 - - # Supported encryption algorithms by this UE - integrity: - IA1: true - IA2: true - IA3: true - - # Supported integrity algorithms by this UE - ciphering: - EA1: true - EA2: true - EA3: true - - # Integrity protection maximum data rate for user plane - integrityMaxRate: - uplink: 'full' - downlink: 'full' From a6d9f4107be15f82c14edef711a38bb50257a9da Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 21 Aug 2024 13:04:09 -0500 Subject: [PATCH 410/449] Delete 5gran/templates/5gran-gnb-configmap.bak --- 5gran/templates/5gran-gnb-configmap.bak | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 5gran/templates/5gran-gnb-configmap.bak diff --git a/5gran/templates/5gran-gnb-configmap.bak b/5gran/templates/5gran-gnb-configmap.bak deleted file mode 100644 index b051bde..0000000 --- a/5gran/templates/5gran-gnb-configmap.bak +++ /dev/null @@ -1,24 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: 5gran-gnb-config -data: - 5gran-gnb-configmap.yaml: | - mcc: '208' # Mobile Country Code value - mnc: '93' # Mobile Network Code value (2 or 3 digits) - nci: '0x000000010' # NR Cell Identity (36-bit) - idLength: 32 # NR gNB ID length in bits [22...32] - tac: 7 # Tracking Area Code - linkIp: 0.0.0.0 - ngapIp: 0.0.0.0 - gtpIp: 0.0.0.0 - # List of AMF address information - amfConfigs: - - address: - port: 30412 - # List of supported S-NSSAIs by this gNB - slices: - - sst: 1 - sd: 1 - # Indicates whether or not SCTP stream number errors should be ignored. - ignoreStreamIds: true From 6a5de8190abf34027c4d885cfa80df37d1f3ae07 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 21 Aug 2024 13:25:12 -0500 Subject: [PATCH 411/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 193372c..d21ef76 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -22,6 +22,8 @@ spec: - name: gnb imagePullPolicy: {{ .Values.ran.image.pullPolicy }} image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" + securityContext: + privileged: true command: ["/bin/sh","-c","./nr-gnb -c /open5gs/config-map/5gran-gnb-configmap.yaml"] volumeMounts: - name: 5gran-gnb-config From 1b07396a7579d30a4c2dd5c39bd9479ab5c35dd2 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 21 Aug 2024 13:36:56 -0500 Subject: [PATCH 412/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index d21ef76..95f7958 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -44,7 +44,12 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + #command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + command: ["/bin/sh", "-c"] + args: + - ln -s /dev/net/tun /dev/tun; + ip tuntap add name ogstun mode tun; + nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com; volumes: - name: 5gran-gnb-config configMap: From f42b9bdbadcd2fdd23f0fedff0ee445e160d0e06 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 21 Aug 2024 13:37:52 -0500 Subject: [PATCH 413/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 95f7958..3c513b8 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -48,7 +48,7 @@ spec: command: ["/bin/sh", "-c"] args: - ln -s /dev/net/tun /dev/tun; - ip tuntap add name ogstun mode tun; + ip tuntap add name uesimtun0 mode tun; nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com; volumes: - name: 5gran-gnb-config From d773f58e4b4ddc0cfa9c96a54a0a0b23372499aa Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 21 Aug 2024 13:42:16 -0500 Subject: [PATCH 414/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 3c513b8..7c12dc8 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -44,11 +44,11 @@ spec: image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" securityContext: privileged: true - #command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] command: ["/bin/sh", "-c"] args: - ln -s /dev/net/tun /dev/tun; ip tuntap add name uesimtun0 mode tun; + ip link set uesimtun0 up; nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com; volumes: - name: 5gran-gnb-config From 159e74dcc5a0bc92ee9c9cfdbe048c964f9ab32c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 21 Aug 2024 13:47:50 -0500 Subject: [PATCH 415/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 7c12dc8..3b7515d 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -5,7 +5,6 @@ metadata: labels: epc-mode: 5gran spec: - #securityContext: scc-5gran-admin replicas: 1 selector: matchLabels: @@ -13,7 +12,6 @@ spec: template: metadata: annotations: - openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "false" labels: epc-mode: 5gran @@ -22,8 +20,6 @@ spec: - name: gnb imagePullPolicy: {{ .Values.ran.image.pullPolicy }} image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" - securityContext: - privileged: true command: ["/bin/sh","-c","./nr-gnb -c /open5gs/config-map/5gran-gnb-configmap.yaml"] volumeMounts: - name: 5gran-gnb-config @@ -42,14 +38,19 @@ spec: - name: uebinder imagePullPolicy: {{ .Values.ran.image.pullPolicy }} image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" + securityContext: + privileged: true + command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] + - name: debug + imagePullPolicy: {{ .Values.ran.image.pullPolicy }} + image: quay.io/wcaban/net-toolbox:latest securityContext: privileged: true command: ["/bin/sh", "-c"] - args: - - ln -s /dev/net/tun /dev/tun; - ip tuntap add name uesimtun0 mode tun; - ip link set uesimtun0 up; - nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com; + args: + - iptables -I INPUT -i uesimtun0 -j ACCEPT; + sysctl -w net.ipv6.conf.all.disable_ipv6=1; + while true; do sleep 30; done; volumes: - name: 5gran-gnb-config configMap: From 1840f41c3c0bdf2fd87759c43446df0c6879fc7e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Wed, 21 Aug 2024 13:49:36 -0500 Subject: [PATCH 416/449] Update 5gran-deploy.yaml --- 5gran/templates/5gran-deploy.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/5gran/templates/5gran-deploy.yaml b/5gran/templates/5gran-deploy.yaml index 3b7515d..6533735 100644 --- a/5gran/templates/5gran-deploy.yaml +++ b/5gran/templates/5gran-deploy.yaml @@ -20,6 +20,8 @@ spec: - name: gnb imagePullPolicy: {{ .Values.ran.image.pullPolicy }} image: "{{ .Values.ran.image.repository }}:{{ .Values.ran.image.tag }}" + securityContext: + privileged: true command: ["/bin/sh","-c","./nr-gnb -c /open5gs/config-map/5gran-gnb-configmap.yaml"] volumeMounts: - name: 5gran-gnb-config @@ -41,16 +43,6 @@ spec: securityContext: privileged: true command: ["/bin/sh","-c","sh nr-binder $(ip addr show uesimtun0 | grep -Po 'inet \\K[\\d.]+') ping google.com"] - - name: debug - imagePullPolicy: {{ .Values.ran.image.pullPolicy }} - image: quay.io/wcaban/net-toolbox:latest - securityContext: - privileged: true - command: ["/bin/sh", "-c"] - args: - - iptables -I INPUT -i uesimtun0 -j ACCEPT; - sysctl -w net.ipv6.conf.all.disable_ipv6=1; - while true; do sleep 30; done; volumes: - name: 5gran-gnb-config configMap: From 711fbfd2631ae9a67a1159cd87cbcd272829a055 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Tue, 27 Aug 2024 17:12:30 -0500 Subject: [PATCH 417/449] Update mongodb.yaml --- 5gcore/templates/mongodb.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/mongodb.yaml b/5gcore/templates/mongodb.yaml index c1f21cd..8af3093 100644 --- a/5gcore/templates/mongodb.yaml +++ b/5gcore/templates/mongodb.yaml @@ -59,4 +59,4 @@ spec: apiVersion: apps/v1 kind: Deployment name: open5gs-mongodb-d - targetCPUUtilizationPercentage: 60 + targetCPUUtilizationPercentage: 90 From 5130a9980fa61e767dcb2413a270450c2ea4f140 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 29 Aug 2024 15:23:21 -0500 Subject: [PATCH 418/449] Update web-ui-deploy.yaml --- 5gcore/templates/web-ui-deploy.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/5gcore/templates/web-ui-deploy.yaml b/5gcore/templates/web-ui-deploy.yaml index 2cfa32c..e916309 100644 --- a/5gcore/templates/web-ui-deploy.yaml +++ b/5gcore/templates/web-ui-deploy.yaml @@ -43,8 +43,6 @@ spec: epc-mode: webui template: metadata: - annotations: - sidecar.istio.io/inject: "true" labels: epc-mode: webui spec: From 212a1cd28db5dc023b5c5963ffb0dd35a2b5362b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 29 Aug 2024 17:01:14 -0500 Subject: [PATCH 419/449] Update mongodb.yaml --- 5gcore/templates/mongodb.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/5gcore/templates/mongodb.yaml b/5gcore/templates/mongodb.yaml index 8af3093..c78e179 100644 --- a/5gcore/templates/mongodb.yaml +++ b/5gcore/templates/mongodb.yaml @@ -47,16 +47,3 @@ spec: resources: requests: storage: 20Gi ---- -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open5gs-mongodb-d -spec: - maxReplicas: 7 - minReplicas: 1 - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open5gs-mongodb-d - targetCPUUtilizationPercentage: 90 From 02ed3b0571d5e33d0815050361f08aca6d4c888e Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 29 Aug 2024 17:06:32 -0500 Subject: [PATCH 420/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index 4321356..e1e4680 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -78,16 +78,3 @@ spec: - name: dev-net-tun hostPath: path: /dev/net/tun ---- -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open5gs-upf-d -spec: - maxReplicas: 2 - minReplicas: 1 - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open5gs-upf-d - targetCPUUtilizationPercentage: 80 From e234a5423a904c0e0458d5b4ffd15809e71ff44c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 29 Aug 2024 17:06:52 -0500 Subject: [PATCH 421/449] Update upf-deploy.yaml --- 5gcore/templates/upf-deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/upf-deploy.yaml b/5gcore/templates/upf-deploy.yaml index e1e4680..c3f55ef 100644 --- a/5gcore/templates/upf-deploy.yaml +++ b/5gcore/templates/upf-deploy.yaml @@ -42,7 +42,6 @@ spec: template: metadata: annotations: - openshift.io/required-scc: "scc-admin" sidecar.istio.io/inject: "false" labels: epc-mode: upf From 61ba9f8c43eb4d3222f5912f9b9d40461b49f0df Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 09:13:50 -0500 Subject: [PATCH 422/449] Update nrf-configmap.yaml --- 5gcore/templates/nrf-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/nrf-configmap.yaml b/5gcore/templates/nrf-configmap.yaml index 57f78f4..214e2b0 100644 --- a/5gcore/templates/nrf-configmap.yaml +++ b/5gcore/templates/nrf-configmap.yaml @@ -9,5 +9,5 @@ data: #logger: #file: /var/log/open5gs/nrf.log nrf: - sbi: - addr: 0.0.0.0 + sbi: + name: open5gs-nrf From cba1cb66ad85070be3b21cb0d9dc159b96d8a4bd Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 09:18:36 -0500 Subject: [PATCH 423/449] Update SCC-AdminRoleBinding.yaml --- 5gcore/templates/SCC-AdminRoleBinding.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/SCC-AdminRoleBinding.yaml b/5gcore/templates/SCC-AdminRoleBinding.yaml index 3057e2d..4fa20ac 100644 --- a/5gcore/templates/SCC-AdminRoleBinding.yaml +++ b/5gcore/templates/SCC-AdminRoleBinding.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: default-scc-admin-binding - namespace: open5gs + namespace: open5gcore roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -10,4 +10,4 @@ roleRef: subjects: - kind: ServiceAccount name: default - namespace: open5gs + namespace: open5gcore From 6003c43f07d662bb976f7eeb41f5eaeac3241d7a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 09:23:25 -0500 Subject: [PATCH 424/449] Update scc-admin.yaml --- 5gcore/templates/scc-admin.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/scc-admin.yaml b/5gcore/templates/scc-admin.yaml index 4eb0b72..08e3d60 100644 --- a/5gcore/templates/scc-admin.yaml +++ b/5gcore/templates/scc-admin.yaml @@ -1,9 +1,8 @@ -kind: SecurityContextConstraints apiVersion: security.openshift.io/v1 +kind: SecurityContextConstraints metadata: name: scc-admin allowPrivilegedContainer: true -allowHostDirVolumePlugin: true runAsUser: type: RunAsAny seLinuxContext: @@ -13,6 +12,8 @@ fsGroup: supplementalGroups: type: RunAsAny users: +- system:serviceaccount:open5gcore:scc-admin-sa +- system:serviceaccount:open5gcore:default - my-admin-user groups: - my-admin-group From 48d44442949842fa91b832a43d792605e07d9076 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:00:41 -0500 Subject: [PATCH 425/449] Update amf-configmap.yaml --- 5gcore/templates/amf-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/amf-configmap.yaml b/5gcore/templates/amf-configmap.yaml index 027758f..5516430 100644 --- a/5gcore/templates/amf-configmap.yaml +++ b/5gcore/templates/amf-configmap.yaml @@ -37,5 +37,5 @@ data: full: Open5GS amf_name: open5gs-amf nrf: - sbi: - name: open5gs-nrf + sbi: + name: open5gs-nrf From 35a3d969629a849ce427256dd8817f16a6bb0c42 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:01:52 -0500 Subject: [PATCH 426/449] Update ausf-configmap.yaml --- 5gcore/templates/ausf-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/ausf-configmap.yaml b/5gcore/templates/ausf-configmap.yaml index 37e268c..c1b2f54 100644 --- a/5gcore/templates/ausf-configmap.yaml +++ b/5gcore/templates/ausf-configmap.yaml @@ -11,5 +11,5 @@ data: - addr: 0.0.0.0 advertise: open5gs-ausf nrf: - sbi: - name: open5gs-nrf + sbi: + name: open5gs-nrf From 29f37b758639bb7702db94c3d2986fa4bc614fc6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:02:21 -0500 Subject: [PATCH 427/449] Update nrf-configmap.yaml --- 5gcore/templates/nrf-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/nrf-configmap.yaml b/5gcore/templates/nrf-configmap.yaml index 214e2b0..16bf410 100644 --- a/5gcore/templates/nrf-configmap.yaml +++ b/5gcore/templates/nrf-configmap.yaml @@ -9,5 +9,5 @@ data: #logger: #file: /var/log/open5gs/nrf.log nrf: - sbi: - name: open5gs-nrf + sbi: + name: open5gs-nrf From 738a02e5aa2538603113e6f91776e6e840765f43 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:02:44 -0500 Subject: [PATCH 428/449] Update nssf-configmap.yaml --- 5gcore/templates/nssf-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/nssf-configmap.yaml b/5gcore/templates/nssf-configmap.yaml index 1249751..31816c3 100644 --- a/5gcore/templates/nssf-configmap.yaml +++ b/5gcore/templates/nssf-configmap.yaml @@ -18,5 +18,5 @@ data: s_nssai: sst: 1 nrf: - sbi: - name: open5gs-nrf + sbi: + name: open5gs-nrf From 32962a8653604cfbcae56504ba6acfc2031d3e7c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:03:10 -0500 Subject: [PATCH 429/449] Update pcf-configmap.yaml --- 5gcore/templates/pcf-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/pcf-configmap.yaml b/5gcore/templates/pcf-configmap.yaml index dcea9ed..1d0d515 100644 --- a/5gcore/templates/pcf-configmap.yaml +++ b/5gcore/templates/pcf-configmap.yaml @@ -14,5 +14,5 @@ data: - addr: 0.0.0.0 advertise: open5gs-pcf nrf: - sbi: - name: open5gs-nrf + sbi: + name: open5gs-nrf From 204ac22f0d7ca7a3574633019e0f456e594a4685 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:03:30 -0500 Subject: [PATCH 430/449] Update smf-configmap.yaml --- 5gcore/templates/smf-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/smf-configmap.yaml b/5gcore/templates/smf-configmap.yaml index ac475ce..76df87d 100644 --- a/5gcore/templates/smf-configmap.yaml +++ b/5gcore/templates/smf-configmap.yaml @@ -27,8 +27,8 @@ data: - 8.8.8.8 mtu: 1400 nrf: - sbi: - name: open5gs-nrf + sbi: + name: open5gs-nrf upf: pfcp: - name: open5gs-upf From b9769fec0085bf4d77a79f83004ecbb378e2960a Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:03:44 -0500 Subject: [PATCH 431/449] Update udm-configmap.yaml --- 5gcore/templates/udm-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/udm-configmap.yaml b/5gcore/templates/udm-configmap.yaml index e7a1750..af6d21a 100644 --- a/5gcore/templates/udm-configmap.yaml +++ b/5gcore/templates/udm-configmap.yaml @@ -13,5 +13,5 @@ data: - addr: 0.0.0.0 advertise: open5gs-udm nrf: - sbi: - name: open5gs-nrf + sbi: + name: open5gs-nrf From 56682457142aa489e5b64be659e59528bcb3a830 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:03:59 -0500 Subject: [PATCH 432/449] Update udr-configmap.yaml --- 5gcore/templates/udr-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/5gcore/templates/udr-configmap.yaml b/5gcore/templates/udr-configmap.yaml index 727deb7..b351b90 100644 --- a/5gcore/templates/udr-configmap.yaml +++ b/5gcore/templates/udr-configmap.yaml @@ -14,5 +14,5 @@ data: - addr: 0.0.0.0 advertise: open5gs-udr nrf: - sbi: - name: open5gs-nrf + sbi: + name: open5gs-nrf From 84e1fa47d5a76ff3e1abec29bf3232306f9583bb Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:16:19 -0500 Subject: [PATCH 433/449] Update nrf-deploy.yaml --- 5gcore/templates/nrf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/nrf-deploy.yaml b/5gcore/templates/nrf-deploy.yaml index 6cd345d..1fdde43 100644 --- a/5gcore/templates/nrf-deploy.yaml +++ b/5gcore/templates/nrf-deploy.yaml @@ -9,7 +9,7 @@ spec: epc-mode: nrf ports: - protocol: TCP - port: 80 + port: 88 targetPort: 80 --- apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2 From 840b8aa19a0bf1eceda4bf82c547e66ef68f336c Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:20:16 -0500 Subject: [PATCH 434/449] Update nrf-deploy.yaml --- 5gcore/templates/nrf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/nrf-deploy.yaml b/5gcore/templates/nrf-deploy.yaml index 1fdde43..6cd345d 100644 --- a/5gcore/templates/nrf-deploy.yaml +++ b/5gcore/templates/nrf-deploy.yaml @@ -9,7 +9,7 @@ spec: epc-mode: nrf ports: - protocol: TCP - port: 88 + port: 80 targetPort: 80 --- apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2 From 2798444b78bded6c4988126b3931cd69073100fb Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:20:49 -0500 Subject: [PATCH 435/449] Update nrf-deploy.yaml --- 5gcore/templates/nrf-deploy.yaml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/5gcore/templates/nrf-deploy.yaml b/5gcore/templates/nrf-deploy.yaml index 6cd345d..489f8ca 100644 --- a/5gcore/templates/nrf-deploy.yaml +++ b/5gcore/templates/nrf-deploy.yaml @@ -44,16 +44,4 @@ spec: - name: open5gs-nrf-config configMap: name: open5gs-nrf-config ---- -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open5gs-nrf-d -spec: - maxReplicas: 7 - minReplicas: 1 - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open5gs-nrf-d - targetCPUUtilizationPercentage: 60 + From 41ee315d8322da6b198643a73688b695e76cd88f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:21:15 -0500 Subject: [PATCH 436/449] Update nrf-configmap.yaml --- 5gcore/templates/nrf-configmap.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/5gcore/templates/nrf-configmap.yaml b/5gcore/templates/nrf-configmap.yaml index 16bf410..545b969 100644 --- a/5gcore/templates/nrf-configmap.yaml +++ b/5gcore/templates/nrf-configmap.yaml @@ -6,8 +6,6 @@ metadata: epc-mode: nrf data: nrf.yaml: | - #logger: - #file: /var/log/open5gs/nrf.log nrf: sbi: name: open5gs-nrf From e5adec0d2bc9aeecc94ef7b65364ed7aa3561945 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:23:39 -0500 Subject: [PATCH 437/449] Update nrf-deploy.yaml --- 5gcore/templates/nrf-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5gcore/templates/nrf-deploy.yaml b/5gcore/templates/nrf-deploy.yaml index 489f8ca..d8fcab1 100644 --- a/5gcore/templates/nrf-deploy.yaml +++ b/5gcore/templates/nrf-deploy.yaml @@ -27,7 +27,7 @@ spec: metadata: annotations: openshift.io/required-scc: "scc-admin" - sidecar.istio.io/inject: "true" + sidecar.istio.io/inject: "false" labels: epc-mode: nrf spec: From 83a87ff84b9e8b15f87b5919f93916ff45dfe64d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:41:48 -0500 Subject: [PATCH 438/449] Delete 5gcore/templates/speedtest.yaml --- 5gcore/templates/speedtest.yaml | 47 --------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 5gcore/templates/speedtest.yaml diff --git a/5gcore/templates/speedtest.yaml b/5gcore/templates/speedtest.yaml deleted file mode 100644 index 582a0c4..0000000 --- a/5gcore/templates/speedtest.yaml +++ /dev/null @@ -1,47 +0,0 @@ -kind: Route -apiVersion: route.openshift.io/v1 -metadata: - name: speed-test -spec: - to: - kind: Service - name: speed-test - weight: 100 - port: - targetPort: 80 ---- -kind: Service -apiVersion: v1 -metadata: - name: speed-test -spec: - ports: - - protocol: TCP - port: 80 - targetPort: 80 - selector: - name: speed-test ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - name: speed-test - name: speed-test -spec: - replicas: 1 - selector: - matchLabels: - name: speed-test - template: - metadata: - labels: - name: speed-test - spec: - containers: - - image: adolfintel/speedtest:latest - name: speed-test - command: [ "/bin/bash", "-c", "--" ] - args: [ "MODE=standalone WEBPORT=80; /entrypoint.sh;" ] - ports: - - containerPort: 80 From f07b084c533fea413f26307a99bb4c88eaf37b5f Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 10:41:58 -0500 Subject: [PATCH 439/449] Delete 5gcore/templates/debug-app.yaml --- 5gcore/templates/debug-app.yaml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 5gcore/templates/debug-app.yaml diff --git a/5gcore/templates/debug-app.yaml b/5gcore/templates/debug-app.yaml deleted file mode 100644 index 022c461..0000000 --- a/5gcore/templates/debug-app.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - name: debug-app - name: debug-app -spec: - replicas: 1 - selector: - matchLabels: - name: debug-app - template: - metadata: - annotations: - labels: - name: debug-app - spec: - containers: - - image: quay.io/wcaban/net-toolbox:latest - name: debug-app - command: [ "/bin/bash", "-c", "--" ] - args: [ "while true; do sleep 30; done;" ] From d7fdb9429f295cabeb030e4a019c956eb8206e46 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 11:00:03 -0500 Subject: [PATCH 440/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 93b43f3..9058bbc 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -87,16 +87,3 @@ spec: - name: open5gs-amf-config configMap: name: open5gs-amf-config ---- -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open5gs-amf-d -spec: - maxReplicas: 3 - minReplicas: 1 - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open5gs-amf-d - targetCPUUtilizationPercentage: 80 From e317901820ad808b0ff1334d34d5d17a2944c6a8 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 11:00:47 -0500 Subject: [PATCH 441/449] Update amf-configmap.yaml --- 5gcore/templates/amf-configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/5gcore/templates/amf-configmap.yaml b/5gcore/templates/amf-configmap.yaml index 5516430..edde720 100644 --- a/5gcore/templates/amf-configmap.yaml +++ b/5gcore/templates/amf-configmap.yaml @@ -39,3 +39,4 @@ data: nrf: sbi: name: open5gs-nrf + port: 8080 From 6c3dee550a5793581b19ad24ca72119055e412a1 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 11:01:06 -0500 Subject: [PATCH 442/449] Update ausf-deploy.yaml --- 5gcore/templates/ausf-deploy.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/5gcore/templates/ausf-deploy.yaml b/5gcore/templates/ausf-deploy.yaml index 8042dcb..dde326c 100644 --- a/5gcore/templates/ausf-deploy.yaml +++ b/5gcore/templates/ausf-deploy.yaml @@ -44,16 +44,3 @@ spec: - name: open5gs-ausf-config configMap: name: open5gs-ausf-config ---- -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open5gs-ausf-d -spec: - maxReplicas: 7 - minReplicas: 1 - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open5gs-ausf-d - targetCPUUtilizationPercentage: 60 From bb356d4d32f1f2c3c0d6b6a542db76613c2b972b Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 11:02:08 -0500 Subject: [PATCH 443/449] Update nssf-deploy.yaml --- 5gcore/templates/nssf-deploy.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/5gcore/templates/nssf-deploy.yaml b/5gcore/templates/nssf-deploy.yaml index 985c9df..58b4d87 100644 --- a/5gcore/templates/nssf-deploy.yaml +++ b/5gcore/templates/nssf-deploy.yaml @@ -43,17 +43,4 @@ spec: volumes: - name: open5gs-nssf-config configMap: - name: open5gs-nssf-config ---- -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open5gs-nssf-d -spec: - maxReplicas: 7 - minReplicas: 1 - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open5gs-nssf-d - targetCPUUtilizationPercentage: 60 + name: open5gs-nssf-config From 3c0435c73fff4b5bb279f51fc48a43c085bda2bb Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 11:02:26 -0500 Subject: [PATCH 444/449] Update pcf-deploy.yaml --- 5gcore/templates/pcf-deploy.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/5gcore/templates/pcf-deploy.yaml b/5gcore/templates/pcf-deploy.yaml index 6b3b229..9772a6d 100644 --- a/5gcore/templates/pcf-deploy.yaml +++ b/5gcore/templates/pcf-deploy.yaml @@ -43,17 +43,4 @@ spec: volumes: - name: open5gs-pcf-config configMap: - name: open5gs-pcf-config ---- -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open5gs-pcf-d -spec: - maxReplicas: 7 - minReplicas: 1 - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open5gs-pcf-d - targetCPUUtilizationPercentage: 60 + name: open5gs-pcf-config From 4dd772e09a58cf26c97a98e1e1edf10eeaea69c6 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 11:02:42 -0500 Subject: [PATCH 445/449] Update smf-deploy.yaml --- 5gcore/templates/smf-deploy.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/5gcore/templates/smf-deploy.yaml b/5gcore/templates/smf-deploy.yaml index 3247549..8f7e3a4 100644 --- a/5gcore/templates/smf-deploy.yaml +++ b/5gcore/templates/smf-deploy.yaml @@ -44,17 +44,4 @@ spec: volumes: - name: open5gs-smf-config configMap: - name: open5gs-smf-config ---- -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open5gs-smf-d -spec: - maxReplicas: 1 - minReplicas: 1 - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open5gs-smf-d - targetCPUUtilizationPercentage: 60 + name: open5gs-smf-config From 8b070a8fcb31e68a9edac043226571a704988b8d Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 11:02:57 -0500 Subject: [PATCH 446/449] Update udm-deploy.yaml --- 5gcore/templates/udm-deploy.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/5gcore/templates/udm-deploy.yaml b/5gcore/templates/udm-deploy.yaml index d000fac..a6a8871 100644 --- a/5gcore/templates/udm-deploy.yaml +++ b/5gcore/templates/udm-deploy.yaml @@ -44,16 +44,3 @@ spec: - name: open5gs-udm-config configMap: name: open5gs-udm-config ---- -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open5gs-udm-d -spec: - maxReplicas: 7 - minReplicas: 1 - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open5gs-udm-d - targetCPUUtilizationPercentage: 60 From 3f39b324b203c47854224d29b7bf8273704122df Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 11:03:15 -0500 Subject: [PATCH 447/449] Update udr-deploy.yaml --- 5gcore/templates/udr-deploy.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/5gcore/templates/udr-deploy.yaml b/5gcore/templates/udr-deploy.yaml index 439b811..d644c87 100644 --- a/5gcore/templates/udr-deploy.yaml +++ b/5gcore/templates/udr-deploy.yaml @@ -44,16 +44,3 @@ spec: - name: open5gs-udr-config configMap: name: open5gs-udr-config ---- -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: open5gs-udr-d -spec: - maxReplicas: 7 - minReplicas: 1 - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: open5gs-udr-d - targetCPUUtilizationPercentage: 60 From 8ff2396d854721e9208356a1d9bf97e991fccd61 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 11:04:08 -0500 Subject: [PATCH 448/449] Update amf-configmap.yaml --- 5gcore/templates/amf-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/5gcore/templates/amf-configmap.yaml b/5gcore/templates/amf-configmap.yaml index edde720..5516430 100644 --- a/5gcore/templates/amf-configmap.yaml +++ b/5gcore/templates/amf-configmap.yaml @@ -39,4 +39,3 @@ data: nrf: sbi: name: open5gs-nrf - port: 8080 From d32d18ed234ff94cd4f2295f0e44e3c048d66525 Mon Sep 17 00:00:00 2001 From: Fatih Nar Date: Thu, 1 May 2025 11:05:18 -0500 Subject: [PATCH 449/449] Update amf-deploy.yaml --- 5gcore/templates/amf-deploy.yaml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/5gcore/templates/amf-deploy.yaml b/5gcore/templates/amf-deploy.yaml index 9058bbc..456f136 100644 --- a/5gcore/templates/amf-deploy.yaml +++ b/5gcore/templates/amf-deploy.yaml @@ -12,23 +12,7 @@ spec: - protocol: SCTP port: {{ .Values.cnf.amf.sctp.port }} targetPort: 38412 - nodePort: {{ .Values.cnf.amf.sctp.nodeport }} ---- -apiVersion: v1 -kind: Service -metadata: - name: open5gs-amf - labels: - epc-mode: amf -spec: - type: NodePort - selector: - epc-mode: amf - ports: - - protocol: TCP - port: {{ .Values.cnf.amf.http.port }} - targetPort: 80 - nodePort: {{ .Values.cnf.amf.http.nodeport }} + nodePort: {{ .Values.cnf.amf.sctp.nodeport }} --- kind: NetworkPolicy apiVersion: networking.k8s.io/v1