From 9839cef494273aff77c02b52fc1748635646d6a0 Mon Sep 17 00:00:00 2001
From: sagar arora <sagar.arora@eurecom.fr>
Date: Thu, 7 Jul 2022 14:29:31 +0200
Subject: [PATCH] Update the release tag of spgwu to v1.4.0
---
charts/oai-5g-core/oai-5g-basic/Chart.yaml | 2 +-
charts/oai-5g-core/oai-5g-basic/values.yaml | 16 +-
charts/oai-5g-core/oai-5g-mini/Chart.yaml | 2 +-
charts/oai-5g-core/oai-5g-mini/values.yaml | 14 +-
charts/oai-5g-core/oai-5g-slicing/Chart.yaml | 2 +-
charts/oai-5g-core/oai-5g-slicing/values.yaml | 10 +-
charts/oai-5g-core/oai-nrf/values.yaml | 2 +-
charts/oai-5g-core/oai-spgwu-tiny/Chart.yaml | 4 +-
.../oai-spgwu-tiny/scripts/spgw_u.conf | 137 ------------------
.../oai-spgwu-tiny/templates/deployment.yaml | 45 ++++++
charts/oai-5g-core/oai-spgwu-tiny/values.yaml | 11 +-
charts/oai-5g-core/oai-udm/values.yaml | 2 +-
.../oai-gnb-du/templates/deployment.yaml | 3 -
.../oai-gnb-du/templates/multus.yaml | 24 +--
charts/oai-5g-ran/oai-gnb-du/values.yaml | 12 +-
.../docker-compose-basic-nonrf.yaml | 2 +-
.../docker-compose-basic-nrf-httpv2.yaml | 2 +-
docker-compose/docker-compose-basic-nrf.yaml | 2 +-
docker-compose/docker-compose-mini-nonrf.yaml | 2 +-
docker-compose/docker-compose-mini-nrf.yaml | 2 +-
.../docker-compose-no-privilege.yaml | 2 +-
.../docker-compose-slicing-basic-nrf.yaml | 6 +-
docker-compose/nssf_slice_config.yaml | 30 ++--
docs/BUILD_IMAGES.md | 10 +-
docs/DEPLOY_HOME.md | 2 +-
docs/DEPLOY_SA5G_BASIC_DEPLOYMENT.md | 27 ++--
docs/DEPLOY_SA5G_HC.md | 4 +-
docs/DEPLOY_SA5G_HC_mini.md | 29 ++--
docs/DEPLOY_SA5G_MINI_DEPLOYMENT.md | 4 +-
docs/DEPLOY_SA5G_SLICING.md | 2 +-
docs/DEPLOY_SA5G_VM_COTSUE.md | 5 +
docs/DEPLOY_SA5G_WITH_GNBSIM.md | 2 +-
docs/DEPLOY_SA5G_WITH_My5g-RANTester.md | 2 +-
docs/DEPLOY_SA5G_WITH_UERANSIM.md | 14 +-
docs/RETRIEVE_OFFICIAL_IMAGES.md | 26 ++--
openshift/README.md | 4 +-
openshift/oai-amf-build-config.yml | 4 +-
openshift/oai-ausf-build-config.yml | 4 +-
openshift/oai-nrf-build-config.yml | 4 +-
openshift/oai-smf-build-config.yml | 4 +-
openshift/oai-spgwu-tiny-build-config.yml | 4 +-
openshift/oai-udm-build-config.yml | 4 +-
openshift/oai-udr-build-config.yml | 4 +-
43 files changed, 201 insertions(+), 292 deletions(-)
delete mode 100644 charts/oai-5g-core/oai-spgwu-tiny/scripts/spgw_u.conf
diff --git a/charts/oai-5g-core/oai-5g-basic/Chart.yaml b/charts/oai-5g-core/oai-5g-basic/Chart.yaml
index fcb87086..c8b9978a 100644
--- a/charts/oai-5g-core/oai-5g-basic/Chart.yaml
+++ b/charts/oai-5g-core/oai-5g-basic/Chart.yaml
@@ -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
diff --git a/charts/oai-5g-core/oai-5g-basic/values.yaml b/charts/oai-5g-core/oai-5g-basic/values.yaml
index 8ee4297d..c2ee7ef9 100644
--- a/charts/oai-5g-core/oai-5g-basic/values.yaml
+++ b/charts/oai-5g-core/oai-5g-basic/values.yaml
@@ -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
diff --git a/charts/oai-5g-core/oai-5g-mini/Chart.yaml b/charts/oai-5g-core/oai-5g-mini/Chart.yaml
index 35b8af82..09b6497c 100644
--- a/charts/oai-5g-core/oai-5g-mini/Chart.yaml
+++ b/charts/oai-5g-core/oai-5g-mini/Chart.yaml
@@ -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
diff --git a/charts/oai-5g-core/oai-5g-mini/values.yaml b/charts/oai-5g-core/oai-5g-mini/values.yaml
index 06710cab..8c66c17e 100644
--- a/charts/oai-5g-core/oai-5g-mini/values.yaml
+++ b/charts/oai-5g-core/oai-5g-mini/values.yaml
@@ -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
diff --git a/charts/oai-5g-core/oai-5g-slicing/Chart.yaml b/charts/oai-5g-core/oai-5g-slicing/Chart.yaml
index 0b560857..f4677a3f 100644
--- a/charts/oai-5g-core/oai-5g-slicing/Chart.yaml
+++ b/charts/oai-5g-core/oai-5g-slicing/Chart.yaml
@@ -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
diff --git a/charts/oai-5g-core/oai-5g-slicing/values.yaml b/charts/oai-5g-core/oai-5g-slicing/values.yaml
index 2c846d1f..8b3b0565 100644
--- a/charts/oai-5g-core/oai-5g-slicing/values.yaml
+++ b/charts/oai-5g-core/oai-5g-slicing/values.yaml
@@ -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:
diff --git a/charts/oai-5g-core/oai-nrf/values.yaml b/charts/oai-5g-core/oai-nrf/values.yaml
index 7f88cd31..3e08d173 100644
--- a/charts/oai-5g-core/oai-nrf/values.yaml
+++ b/charts/oai-5g-core/oai-nrf/values.yaml
@@ -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
diff --git a/charts/oai-5g-core/oai-spgwu-tiny/Chart.yaml b/charts/oai-5g-core/oai-spgwu-tiny/Chart.yaml
index 36a1350d..36a2720c 100644
--- a/charts/oai-5g-core/oai-spgwu-tiny/Chart.yaml
+++ b/charts/oai-5g-core/oai-spgwu-tiny/Chart.yaml
@@ -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
diff --git a/charts/oai-5g-core/oai-spgwu-tiny/scripts/spgw_u.conf b/charts/oai-5g-core/oai-spgwu-tiny/scripts/spgw_u.conf
deleted file mode 100644
index 01ff4cd8..00000000
--- a/charts/oai-5g-core/oai-spgwu-tiny/scripts/spgw_u.conf
+++ /dev/null
@@ -1,137 +0,0 @@
-################################################################################
-# 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";}); }
- );
- }
-};
-
diff --git a/charts/oai-5g-core/oai-spgwu-tiny/templates/deployment.yaml b/charts/oai-5g-core/oai-spgwu-tiny/templates/deployment.yaml
index 8226adab..9dd2b51a 100644
--- a/charts/oai-5g-core/oai-spgwu-tiny/templates/deployment.yaml
+++ b/charts/oai-5g-core/oai-spgwu-tiny/templates/deployment.yaml
@@ -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:
diff --git a/charts/oai-5g-core/oai-spgwu-tiny/values.yaml b/charts/oai-5g-core/oai-spgwu-tiny/values.yaml
index af1fbd82..ba85157f 100644
--- a/charts/oai-5g-core/oai-spgwu-tiny/values.yaml
+++ b/charts/oai-5g-core/oai-spgwu-tiny/values.yaml
@@ -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
diff --git a/charts/oai-5g-core/oai-udm/values.yaml b/charts/oai-5g-core/oai-udm/values.yaml
index d459c92d..bb9c6efc 100644
--- a/charts/oai-5g-core/oai-udm/values.yaml
+++ b/charts/oai-5g-core/oai-udm/values.yaml
@@ -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
diff --git a/charts/oai-5g-ran/oai-gnb-du/templates/deployment.yaml b/charts/oai-5g-ran/oai-gnb-du/templates/deployment.yaml
index 8b9e977b..0552d806 100644
--- a/charts/oai-5g-ran/oai-gnb-du/templates/deployment.yaml
+++ b/charts/oai-5g-ran/oai-gnb-du/templates/deployment.yaml
@@ -25,9 +25,6 @@ spec:
},
{
"name": "{{ .Chart.Name }}-net2"
- },
- {
- "name": "{{ .Chart.Name }}-net3"
}]
{{- end }}
spec:
diff --git a/charts/oai-5g-ran/oai-gnb-du/templates/multus.yaml b/charts/oai-5g-ran/oai-gnb-du/templates/multus.yaml
index 503a173a..61a584fe 100644
--- a/charts/oai-5g-ran/oai-gnb-du/templates/multus.yaml
+++ b/charts/oai-5g-ran/oai-gnb-du/templates/multus.yaml
@@ -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 }}
}
]
}
diff --git a/charts/oai-5g-ran/oai-gnb-du/values.yaml b/charts/oai-5g-ran/oai-gnb-du/values.yaml
index d57a4123..c82ccb57 100644
--- a/charts/oai-5g-ran/oai-gnb-du/values.yaml
+++ b/charts/oai-5g-ran/oai-gnb-du/values.yaml
@@ -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"
diff --git a/docker-compose/docker-compose-basic-nonrf.yaml b/docker-compose/docker-compose-basic-nonrf.yaml
index b635a738..53bac4f4 100644
--- a/docker-compose/docker-compose-basic-nonrf.yaml
+++ b/docker-compose/docker-compose-basic-nonrf.yaml
@@ -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
diff --git a/docker-compose/docker-compose-basic-nrf-httpv2.yaml b/docker-compose/docker-compose-basic-nrf-httpv2.yaml
index ca080d9c..d9ae925a 100644
--- a/docker-compose/docker-compose-basic-nrf-httpv2.yaml
+++ b/docker-compose/docker-compose-basic-nrf-httpv2.yaml
@@ -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
diff --git a/docker-compose/docker-compose-basic-nrf.yaml b/docker-compose/docker-compose-basic-nrf.yaml
index 96d2ff5a..ac06a28e 100644
--- a/docker-compose/docker-compose-basic-nrf.yaml
+++ b/docker-compose/docker-compose-basic-nrf.yaml
@@ -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
diff --git a/docker-compose/docker-compose-mini-nonrf.yaml b/docker-compose/docker-compose-mini-nonrf.yaml
index 45d265f2..353356e4 100644
--- a/docker-compose/docker-compose-mini-nonrf.yaml
+++ b/docker-compose/docker-compose-mini-nonrf.yaml
@@ -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
diff --git a/docker-compose/docker-compose-mini-nrf.yaml b/docker-compose/docker-compose-mini-nrf.yaml
index f68a33b0..c9e17295 100644
--- a/docker-compose/docker-compose-mini-nrf.yaml
+++ b/docker-compose/docker-compose-mini-nrf.yaml
@@ -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
diff --git a/docker-compose/docker-compose-no-privilege.yaml b/docker-compose/docker-compose-no-privilege.yaml
index 68a546a1..4d882cf0 100644
--- a/docker-compose/docker-compose-no-privilege.yaml
+++ b/docker-compose/docker-compose-no-privilege.yaml
@@ -195,7 +195,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
diff --git a/docker-compose/docker-compose-slicing-basic-nrf.yaml b/docker-compose/docker-compose-slicing-basic-nrf.yaml
index 66489ed1..2b577e46 100644
--- a/docker-compose/docker-compose-slicing-basic-nrf.yaml
+++ b/docker-compose/docker-compose-slicing-basic-nrf.yaml
@@ -4,7 +4,7 @@ services:
container_name: mysql
image: mysql:5.7
volumes:
- - /database/oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql
+ - ./database/oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql
- ./healthscripts/mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh
environment:
- TZ=Europe/Paris
@@ -403,7 +403,7 @@ services:
ipv4_address: 192.168.70.141
oai_spgwu_slice1:
container_name: oai-spgwu-slice1
- image: oai-spgwu-tiny:v1.3.0
+ image: oai-spgwu-tiny:v1.4.0
environment:
- TZ=Europe/Paris
- PID_DIRECTORY=/var/run
@@ -451,7 +451,7 @@ services:
ipv4_address: 192.168.70.142
oai_spgwu_slice2:
container_name: oai-spgwu-slice2
- image: oai-spgwu-tiny:v1.3.0
+ image: oai-spgwu-tiny:v1.4.0
environment:
- TZ=Europe/Paris
- PID_DIRECTORY=/var/run
diff --git a/docker-compose/nssf_slice_config.yaml b/docker-compose/nssf_slice_config.yaml
index 4eb42e95..750ddf90 100644
--- a/docker-compose/nssf_slice_config.yaml
+++ b/docker-compose/nssf_slice_config.yaml
@@ -1,24 +1,23 @@
# Reference:- TS 29.531 R16.0.0., Section- 6.1.6 Data Model
info:
- version: 1.3.0
- description: OAI-NSSF Release v1.3.0
+ version: 1.4.0
+ description: OAI-NSSF Release v1.4.0
configuration:
nsiInfoList:
- snssai:
- sst: 2
- sd: '2'
+ sst: 128
+ sd: '128'
nsiInformationList:
nrfId: http://192.168.70.136:80/nnrf-disc/v1/nf-instances
nsiId: '11'
- snssai:
- sst: 3
- sd: '3'
+ sst: 1
nsiInformationList:
nrfId: http://192.168.70.136:80/nnrf-disc/v1/nf-instances
nsiId: '12'
- snssai:
- sst: 4
- sd: '4'
+ sst: 130
+ sd: '130'
nsiInformationList:
nrfId: http://192.168.70.137:80/nnrf-disc/v1/nf-instances
nsiId: '12'
@@ -60,7 +59,7 @@ configuration:
supportedSnssaiList:
- sst: 222
sd: '123'
- - sst: 2
+ - sst: 128
amfInfoList:
- targetAmfSet: oai5gcn.mcc208.mnc95.regionid128.setid1.3gppnetwork.org
nrfAmfSet: http://oai-cn5g-nrf.fr:8080/nnrf-disc/v1/nf-instances'
@@ -74,12 +73,11 @@ configuration:
mnc: 95
tac: 33456
supportedSnssaiList:
- - sst: 2
- sd: 2
- - sst: 3
- sd: 3
- - sst: 4
- sd: 4
+ - sst: 128
+ sd: 128
+ - sst: 1
+ - sst: 130
+ sd: 130
- nfId: 405e8251-cc5a-45dd-a494-efb9eaf1cd68
supportedNssaiAvailabilityData:
tai:
@@ -112,4 +110,4 @@ configuration:
mnc: 95
tac: 33460
supportedSnssaiList:
- - sst: 133
+ - sst: 133
\ No newline at end of file
diff --git a/docs/BUILD_IMAGES.md b/docs/BUILD_IMAGES.md
index b116fbb6..631401e8 100644
--- a/docs/BUILD_IMAGES.md
+++ b/docs/BUILD_IMAGES.md
@@ -38,7 +38,7 @@ We also recommend that you synchronize this "tutorial" repository with a provide
| AMF | `master` | `v1.4.0` | X | X |
| SMF | `master` | `v1.4.0` | X | X |
| NRF | `master` | `v1.4.0` | X | X |
-| SPGW-U-TINY | `master` | `v1.3.0` | X | X |
+| SPGW-U-TINY | `master` | `v1.4.0` | X | X |
| UDR | `master` | `v1.4.0` | X | X |
| UDM | `master` | `v1.4.0` | X | X |
| AUSF | `master` | `v1.4.0` | X | X |
@@ -50,7 +50,7 @@ We also recommend that you synchronize this "tutorial" repository with a provide
# Clone directly on the v1.4.0 release tag
$ git clone --branch v1.4.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git
$ cd oai-cn5g-fed
-# If you forgot to clone directly to the v1.3.0 release tag
+# If you forgot to clone directly to the v1.4.0 release tag
$ git checkout -f v1.4.0
# Synchronize all git submodules
@@ -251,12 +251,12 @@ The above command is with podman, in case of docker it can be changed with its d
## 6.1 On a Ubuntu 18.04 Host ##
```bash
-$ docker build --target oai-spgwu-tiny --tag oai-spgwu-tiny:v1.3.0 \
+$ docker build --target oai-spgwu-tiny --tag oai-spgwu-tiny:v1.4.0 \
--file component/oai-upf-equivalent/docker/Dockerfile.ubuntu18.04 \
component/oai-upf-equivalent
$ docker image prune --force
$ docker image ls
-oai-spgwu-tiny v1.3.0 dec6311cef3b 1 minute ago 255MB
+oai-spgwu-tiny v1.4.0 dec6311cef3b 1 minute ago 255MB
...
```
@@ -271,7 +271,7 @@ Copy the ca and entitlement .pem files in your present working directory `pwd` b
$: mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca
$: cp /etc/pki/entitlement/*pem ./etc-pki-entitlement
$: cp /etc/rhsm/ca/*pem ./rhsm-ca
-$ sudo podman build --target oai-spgwu-tiny --tag oai-spgwu-tiny:v1.3.0 \
+$ sudo podman build --target oai-spgwu-tiny --tag oai-spgwu-tiny:v1.4.0 \
--file component/oai-spgwu-tiny/docker/Dockerfile.rhel8 \
component/oai-upf-equivalent
...
diff --git a/docs/DEPLOY_HOME.md b/docs/DEPLOY_HOME.md
index d2360fbc..603c4f43 100644
--- a/docs/DEPLOY_HOME.md
+++ b/docs/DEPLOY_HOME.md
@@ -29,4 +29,4 @@ Welcome to the tutorial home page of OAI 5g Core project. Here you can find lot
- The Developers Corner
- [How to Deploy Developers Core Network and Basic Debugging](./DEBUG_5G_CORE.md)
- [Using Virtual Machine, deploy and test with a Commercial UE](./DEPLOY_SA5G_VM_COTSUE.md)
-- [Report an issue](./DEPLOY_SA5G_BASIC_DEPLOYMENT.md#8-how-to-report-an-issue)
\ No newline at end of file
+- [Report an Issue or bug for Core Network Functions](./DEPLOY_SA5G_BASIC_DEPLOYMENT.md#8-report-an-issue)
\ No newline at end of file
diff --git a/docs/DEPLOY_SA5G_BASIC_DEPLOYMENT.md b/docs/DEPLOY_SA5G_BASIC_DEPLOYMENT.md
index 8d3b5268..9037c8aa 100644
--- a/docs/DEPLOY_SA5G_BASIC_DEPLOYMENT.md
+++ b/docs/DEPLOY_SA5G_BASIC_DEPLOYMENT.md
@@ -46,7 +46,7 @@ Please follow the tutorial step by step to create a stable working testbed. You
5. [Configuring OAI 5G Core Network Functions](#5-configuring-the-oai-5g-core-network-functions)
6. [Deploying OAI 5G Core Network](#6-deploying-oai-5g-core-network)
7. [Notes](#7-notes)
-8. [How to report an issue?](#8-how-to-report-an-issue)
+8. [Report an Issue](#8-report-an-issue)
## 1. Basic Deployment Flavours ##
@@ -105,7 +105,7 @@ docker-compose-host $: sudo iptables -P FORWARD ACCEPT
| AMF | `master` | `v1.4.0` | X | X |
| SMF | `master` | `v1.4.0` | X | X |
| NRF | `master` | `v1.4.0` | X | X |
-| SPGW-U-TINY | `master` | `v1.3.0` | X | X |
+| SPGW-U-TINY | `master` | `v1.4.0` | X | X |
| UDR | `master` | `v1.4.0` | X | X |
| UDM | `master` | `v1.4.0` | X | X |
| AUSF | `master` | `v1.4.0` | X | X |
@@ -232,6 +232,9 @@ In docker-compose the [service-name](https://docs.docker.com/compose/compose-fil
The docker-compose file has configuration parameters of each core network component. The file is pre-configured with parameters related to this scenario. The table contains the location of the configuration files. These files contains allowed configurable parameters. **Keep checking this file it is possible that we will add new parameters for new features.**
+You can also check configuration on our [wiki](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/wikis/home)
+
+
```console
| File Name | Repository | Location |
|:----------- |:-------------------------------------------- |:------------------------------------------------------------------------------------------------------|
@@ -402,16 +405,16 @@ docker-compose-host $: ping <ue-ip-address>
- Generally, in a COTS UE two PDN sessions are created by default so configure the IMS in SMF properly.
- In case you want to deploy debuggers/developers core network environment with more logs please follow [this tutorial](./DEBUG_5G_CORE.md)
- It is not necessary to use [core-network.py](../docker-compose/core-network.py) bash script, it is possible to directly deploy using `docker-compose` command
-``` console
-#To start the containers
-docker-compose-host $: docker-compose -f <file-name> up -d
-#To check their health status and wait till the time they are healthy, you ctrl + c to exit watch command
-docker-compose-host $: watch docker-compose -f <file-name> ps -a
-#To stop the containers with zero graceful period
-docker-compose-host $: docker-compose -f <file-name> down -t 0
-```
-
-## 8. How to report an issue? ##
+ ``` console
+ #To start the containers
+ docker-compose-host $: docker-compose -f <file-name> up -d
+ #To check their health status and wait till the time they are healthy, you ctrl + c to exit watch command
+ docker-compose-host $: watch docker-compose -f <file-name> ps -a
+ #To stop the containers with zero graceful period
+ docker-compose-host $: docker-compose -f <file-name> down -t 0
+ ```
+
+## 8. Report an Issue ##
To report an issue regarding any-component of CN5G,
diff --git a/docs/DEPLOY_SA5G_HC.md b/docs/DEPLOY_SA5G_HC.md
index 9a79bb23..54083391 100644
--- a/docs/DEPLOY_SA5G_HC.md
+++ b/docs/DEPLOY_SA5G_HC.md
@@ -41,7 +41,7 @@ The gNB simulator requires lot of resources. The configuration of the machine on
Clone the git repository
```console
-$: git clone -b <branch-of-the-tutorial> https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed
+$: git clone -b master https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed
```
## 1. Description
@@ -207,6 +207,8 @@ imagePullSecrets:
When pulling images from docker hub you have several choices either to use images with develop tag (based on latest develop branch somtimes might not be stable), latest (built from current master branch) and release tags.
+At the time of writing this tutorial the latest image was tag v1.4.0.
+
### 3.3 Configuring Helm Chart Parameters
In the [values.yaml](../charts/oai-5g-core/oai-5g-basic) of oai-5g-basic helm charts you will see the configurable parameters for all the network functions check, the PLMN, DNN and subscriber information in mysql database
diff --git a/docs/DEPLOY_SA5G_HC_mini.md b/docs/DEPLOY_SA5G_HC_mini.md
index 3f53c741..d808e120 100644
--- a/docs/DEPLOY_SA5G_HC_mini.md
+++ b/docs/DEPLOY_SA5G_HC_mini.md
@@ -15,6 +15,9 @@
OAI 5G core network have different network functions which can be used invidiually or deployed all together in different combination on a production grade Kubernetes cluster like Openshift or a vanilla kubernetes cluster.
+**Caution**: This is an old tutorial, the helm charts can be slightly different
+
+
**Reading time**: ~30
@@ -185,8 +188,8 @@ namespace: "oai"
nfimage:
registry: local
- repository: rdefosseoai/oai-amf # image name either locally present or in a public/private repository
- version: develop # image tag
+ repository: docker.io/oaisoftwarealliance/oai-amf # image name either locally present or in a public/private repository
+ version: v1.4.0 # image tag
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
@@ -243,14 +246,14 @@ namespace: "oai" # namespace where SMF will be deployed
nfimage:
registry: local
- repository: rdefosseoai/oai-smf
- version: develop
+ repository: docker.io/oaisoftwarealliance/oai-smf
+ version: v1.4.0
#pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
tcpdumpimage:
registry: local
- repository: corfr/tcpdump
+ repository: docker.io/corfr/tcpdump
version: latest
#pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
@@ -275,22 +278,22 @@ namespace: "oai" # namespace where SMF will be deployed
nfimage:
registry: local
- repository: rdefosseoai/oai-spgwu-tiny
- version: develop
+ repository: docker.io/oaisoftwarealliance/oai-spgwu-tiny
+ version: v1.4.0
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
tcpdumpimage:
registry: local
- repository: corfr/tcpdump
- version: latest
+ repository: docker.io/corfr/tcpdump
+ version: v1.4.0
#pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
config:
gwId: 1
mnc: 208 # should match with AMF and SMF and gNB information
- mcc: 95 # should match with AMF and SMF and gNB information
+ mcc: 99 # should match with AMF and SMF and gNB information
realm: "3gpp.org"
pidDirectory: "/var/run"
```
@@ -309,14 +312,14 @@ namespace: "oai"
# NF image
nfimage:
registry: local
- repository: rdefosseoai/oai-nrf
- version: develop
+ repository: docker.io/oaisoftwarealliance/oai-nrf
+ version: v1.4.0
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
tcpdumpimage:
registry: local
- repository: corfr/tcpdump
+ repository: docker.io/corfr/tcpdump
version: latest
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: Always
diff --git a/docs/DEPLOY_SA5G_MINI_DEPLOYMENT.md b/docs/DEPLOY_SA5G_MINI_DEPLOYMENT.md
index c985ff7f..d5c0b962 100644
--- a/docs/DEPLOY_SA5G_MINI_DEPLOYMENT.md
+++ b/docs/DEPLOY_SA5G_MINI_DEPLOYMENT.md
@@ -101,10 +101,10 @@ To know how to configure the machine with the above requirements vist [pre-requi
| CNF Name | Branch Name | Tag | Ubuntu 18.04 | RHEL8 (UBI8) |
| ----------- | ----------- | -------- | ------------ | ----------------|
-| AMF | `master` | `v1.3.0` | X | X |
+| AMF | `master` | `v1.4.0` | X | X |
| SMF | `master` | `v1.4.0` | X | X |
| NRF | `master` | `v1.4.0` | X | X |
-| SPGW-U-TINY | `master` | `v1.3.0` | X | X |
+| SPGW-U-TINY | `master` | `v1.4.0` | X | X |
- In case readers are interested in using different branch then develop or releases (example v1.4.0) **they have to build images from scratch they can't use the docker-hub images**.
diff --git a/docs/DEPLOY_SA5G_SLICING.md b/docs/DEPLOY_SA5G_SLICING.md
index 41e8a880..e02c73e3 100644
--- a/docs/DEPLOY_SA5G_SLICING.md
+++ b/docs/DEPLOY_SA5G_SLICING.md
@@ -49,7 +49,7 @@ You can also retrieve the images from `docker-hub`. See [Retrieving images](./RE
| SMF | `master` | `v1.4.0` | X | X |
| UDR | `master` | `v1.4.0` | X | X |
| UDM | `master` | `v1.4.0` | X | X |
-| SPGWU | `master` | `v1.3.0` | X | X |
+| SPGWU | `master` | `v1.4.0` | X | X |
| UPF-VPP | `master` | `v1.4.0` | X | X |
<br/>
diff --git a/docs/DEPLOY_SA5G_VM_COTSUE.md b/docs/DEPLOY_SA5G_VM_COTSUE.md
index 4ea9605c..486562cf 100644
--- a/docs/DEPLOY_SA5G_VM_COTSUE.md
+++ b/docs/DEPLOY_SA5G_VM_COTSUE.md
@@ -11,8 +11,13 @@
</td>
</tr>
</table>
+
+
+
+**Caution**: This is a very old tutorial and it is not maintained anymore.
+
**TABLE OF CONTENTS**
1. [Description](#1-description)
diff --git a/docs/DEPLOY_SA5G_WITH_GNBSIM.md b/docs/DEPLOY_SA5G_WITH_GNBSIM.md
index a8b3ecb0..bc5adb27 100644
--- a/docs/DEPLOY_SA5G_WITH_GNBSIM.md
+++ b/docs/DEPLOY_SA5G_WITH_GNBSIM.md
@@ -40,7 +40,7 @@ Note: In case readers are interested in deploying debuggers/developers core netw
| AMF | `master` | `v1.4.0` | X | X |
| SMF | `master` | `v1.4.0` | X | X |
| NRF | `master` | `v1.4.0` | X | X |
-| SPGW-U-TINY | `master` | `v1.3.0` | X | X |
+| SPGW-U-TINY | `master` | `v1.4.0` | X | X |
<br/>
diff --git a/docs/DEPLOY_SA5G_WITH_My5g-RANTester.md b/docs/DEPLOY_SA5G_WITH_My5g-RANTester.md
index 669f9c4c..5e6a318b 100644
--- a/docs/DEPLOY_SA5G_WITH_My5g-RANTester.md
+++ b/docs/DEPLOY_SA5G_WITH_My5g-RANTester.md
@@ -43,7 +43,7 @@ Note: In case readers are interested in deploying debuggers/developers core netw
| SMF | `master` | `v1.4.0` | X | X |
| UDR | `master` | `v1.4.0` | X | X |
| UDM | `master` | `v1.4.0` | X | X |
-| SPGWU | `master` | `v1.3.0` | X | X |
+| SPGWU | `master` | `v1.4.0` | X | X |
| UPF-VPP | `master` | `v1.4.0` | X | X |
diff --git a/docs/DEPLOY_SA5G_WITH_UERANSIM.md b/docs/DEPLOY_SA5G_WITH_UERANSIM.md
index fccecb2f..a56c9ee1 100644
--- a/docs/DEPLOY_SA5G_WITH_UERANSIM.md
+++ b/docs/DEPLOY_SA5G_WITH_UERANSIM.md
@@ -37,13 +37,13 @@ Note: In case readers are interested in deploying debuggers/developers core netw
| CNF Name | Branch Name | Tag | Ubuntu 18.04 | RHEL8 (UBI8) |
| ----------- | ----------- | -------- | ------------ | ----------------|
-| AMF | `develop` | `v1.2.0` | X | X |
-| SMF | `develop` | `v1.2.0` | X | X |
-| NRF | `develop` | `v1.2.0` | X | X |
-| VPP-UPF | `develop` | `v1.1.3` | X | X |
-| UDR | `develop` | `v1.2.0` | X | X |
-| UDM | `develop` | `v1.2.0` | X | X |
-| AUSF | `develop` | `v1.2.0` | X | X |
+| AMF | `develop` | `v1.4.0` | X | X |
+| SMF | `develop` | `v1.4.0` | X | X |
+| NRF | `develop` | `v1.4.0` | X | X |
+| VPP-UPF | `develop` | `v1.4.0` | X | X |
+| UDR | `develop` | `v1.4.0` | X | X |
+| UDM | `develop` | `v1.4.0` | X | X |
+| AUSF | `develop` | `v1.4.0` | X | X |
<br/>
diff --git a/docs/RETRIEVE_OFFICIAL_IMAGES.md b/docs/RETRIEVE_OFFICIAL_IMAGES.md
index f577a656..b1866501 100644
--- a/docs/RETRIEVE_OFFICIAL_IMAGES.md
+++ b/docs/RETRIEVE_OFFICIAL_IMAGES.md
@@ -80,27 +80,27 @@ We will push new versions when new features are validated.
This repository only has tutorials and Continuous Integration scripts.
-**At the time of writing (2022/01/17), the release tag is `v1.3.0`.**
+**At the time of writing (2022/07), the release tag is `v1.4.0`.**
| CNF Name | Branch Name | Tag | Ubuntu 18.04 | RHEL8 (UBI8) |
| ----------- | ----------- | -------- | ------------ | ----------------|
-| FED REPO | N/A | `v1.3.0` | | |
-| AMF | `master` | `v1.3.0` | X | X |
-| SMF | `master` | `v1.3.0` | X | X |
-| NRF | `master` | `v1.3.0` | X | X |
-| SPGW-U-TINY | `master` | `v1.2.0` | X | X |
-| UDR | `master` | `v1.3.0` | X | X |
-| UDM | `master` | `v1.3.0` | X | X |
-| AUSF | `master` | `v1.3.0` | X | X |
-| UPF-VPP | `master` | `v1.3.0` | X | X |
-| NSSF | `master` | `v1.3.0` | X | X |
+| FED REPO | N/A | `v1.4.0` | | |
+| AMF | `master` | `v1.4.0` | X | X |
+| SMF | `master` | `v1.4.0` | X | X |
+| NRF | `master` | `v1.4.0` | X | X |
+| SPGW-U-TINY | `master` | `v1.4.0` | X | X |
+| UDR | `master` | `v1.4.0` | X | X |
+| UDM | `master` | `v1.4.0` | X | X |
+| AUSF | `master` | `v1.4.0` | X | X |
+| UPF-VPP | `master` | `v1.4.0` | X | X |
+| NSSF | `master` | `v1.4.0` | X | X |
```bash
# Clone directly on the latest release tag
-$ git clone --branch v1.3.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git
+$ git clone --branch v1.4.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git
$ cd oai-cn5g-fed
# If you forgot to clone directly to the latest release tag
-$ git checkout -f v1.3.0
+$ git checkout -f v1.4.0
# Synchronize all git submodules
$ ./scripts/syncComponents.sh
diff --git a/openshift/README.md b/openshift/README.md
index 33b050f9..ef40a22b 100644
--- a/openshift/README.md
+++ b/openshift/README.md
@@ -60,9 +60,7 @@ $: oc start-bc oai-udm
$: oc start-bc oai-udr
```
-For the moment the dockerfiles used in these build configs is based on develop branch which have a new push every week, there are new features all the time.
-
-Just be careful sometimes some functionality can break but you can report back to us in that case.
+For the moment the dockerfiles used in these build configs are based on v1.4.0 release tag of all the network functions.
## 2. How to Build UBI Images of gNB and UE?
diff --git a/openshift/oai-amf-build-config.yml b/openshift/oai-amf-build-config.yml
index 824935fa..74bf167f 100644
--- a/openshift/oai-amf-build-config.yml
+++ b/openshift/oai-amf-build-config.yml
@@ -37,7 +37,7 @@ spec:
source:
git:
uri: "https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-amf.git"
- ref: "develop"
+ ref: "v1.4.0"
secrets:
- secret:
name: etc-pki-entitlement
@@ -55,6 +55,6 @@ spec:
output:
to:
kind: "ImageStreamTag"
- name: "oai-amf:develop"
+ name: "oai-amf:v1.4.0"
diff --git a/openshift/oai-ausf-build-config.yml b/openshift/oai-ausf-build-config.yml
index eeba7649..45f1caff 100644
--- a/openshift/oai-ausf-build-config.yml
+++ b/openshift/oai-ausf-build-config.yml
@@ -37,7 +37,7 @@ spec:
source:
git:
uri: "https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-ausf.git"
- ref: "develop"
+ ref: "v1.4.0"
secrets:
- secret:
name: etc-pki-entitlement
@@ -55,6 +55,6 @@ spec:
output:
to:
kind: "ImageStreamTag"
- name: "oai-ausf:develop"
+ name: "oai-ausf:v1.4.0"
diff --git a/openshift/oai-nrf-build-config.yml b/openshift/oai-nrf-build-config.yml
index 4fc89ada..18bf1345 100644
--- a/openshift/oai-nrf-build-config.yml
+++ b/openshift/oai-nrf-build-config.yml
@@ -37,7 +37,7 @@ spec:
source:
git:
uri: "https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-nrf.git"
- ref: "develop"
+ ref: "v1.4.0"
secrets:
- secret:
name: etc-pki-entitlement
@@ -55,4 +55,4 @@ spec:
output:
to:
kind: "ImageStreamTag"
- name: "oai-nrf:develop"
+ name: "oai-nrf:v1.4.0"
diff --git a/openshift/oai-smf-build-config.yml b/openshift/oai-smf-build-config.yml
index 76568acb..2ee2c59d 100644
--- a/openshift/oai-smf-build-config.yml
+++ b/openshift/oai-smf-build-config.yml
@@ -37,7 +37,7 @@ spec:
source:
git:
uri: "https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-smf.git"
- ref: "develop"
+ ref: "v1.4.0"
secrets:
- secret:
name: etc-pki-entitlement
@@ -55,5 +55,5 @@ spec:
output:
to:
kind: "ImageStreamTag"
- name: "oai-smf:develop"
+ name: "oai-smf:v1.4.0"
diff --git a/openshift/oai-spgwu-tiny-build-config.yml b/openshift/oai-spgwu-tiny-build-config.yml
index cbe0f50a..cf348d43 100644
--- a/openshift/oai-spgwu-tiny-build-config.yml
+++ b/openshift/oai-spgwu-tiny-build-config.yml
@@ -37,7 +37,7 @@ spec:
source:
git:
uri: "https://github.com/OPENAIRINTERFACE/openair-spgwu-tiny.git"
- ref: "develop"
+ ref: "v1.4.0"
secrets:
- secret:
name: etc-pki-entitlement
@@ -55,5 +55,5 @@ spec:
output:
to:
kind: "ImageStreamTag"
- name: "oai-spgwu-tiny:develop"
+ name: "oai-spgwu-tiny:v1.4.0"
diff --git a/openshift/oai-udm-build-config.yml b/openshift/oai-udm-build-config.yml
index 554aa614..b12f3727 100644
--- a/openshift/oai-udm-build-config.yml
+++ b/openshift/oai-udm-build-config.yml
@@ -37,7 +37,7 @@ spec:
source:
git:
uri: "https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-udm.git"
- ref: "develop"
+ ref: "v1.4.0"
secrets:
- secret:
name: etc-pki-entitlement
@@ -55,5 +55,5 @@ spec:
output:
to:
kind: "ImageStreamTag"
- name: "oai-udm:develop"
+ name: "oai-udm:v1.4.0"
diff --git a/openshift/oai-udr-build-config.yml b/openshift/oai-udr-build-config.yml
index ce4db145..23800530 100644
--- a/openshift/oai-udr-build-config.yml
+++ b/openshift/oai-udr-build-config.yml
@@ -37,7 +37,7 @@ spec:
source:
git:
uri: "https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-udr.git"
- ref: "develop"
+ ref: "v1.4.0"
secrets:
- secret:
name: etc-pki-entitlement
@@ -55,5 +55,5 @@ spec:
output:
to:
kind: "ImageStreamTag"
- name: "oai-udr:develop"
+ name: "oai-udr:v1.4.0"
--
GitLab