AETHER-507 Replace 4g terms to 5g terms for omec-user-plane
Change-Id: Ica6e607b80dfed12924d468f5de5cdca593275f3
diff --git a/omec/omec-user-plane/Chart.yaml b/omec/omec-user-plane/Chart.yaml
index 590b524..750b2fd 100644
--- a/omec/omec-user-plane/Chart.yaml
+++ b/omec/omec-user-plane/Chart.yaml
@@ -7,4 +7,4 @@
name: omec-user-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.2.1
+version: 0.3.0
diff --git a/omec/omec-user-plane/templates/configmap-spgwu.yaml b/omec/omec-user-plane/templates/configmap-upf.yaml
similarity index 70%
rename from omec/omec-user-plane/templates/configmap-spgwu.yaml
rename to omec/omec-user-plane/templates/configmap-upf.yaml
index 5829656..ec88ad4 100644
--- a/omec/omec-user-plane/templates/configmap-spgwu.yaml
+++ b/omec/omec-user-plane/templates/configmap-upf.yaml
@@ -8,11 +8,11 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: spgwu
+ name: upf
labels:
-{{ tuple "spgwu" . | include "omec-user-plane.metadata_labels" | indent 4 }}
+{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
data:
-{{- range $key, $value := .Values.config.spgwu.cfgFiles }}
+{{- range $key, $value := .Values.config.upf.cfgFiles }}
{{ $key }}: {{ toJson $value | quote }}
{{- end }}
bessd-poststart.sh: |
diff --git a/omec/omec-user-plane/templates/networks.yaml b/omec/omec-user-plane/templates/networks.yaml
index d9bd41a..b749ea8 100644
--- a/omec/omec-user-plane/templates/networks.yaml
+++ b/omec/omec-user-plane/templates/networks.yaml
@@ -8,31 +8,31 @@
apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
- name: s1u-net
-{{- if $.Values.config.spgwu.sriov.enabled }}
+ name: access-net
+{{- if $.Values.config.upf.sriov.enabled }}
annotations:
- k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_s1u_net
+ k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_access_net
{{- end }}
spec:
config: '{
- "type": {{ .Values.config.spgwu.cniPlugin | quote }},
+ "type": {{ .Values.config.upf.cniPlugin | quote }},
"ipam": {
- "type": {{ .Values.config.spgwu.ipam | quote }}
+ "type": {{ .Values.config.upf.ipam | quote }}
}
}'
---
apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
- name: sgi-net
-{{- if $.Values.config.spgwu.sriov.enabled }}
+ name: core-net
+{{- if $.Values.config.upf.sriov.enabled }}
annotations:
- k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_sgi_net
+ k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio_core_net
{{- end }}
spec:
config: '{
- "type": {{ .Values.config.spgwu.cniPlugin | quote }},
+ "type": {{ .Values.config.upf.cniPlugin | quote }},
"ipam": {
- "type": {{ .Values.config.spgwu.ipam | quote }}
+ "type": {{ .Values.config.upf.ipam | quote }}
}
}'
diff --git a/omec/omec-user-plane/templates/service-spgwu.yaml b/omec/omec-user-plane/templates/service-spgwu.yaml
deleted file mode 100644
index d310b29..0000000
--- a/omec/omec-user-plane/templates/service-spgwu.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: spgwu-headless
- labels:
-{{ tuple "spgwu" . | include "omec-user-plane.metadata_labels" | indent 4 }}
-spec:
- clusterIP: None
- selector:
-{{ tuple "spgwu" . | include "omec-user-plane.metadata_labels" | indent 4 }}
----
-apiVersion: v1
-kind: Service
-metadata:
- name: spgwu-external
- labels:
-{{ tuple "spgwu" . | include "omec-user-plane.metadata_labels" | indent 4 }}
-spec:
- selector:
-{{ tuple "spgwu" . | include "omec-user-plane.metadata_labels" | indent 4 }}
- type: NodePort
- ports:
- - name: bess-web
- protocol: TCP
- port: 8000
- nodePort: {{ .Values.config.spgwu.bess.web.nodePort }}
diff --git a/omec/omec-user-plane/templates/service-upf.yaml b/omec/omec-user-plane/templates/service-upf.yaml
new file mode 100644
index 0000000..cb4d8a7
--- /dev/null
+++ b/omec/omec-user-plane/templates/service-upf.yaml
@@ -0,0 +1,33 @@
+{{/*
+# Copyright 2020-present Open Networking Foundation
+
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+*/}}
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: upf-headless
+ labels:
+{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
+spec:
+ clusterIP: None
+ selector:
+{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: upf-external
+ labels:
+{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
+spec:
+ selector:
+{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
+ type: NodePort
+ ports:
+ - name: bess-web
+ protocol: TCP
+ port: 8000
+ nodePort: {{ .Values.config.upf.bess.web.nodePort }}
diff --git a/omec/omec-user-plane/templates/statefulset-spgwu.yaml b/omec/omec-user-plane/templates/statefulset-upf.yaml
similarity index 70%
rename from omec/omec-user-plane/templates/statefulset-spgwu.yaml
rename to omec/omec-user-plane/templates/statefulset-upf.yaml
index 1379d8f..f17b60d 100644
--- a/omec/omec-user-plane/templates/statefulset-spgwu.yaml
+++ b/omec/omec-user-plane/templates/statefulset-upf.yaml
@@ -4,44 +4,44 @@
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/}}
-{{- $upfConfig := index .Values.config.spgwu.cfgFiles "upf.json" }}
-{{- $s1uConfig := index $upfConfig "s1u" }}
-{{- $sgiConfig := index $upfConfig "sgi" }}
+{{- $upfConfig := index .Values.config.upf.cfgFiles "upf.json" }}
+{{- $accessConfig := index $upfConfig "access" }}
+{{- $coreConfig := index $upfConfig "core" }}
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
- name: spgwu
+ name: upf
labels:
-{{ tuple "spgwu" . | include "omec-user-plane.metadata_labels" | indent 4 }}
+{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
spec:
replicas: 1
- serviceName: spgwu-headless
+ serviceName: upf-headless
selector:
matchLabels:
-{{ tuple "spgwu" . | include "omec-user-plane.metadata_labels" | indent 6 }}
+{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 6 }}
template:
metadata:
labels:
-{{ tuple "spgwu" . | include "omec-user-plane.metadata_labels" | indent 8 }}
+{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 8 }}
annotations:
k8s.v1.cni.cncf.io/networks: '[
{
- "name": "s1u-net",
- "interface": {{ index $s1uConfig "ifname" | quote }},
- "ips": {{ .Values.config.spgwu.s1u.ip | quote }}
+ "name": "access-net",
+ "interface": {{ index $accessConfig "ifname" | quote }},
+ "ips": {{ .Values.config.upf.access.ip | quote }}
},
{
- "name": "sgi-net",
- "interface": {{ index $sgiConfig "ifname" | quote }},
- "ips": {{ .Values.config.spgwu.sgi.ip | quote }}
+ "name": "core-net",
+ "interface": {{ index $coreConfig "ifname" | quote }},
+ "ips": {{ .Values.config.upf.core.ip | quote }}
}
]'
spec:
shareProcessNamespace: true
{{- if .Values.nodeSelectors.enabled }}
nodeSelector:
- {{ .Values.nodeSelectors.spgwu.label }}: {{ .Values.nodeSelectors.spgwu.value }}
+ {{ .Values.nodeSelectors.upf.label }}: {{ .Values.nodeSelectors.upf.value }}
{{- end }}
initContainers:
- name: bess-init
@@ -49,15 +49,15 @@
imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
command: ["sh", "-xec"]
args:
- - ip route replace {{ .Values.config.spgwu.enb.subnet }} via {{ .Values.config.spgwu.s1u.gateway }};
- ip route replace default via {{ .Values.config.spgwu.sgi.gateway }} metric 110;
+ - ip route replace {{ .Values.config.upf.enb.subnet }} via {{ .Values.config.upf.access.gateway }};
+ ip route replace default via {{ .Values.config.upf.core.gateway }} metric 110;
iptables -I OUTPUT -p icmp --icmp-type port-unreachable -j DROP;
securityContext:
capabilities:
add:
- NET_ADMIN
{{- if .Values.config.coreDump.enabled }}
-{{ tuple "spgwu" . | include "omec-user-plane.coredump_init" | indent 8 }}
+{{ tuple "upf" . | include "omec-user-plane.coredump_init" | indent 8 }}
{{- end }}
containers:
- name: bessd
@@ -71,7 +71,7 @@
tty: true
command: ["/bin/bash", "-xc"]
args:
- {{- if .Values.config.spgwu.hugepage.enabled }}
+ {{- if .Values.config.upf.hugepage.enabled }}
- bessd -f -grpc-url=0.0.0.0:10514
{{- else }}
- bessd -m 0 -f -grpc-url=0.0.0.0:10514
@@ -90,29 +90,29 @@
{{- if .Values.resources.enabled }}
{{ toYaml .Values.resources.bess.requests | indent 12 }}
{{- end }}
- {{- if .Values.config.spgwu.hugepage.enabled }}
+ {{- if .Values.config.upf.hugepage.enabled }}
hugepages-1Gi: 2Gi
{{- end }}
- {{- if .Values.config.spgwu.sriov.enabled }}
- intel.com/sriov_vfio_s1u_net: 1
- intel.com/sriov_vfio_sgi_net: 1
+ {{- if .Values.config.upf.sriov.enabled }}
+ intel.com/sriov_vfio_access_net: 1
+ intel.com/sriov_vfio_core_net: 1
{{- end }}
limits:
{{- if .Values.resources.enabled }}
{{ toYaml .Values.resources.bess.limits | indent 12 }}
{{- end }}
- {{- if .Values.config.spgwu.hugepage.enabled }}
+ {{- if .Values.config.upf.hugepage.enabled }}
hugepages-1Gi: 2Gi
{{- end }}
- {{- if .Values.config.spgwu.sriov.enabled }}
- intel.com/sriov_vfio_s1u_net: 1
- intel.com/sriov_vfio_sgi_net: 1
+ {{- if .Values.config.upf.sriov.enabled }}
+ intel.com/sriov_vfio_access_net: 1
+ intel.com/sriov_vfio_core_net: 1
{{- end }}
env:
- name: CONF_FILE
value: /etc/bess/conf/upf.json
volumeMounts:
- {{- if .Values.config.spgwu.hugepage.enabled }}
+ {{- if .Values.config.upf.hugepage.enabled }}
- name: hugepages
mountPath: /dev/hugepages
{{- end }}
@@ -131,8 +131,8 @@
command: ["/opt/bess/bessctl/conf/route_control.py"]
args:
- -i
- - {{ index $s1uConfig "ifname" }}
- - {{ index $sgiConfig "ifname" }}
+ - {{ index $accessConfig "ifname" }}
+ - {{ index $coreConfig "ifname" }}
{{- if .Values.resources.enabled }}
resources:
{{ toYaml .Values.resources.routectl | indent 10 }}
@@ -146,7 +146,7 @@
{{ toYaml .Values.resources.web | indent 10 }}
{{- end }}
- name: cpiface
- {{- if eq .Values.config.spgwu.cpiface.mode "zmq" }}
+ {{- if eq .Values.config.upf.cpiface.mode "zmq" }}
image: {{ .Values.images.tags.zmqiface | quote }}
imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
env:
@@ -174,9 +174,9 @@
volumes:
- name: configs
configMap:
- name: spgwu
+ name: upf
defaultMode: 493
- {{- if .Values.config.spgwu.hugepage.enabled }}
+ {{- if .Values.config.upf.hugepage.enabled }}
- name: hugepages
emptyDir:
medium: HugePages
diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
index 648dca7..99b573f 100644
--- a/omec/omec-user-plane/values.yaml
+++ b/omec/omec-user-plane/values.yaml
@@ -12,7 +12,7 @@
nodeSelectors:
enabled: false
- spgwu:
+ upf:
label: omec-upf
value: enabled
@@ -51,7 +51,7 @@
coreDump:
enabled: false
path: /tmp/coredump
- spgwu:
+ upf:
hugepage:
enabled: true
sriov:
@@ -61,10 +61,10 @@
cniPlugin: vfioveth
enb:
subnet: 192.168.251.0/24
- s1u:
+ access:
gateway: 192.168.252.1
ip: 192.168.252.3/24
- sgi:
+ core:
gateway: 192.168.250.1
ip: 192.168.250.3/24
cfgFiles:
@@ -75,10 +75,10 @@
cpiface:
nb_dst_ip: spgwc-headless
hostname: upf-bess
- s1u:
- ifname: s1u
- sgi:
- ifname: sgi
+ access:
+ ifname: access
+ core:
+ ifname: core
measure: true
bess:
web: