Skip to content
GitLab
Commit 9839cef4 authored by Sagar Arora's avatar Sagar Arora 🚴🏻
Browse files

Update the release tag of spgwu to v1.4.0

parent 3f21bb7c
Hide whitespace changes
Inline Side-by-side
charts/oai-5g-core/oai-5g-basic/Chart.yaml
View file @ 9839cef4
......@@ -53,4 +53,4 @@ dependencies:
- condition: oai-spgwu-tiny.enabled
name: oai-spgwu-tiny
repository: "file://../oai-spgwu-tiny"
version: v1.3.0
\ No newline at end of file
version: v1.4.0
charts/oai-5g-core/oai-5g-basic/values.yaml
View file @ 9839cef4
......@@ -63,9 +63,9 @@ oai-amf:
- name: "regcred"
multus:
create: false
n1IPadd: "172.21.10.6"
n1IPadd: "172.21.6.201"
n1Netmask: "22"
n1Gateway: "172.21.11.254"
n1Gateway: "172.21.7.254"
hostInterface: "bond0" # Interface of the host machine on which this pod will be scheduled
config:
amfInterfaceNameForNGAP: "eth0" # If multus creation is true then net1 else eth0
......@@ -94,14 +94,16 @@ oai-spgwu-tiny:
weight: 6
nfimage: # image name either locally present or in a public/private repository
repository: docker.io/oaisoftwarealliance/oai-spgwu-tiny ## The image will be pulled from dockerhub
version: v1.3.0 ## The branch to be used to pull from dockerhub
version: v1.4.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
imagePullSecrets:
- name: "regcred"
multus:
create: false
n3Ip: "172.21.10.102"
n3Ip: "172.21.6.200"
n3Netmask: "22"
sgiGw: "172.21.11.254"
sgiGw: "172.21.7.254"
hostInterface: "bond0"
config:
sgwS1uIf: "eth0" # n3 interface, net1 if gNB is outside the cluster network and multus creation is true else eth0
......@@ -121,8 +123,10 @@ oai-smf:
version: v1.4.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
imagePullSecrets:
- name: "regcred"
config:
useLocalSubscriptionInfo: "no"
useLocalSubscriptionInfo: "no" #this means ip-address information will be fetched from UDR
ueMtu: 1500
dnsIpv4Address: "172.21.3.100" # configure the dns for UE don't use Kubernetes DNS
dnsSecIpv4Address: "172.21.3.100" # configure the dns for UE don't use Kubernetes DNS
......
charts/oai-5g-core/oai-5g-mini/Chart.yaml
View file @ 9839cef4
......@@ -39,4 +39,4 @@ dependencies:
- condition: oai-spgwu-tiny.enabled
name: oai-spgwu-tiny
repository: "file://../oai-spgwu-tiny"
version: v1.3.0
version: v1.4.0
charts/oai-5g-core/oai-5g-mini/values.yaml
View file @ 9839cef4
......@@ -30,9 +30,9 @@ oai-amf:
- name: "regcred"
multus:
create: false
n1IPadd: "172.21.10.6"
n1IPadd: "172.21.6.201"
n1Netmask: "22"
n1Gateway: "172.21.11.254"
n1Gateway: "172.21.7.254"
hostInterface: "bond0" # Interface of the host machine on which this pod will be scheduled
config:
amfInterfaceNameForNGAP: "eth0" # If multus creation is true then net1 else eth0
......@@ -60,14 +60,16 @@ oai-spgwu-tiny:
weight: 3
nfimage: # image name either locally present or in a public/private repository
repository: docker.io/oaisoftwarealliance/oai-spgwu-tiny ## The image will be pulled from dockerhub
version: v1.3.0 ## The branch to be used to pull from dockerhub
version: v1.4.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
imagePullSecrets:
- name: "regcred"
multus:
create: false
n3Ip: "172.21.10.102"
n3Ip: "172.21.6.200"
n3Netmask: "22"
sgiGw: "172.21.11.254"
sgiGw: "172.21.7.254"
hostInterface: "bond0"
nodeSelector: {}
config:
......@@ -87,6 +89,8 @@ oai-smf:
version: v1.4.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
imagePullSecrets:
- name: "regcred"
config:
useLocalSubscriptionInfo: "yes"
ueMtu: 1500
......
charts/oai-5g-core/oai-5g-slicing/Chart.yaml
View file @ 9839cef4
......@@ -62,4 +62,4 @@ dependencies:
- condition: oai-spgwu-tiny.enabled
name: oai-spgwu-tiny
repository: "file://../oai-spgwu-tiny"
version: v1.3.0
version: v1.4.0
charts/oai-5g-core/oai-5g-slicing/values.yaml
View file @ 9839cef4
......@@ -74,9 +74,9 @@ oai-amf:
- name: "regcred"
multus:
create: false
n1IPadd: "172.21.10.6"
n1IPadd: "172.21.6.201"
n1Netmask: "22"
n1Gateway: "172.21.11.254"
n1Gateway: "172.21.7.254"
hostInterface: "bond0" # Interface of the host machine on which this pod will be scheduled
config:
amfInterfaceNameForNGAP: "eth0" # If multus creation is true then net1 else eth0
......@@ -104,14 +104,14 @@ oai-spgwu-tiny:
weight: 7
nfimage: # image name either locally present or in a public/private repository
repository: docker.io/oaisoftwarealliance/oai-spgwu-tiny ## The image will be pulled from dockerhub
version: v1.3.0 ## The branch to be used to pull from dockerhub
version: v1.4.0 ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
multus:
create: false
n3Ip: "172.21.10.102"
n3Ip: "172.21.6.200"
n3Netmask: "22"
sgiGw: "172.21.11.254"
sgiGw: "172.21.7.254"
hostInterface: "bond0"
nodeSelector: {}
config:
......
charts/oai-5g-core/oai-nrf/values.yaml
View file @ 9839cef4
......@@ -7,7 +7,7 @@ replicaCount: 1
# NF image
nfimage:
registry: local
repository: oaisoftwarealliance/oai-nrf
repository: docker.io/oaisoftwarealliance/oai-nrf
version: v1.4.0 #image tag, develop tag for experimental features
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
......
charts/oai-5g-core/oai-spgwu-tiny/Chart.yaml
View file @ 9839cef4
......@@ -6,9 +6,9 @@ type: application
icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png
version: v1.3.0
version: v1.4.0
appVersion: master-v1.3.0
appVersion: master-v1.4.0
keywords:
- EPC
......
charts/oai-5g-core/oai-spgwu-tiny/scripts/spgw_u.conf deleted 100644 → 0
View file @ 3f21bb7c
################################################################################
# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The OpenAirInterface Software Alliance licenses this file to You under
# the OAI Public License, Version 1.1 (the "License"); you may not use this file
# except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.openairinterface.org/?page_id=698
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#-------------------------------------------------------------------------------
# For more information about the OpenAirInterface (OAI) Software Alliance:
# contact@openairinterface.org
################################################################################
SPGW-U =
{
FQDN = "gw1.spgw.node.epc.mnc99.mcc208.3gpp.org"; # FQDN for 4G
INSTANCE = 0; # 0 is the default
PID_DIRECTORY = "/var/run"; # /var/run is the default
#ITTI_TASKS :
#{
#ITTI_TIMER_SCHED_PARAMS :
#{
#CPU_ID = 1;
#SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
#SCHED_PRIORITY = 85;
#};
#S1U_SCHED_PARAMS :
#{
#CPU_ID = 1;
#SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
#SCHED_PRIORITY = 84;
#};
#SX_SCHED_PARAMS :
#{
#CPU_ID = 1;
#SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
#SCHED_PRIORITY = 84;
#};
#ASYNC_CMD_SCHED_PARAMS :
#{
#CPU_ID = 1;
#SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
#SCHED_PRIORITY = 84;
#};
#};
INTERFACES :
{
S1U_S12_S4_UP :
{
# S-GW binded interface for S1-U communication (GTPV1-U) can be ethernet interface, virtual ethernet interface, we don't advise wireless interfaces
INTERFACE_NAME = "eth0"; # STRING, interface name, YOUR NETWORK CONFIG HERE
IPV4_ADDRESS = "read"; # STRING, CIDR or "read to let app read interface configured IP address
#PORT = 2152; # Default is 2152
SCHED_PARAMS :
{
#CPU_ID = 2;
SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
SCHED_PRIORITY = 98;
POOL_SIZE = 1; # NUM THREADS
};
};
SX :
{
# S/P-GW binded interface for SX communication
INTERFACE_NAME = "eth0"; # STRING, interface name
IPV4_ADDRESS = "read"; # STRING, CIDR or "read" to let app read interface configured IP address
#PORT = 8805; # Default is 8805
SCHED_PARAMS :
{
#CPU_ID = 1;
SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
SCHED_PRIORITY = 98;
POOL_SIZE = 1; # NUM THREADS
};
};
SGI :
{
# No config to set, the software will set the SGi interface to the interface used for the default route.
INTERFACE_NAME = "eth0"; # STRING, interface name or "default_gateway"
IPV4_ADDRESS = "read"; # STRING, CIDR or "read" to let app read interface configured IP address
SCHED_PARAMS :
{
#CPU_ID = 3;
SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
SCHED_PRIORITY = 98;
POOL_SIZE = 1; # NUM THREADS
};
};
};
SNAT = "yes"; # SNAT Values in {yes, no}
PDN_NETWORK_LIST = (
{NETWORK_IPV4 = "12.2.1.0/24";} # 1 ITEM SUPPORTED ONLY
);
SPGW-C_LIST = (
{IPV4_ADDRESS="127.0.0.1" ;}
);
NON_STANDART_FEATURES :
{
BYPASS_UL_PFCP_RULES = "no"; # 'no' for standard features, yes for enhancing UL throughput
};
SUPPORT_5G_FEATURES:
{
# STRING, {"yes", "no"},
ENABLE_5G_FEATURES = "yes" # Set to 'yes' to support 5G Features
REGISTER_NRF = "yes"; # Set to 'yes' if UPF resgisters to an NRF
USE_FQDN_NRF = "yes"; # Set to 'yes' if UPF relies on a DNS/FQDN service to resolve NRF's FQDN
UPF_FQDN_5G = "oai-spgwu-tiny-svc"; #Set FQDN of UPF
NRF :
{
IPV4_ADDRESS = "127.0.0.1"; # YOUR NRF CONFIG HERE
PORT = 80; # YOUR NRF CONFIG HERE (default: 80)
HTTP_VERSION = 1; #Set HTTP version for NRF (1 or 2)Default 1
API_VERSION = "v1"; # YOUR NRF API VERSION HERE
FQDN = "oai-nrf-svc";
};
# Additional info to be sent to NRF for supporting Network Slicing
UPF_INFO = (
{ NSSAI_SST = 1; NSSAI_SD = "10203"; DNN_LIST = ({DNN = "oai.ipv4";}); }
);
}
};
charts/oai-5g-core/oai-spgwu-tiny/templates/deployment.yaml
View file @ 9839cef4
......@@ -205,6 +205,51 @@ spec:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: dnn0
- name: NSSAI_SST_1
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: nssaiSst1
- name: NSSAI_SD_1
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: nssaiSd1
- name: DNN_1
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: dnn1
- name: NSSAI_SST_2
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: nssaiSst2
- name: NSSAI_SD_2
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: nssaiSd2
- name: DNN_2
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: dnn2
- name: NSSAI_SST_3
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: nssaiSst3
- name: NSSAI_SD_3
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: nssaiSd3
- name: DNN_3
valueFrom:
configMapKeyRef:
name: {{ .Chart.Name }}-configmap
key: dnn3
- name: UPF_FQDN_5G
valueFrom:
configMapKeyRef:
......
charts/oai-5g-core/oai-spgwu-tiny/values.yaml
View file @ 9839cef4
......@@ -7,7 +7,7 @@ replicaCount: 1
nfimage:
registry: local
repository: docker.io/oaisoftwarealliance/oai-spgwu-tiny # dockerhub oaisoftwarealliance/oai-spgwu-tiny
version: v1.3.0 #image tag, develop tag for experimental features
version: v1.4.0 #image tag, develop tag for experimental features
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
......@@ -85,6 +85,15 @@ config:
nssaiSst0: 1 # should match with SMF information
nssaiSd0: 1 # should match with SMF information
dnn0: "oai" # should match with SMF information
nssaiSst1: 1 # should match with SMF information
nssaiSd1: 1 # should match with SMF information
dnn1: "oai" # should match with SMF information
nssaiSst2: 1 # should match with SMF information
nssaiSd2: 1 # should match with SMF information
dnn2: "oai" # should match with SMF information
nssaiSst3: 1 # should match with SMF information
nssaiSd3: 1 # should match with SMF information
dnn3: "oai" # should match with SMF information
netUeIp: "12.1.1.0/24" # The range in which UE ip-address will be allocated should be configured the same in SMF
......
charts/oai-5g-core/oai-udm/values.yaml
View file @ 9839cef4
......@@ -7,7 +7,7 @@ replicaCount: 1
nfimage:
registry: local
repository: docker.io/oaisoftwarealliance/oai-udm ## oaisoftwarealliance/oai-udm # image name either locally present or in a public/private repository
version: v1.3.0 #image tag, develop tag for experimental features
version: v1.4.0 #image tag, develop tag for experimental features
#pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
......
charts/oai-5g-ran/oai-gnb-du/templates/deployment.yaml
View file @ 9839cef4
......@@ -25,9 +25,6 @@ spec:
},
{
"name": "{{ .Chart.Name }}-net2"
},
{
"name": "{{ .Chart.Name }}-net3"
}]
{{- end }}
spec:
......
charts/oai-5g-ran/oai-gnb-du/templates/multus.yaml
View file @ 9839cef4
......@@ -14,7 +14,7 @@ spec:
"type": "static",
"addresses": [
{
"address": {{- cat .Values.multus.n2IPadd "/" .Values.multus.n2Netmask | nospace | quote }}
"address": {{- cat .Values.multus.f1IPadd "/" .Values.multus.f1Netmask | nospace | quote }}
}
]
}
......@@ -34,27 +34,7 @@ spec:
"type": "static",
"addresses": [
{
"address": {{- cat .Values.multus.n3IPadd "/" .Values.multus.n3Netmask | nospace | quote }}
}
]
}
}'
---
apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
name: {{ .Chart.Name }}-net3
spec:
config: '{
"cniVersion": "0.3.0",
"type": "macvlan",
"master": {{- cat .Values.multus.hostInterface | nospace | quote }},
"mode": "bridge",
"ipam": {
"type": "static",
"addresses": [
{
"address": {{- cat .Values.multus.f1IPadd "/" .Values.multus.f1Netmask | nospace | quote }}
"address": {{- cat .Values.multus.rruInterfaceIpadd "/" .Values.multus.rruInterfaceNetmask | nospace | quote }}
}
]
}
......
charts/oai-5g-ran/oai-gnb-du/values.yaml
View file @ 9839cef4
......@@ -64,15 +64,13 @@ start:
multus: # needed when gnB service will run on another interface rather than traditional eth0
create: false
n2IPadd: "172.21.10.16"
n2Netmask: "22"
defaultGateway: "172.21.11.254"
hostInterface: "ens2f0np0" # Interface of the host machine on which this pod will be scheduled
n3IPadd: "172.21.10.17"
n3Netmask: "22"
f1IPadd: "172.21.10.17"
f1Netmask: "22"
defaultGateway: "172.21.11.254"
hostInterface: "ens2f0np0" # Interface of the host machine on which this pod will be scheduled
rruInterfaceIpadd: "192.168.80.200"
rruInterfaceNetmask: "24"
rruInterfaceGateway: "192.168.80.1"
config:
timeZone: "Europe/Paris"
......
docker-compose/docker-compose-basic-nonrf.yaml
View file @ 9839cef4
......@@ -268,7 +268,7 @@ services:
ipv4_address: 192.168.70.133
oai-spgwu:
container_name: "oai-spgwu"
image: oai-spgwu-tiny:v1.3.0
image: oai-spgwu-tiny:v1.4.0
environment:
- TZ=Europe/Paris
- PID_DIRECTORY=/var/run
......
docker-compose/docker-compose-basic-nrf-httpv2.yaml
View file @ 9839cef4
......@@ -299,7 +299,7 @@ services:
ipv4_address: 192.168.70.133
oai-spgwu:
container_name: "oai-spgwu"
image: oai-spgwu-tiny:v1.3.0
image: oai-spgwu-tiny:v1.4.0
environment:
- TZ=Europe/Paris
- PID_DIRECTORY=/var/run
......
docker-compose/docker-compose-basic-nrf.yaml
View file @ 9839cef4
......@@ -302,7 +302,7 @@ services:
ipv4_address: 192.168.70.133
oai-spgwu:
container_name: "oai-spgwu"
image: oai-spgwu-tiny:v1.3.0
image: oai-spgwu-tiny:v1.4.0
environment:
- TZ=Europe/Paris
- PID_DIRECTORY=/var/run
......
docker-compose/docker-compose-mini-nonrf.yaml
View file @ 9839cef4
......@@ -173,7 +173,7 @@ services:
ipv4_address: 192.168.70.133
oai-spgwu:
container_name: "oai-spgwu"
image: oai-spgwu-tiny:v1.3.0
image: oai-spgwu-tiny:v1.4.0
environment:
- TZ=Europe/Paris
- PID_DIRECTORY=/var/run
......
docker-compose/docker-compose-mini-nrf.yaml
View file @ 9839cef4
......@@ -193,7 +193,7 @@ services:
ipv4_address: 192.168.70.133
oai-spgwu:
container_name: "oai-spgwu"
image: oai-spgwu-tiny:v1.3.0
image: oai-spgwu-tiny:v1.4.0
environment:
- TZ=Europe/Paris
- PID_DIRECTORY=/var/run
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment