Updating the charts

- updated nssf charts
- renamed slicing to advance

.gitignore

@@ -9,5 +9,5 @@ charts/oai-5g-core/oai-5g-mini/Chart.lock
 charts/oai-5g-core/oai-5g-mini/charts/
 charts/oai-5g-core/oai-5g-basic/Chart.lock
 charts/oai-5g-core/oai-5g-basic/charts/
-charts/oai-5g-core/oai-5g-slicing/Chart.lock
-charts/oai-5g-core/oai-5g-slicing/charts/
+charts/oai-5g-core/oai-5g-advance/Chart.lock
+charts/oai-5g-core/oai-5g-advance/charts/

charts/oai-5g-core/mysql/templates/svc.yaml

 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "mysql.fullname" . }}
+  name: {{ .Chart.Name }}
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "mysql.fullname" . }}

charts/oai-5g-core/oai-5g-basic/config.yaml

@@ -2,7 +2,7 @@
 
 # Log level for all the NFs
 log_level:
-  general: debug
+  general: info
 
 # If you enable registration, the other NFs will use the NRF discovery mechanism
 register_nf:
@@ -84,7 +84,7 @@ nfs:
 
 #### Common for UDR and AMF
 database:
-  host: oai-5g-basic-mysql
+  host: mysql
   user: test
   type: mysql
   password: test
@@ -101,7 +101,7 @@ amf:
                                # set it to "yes" to use with the minimalist deployment scenario (including only AMF/SMF/UPF) by using the internal AUSF/UDM implemented inside AMF.
                                # There's no NRF in this scenario, SMF info is taken from "nfs" section.
     enable_nssf: no
-    enable_smf_selection: no
+    enable_smf_selection: yes
   relative_capacity: 30
   statistics_timer_interval: 20  # in seconds
   emergency_support: false
@@ -129,7 +129,7 @@ amf:
 smf:
   ue_mtu: 1500
   support_features:
-    use_local_subscription_info: yes # Use infos from local_subscription_info or from UDM
+    use_local_subscription_info: no # Use infos from local_subscription_info or from UDM
     use_local_pcc_rules: yes # Use infos from local_pcc_rules or from PCF
   # we resolve from NRF, this is just to configure usage_reporting
   upfs:
@@ -187,7 +187,7 @@ upf:
 dnns:
   - dnn: "oai"
     pdu_session_type: "IPV4"
-    ipv4_subnet: "12.1.1.128/25"
+    ipv4_subnet: "12.1.1.0/24"
   - dnn: "ims"
     pdu_session_type: "IPV4V6"
-    ipv4_subnet: "14.1.1.2/24"
\ No newline at end of file
+    ipv4_subnet: "14.1.1.0/24"
\ No newline at end of file

charts/oai-5g-core/oai-5g-basic/values.yaml

@@ -16,8 +16,8 @@ oai-nrf:
   enabled: true
   kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
   nfimage:  # image name either locally present or in a public/private repository
-    repository: docker.io/oaisoftwarealliance/oai-nrf           ## The image will be pulled from dockerhub
-    version: develop                                    ## The branch to be used to pull from dockerhub
+    repository: docker.io/oaisoftwarealliance/oai-nrf          ## The image will be pulled from dockerhub
+    version: develop                          ## The branch to be used to pull from dockerhub
     # pullPolicy: IfNotPresent or Never or Always
     pullPolicy: IfNotPresent
   includeTcpDumpContainer: false #only for taking pcaps inside network function pod
@@ -147,7 +147,7 @@ oai-upf:
       hostInterface: "bond0"
   #NOTE: If the interface you selected for n6If is wrong then traffic will not be routed towards internet
   nodeSelector: {}
-#oai-traffic-server:
+# oai-traffic-server:
 #  enabled: false
 #  weight: 6
 #  kubernetesType: Vanilla
@@ -172,7 +172,7 @@ oai-smf:
   kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes
   nfimage:  # image name either locally present or in a public/private repository
     repository: docker.io/oaisoftwarealliance/oai-smf           ## The image will be pulled from dockerhub
-    version: develop                                    ## The branch to be used to pull from dockerhub
+    version: develop                         ## The branch to be used to pull from dockerhub
     # pullPolicy: IfNotPresent or Never or Always
     pullPolicy: IfNotPresent
   includeTcpDumpContainer: false #only for taking pcaps inside network function pod

charts/oai-5g-core/oai-5g-mini/config.yaml

@@ -2,7 +2,7 @@
 
 # Log level for all the NFs
 log_level:
-  general: debug
+  general: info
 
 # If you enable registration, the other NFs will use the NRF discovery mechanism
 register_nf:

charts/oai-5g-core/oai-5g-mini/values.yaml

@@ -3,6 +3,7 @@ global:
   clusterIpServiceIpAllocation: false #this will allocate ip-address to cluster Ip service
   waitForNRF: true
   http2Param: "--http2-prior-knowledge"  # if waitForNRF is true and http2 is used for all NF then this param is needed
+  timeout: 1
 mysql:
   enabled: true
   imagePullPolicy: IfNotPresent

charts/oai-5g-core/oai-amf/README.md

@@ -103,7 +103,7 @@ Better to use the parent charts from:
 
 1. [oai-5g-basic](../oai-5g-basic/README.md) for basic deployment of OAI-5G Core
 2. [oai-5g-mini](../oai-5g-mini/README.md) for mini deployment (AMF, SMF, NRF, UPF) of OAI-5G Core. In this type of deployment AMF plays the role of AUSF and UDR
-3. [oai-5g-slicing](../oai-5g-slicing/README.md) for basic deployment with NSSF extra
+3. [oai-5g-advance](../oai-5g-slicing/README.md) for basic deployment with NSSF extra
 
 ## Note
 

charts/oai-5g-core/oai-ausf/README.md

@@ -85,7 +85,7 @@ Only needed if you are doing advanced debugging
 Better to use the parent charts from:
 
 1. [oai-5g-basic](../oai-5g-basic/README.md) for basic deployment of OAI-5G Core
-2. [oai-5g-slicing](../oai-5g-slicing/README.md) for basic deployment with NSSF extra
+2. [oai-5g-advance](../oai-5g-slicing/README.md) for basic deployment with NSSF extra
 
 ## Note
 

charts/oai-5g-core/oai-nrf/README.md

@@ -91,7 +91,7 @@ Better to use the parent charts from:
 
 1. [oai-5g-basic](../oai-5g-basic/README.md) for basic deployment of OAI-5G Core
 2. [oai-5g-mini](../oai-5g-mini/README.md) for mini deployment (AMF, SMF, NRF, UPF) of OAI-5G Core. In this type of deployment AMF plays the role of AUSF and UDR
-3. [oai-5g-slicing](../oai-5g-slicing/README.md) for basic deployment with NSSF extra
+3. [oai-5g-advance](../oai-5g-slicing/README.md) for basic deployment with NSSF extra
 
 ```bash
 helm install oai-nrf .

charts/oai-5g-core/oai-nrf/config.yaml

@@ -4,10 +4,6 @@
 log_level:
   general: debug
 
-# If you enable registration, the NF will use the NRF discovery mechanism
-register_nf:
-  general: yes
-
 http_version: 2  # allowed value 1 and 2, make sure all NFs use the same HTTP version
 
 ############## SBI Interfaces

charts/oai-5g-core/oai-nssf/templates/configmap.yaml

+{{- if not .Values.global }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Chart.Name }}-configmap
 data:
-  {{- range $key, $val := .Values.config }}
-  {{ $key }}: {{ $val | quote }}
-  {{- end }}
----
+  {{ (.Files.Glob "config.yaml").AsConfig | indent 2 | trim }}
+  {{ (.Files.Glob "scripts/nssf_slice_config.yaml").AsConfig | indent 2 | trim }}
+{{- else }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Chart.Name }}-yamlconfig
+  name: {{ .Chart.Name }}-configmap
 data:
   {{ (.Files.Glob "scripts/nssf_slice_config.yaml").AsConfig | indent 2 | trim }}
+{{- end }}

charts/oai-5g-core/oai-nssf/templates/deployment.yaml

@@ -18,8 +18,10 @@ spec:
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+    {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
         {{ toYaml .Values.imagePullSecrets | indent 8 }}
+    {{- end }}
       containers:
     {{- if .Values.includeTcpDumpContainer }}
       - name: tcpdump
@@ -72,8 +74,8 @@ spec:
             cpu: {{ .Values.resources.limits.nf.cpu | quote }}
         {{- end}}
         volumeMounts:
-        - mountPath: /tmp/
-          name: nssf-slice-config
+        - mountPath: /openair-nssf/etc
+          name: configuration
         {{- if .Values.readinessProbe}}
         readinessProbe:
           exec:
@@ -93,72 +95,14 @@ spec:
           periodSeconds: 5
         {{- end}}
         ports:
-        - containerPort: {{ .Values.config.sbiPortHttp1 }}
-          name: http1
-        - containerPort: {{ .Values.config.sbiPortHttp2 }}
-          name: http2
+        - containerPort: {{ .Values.exposedPorts.sbi }}
+          name: http
         {{- if .Values.start.nssf}}
         {{- else}}
         command:
           - /bin/sleep
           - infinity
         {{- end}}
-        env:
-          - name: TZ
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Chart.Name }}-configmap
-                key: tz     
-          - name: NSSF_NAME
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Chart.Name }}-configmap
-                key: nssfname
-          - name: INSTANCE
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Chart.Name }}-configmap
-                key: instance
-          - name: PID_DIRECTORY
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Chart.Name }}-configmap
-                key: pidDirectory
-          - name: LOG_LEVEL
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Chart.Name }}-configmap
-                key: logLevel
-          - name: NSSF_FQDN
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Chart.Name }}-configmap
-                key: nssfFqdn
-          - name: SBI_IF_NAME
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Chart.Name }}-configmap
-                key: sbiIfName
-          - name: SBI_PORT_HTTP1
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Chart.Name }}-configmap
-                key: sbiPortHttp1
-          - name: SBI_PORT_HTTP2
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Chart.Name }}-configmap
-                key: sbiPortHttp2
-          - name: SBI_API_VERSION
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Chart.Name }}-configmap
-                key: sbiApiVersion
-          - name: NSSF_SLICE_CONFIG
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Chart.Name }}-configmap
-                key: nssfSliceConfig
         {{- if .Values.start.nssf}}
         {{- else}}
         command:
@@ -173,9 +117,13 @@ spec:
           claimName: cn5g-pvc
       {{- end }}
       {{- end }}
-      - name: nssf-slice-config
-        configMap:
-          name: {{ .Chart.Name }}-yamlconfig
+      - configMap:
+      {{- if .Values.global }}
+          name: {{ .Values.global.nfConfigurationConfigMap }}
+      {{- else }}
+          name: {{ .Chart.Name }}-configmap
+      {{- end }}
+        name: configuration
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler

charts/oai-5g-core/oai-nssf/templates/service.yaml

@@ -6,19 +6,15 @@ metadata:
     {{- include "oai-nssf.labels" . | nindent 4 }}
 spec:
   type: ClusterIP
+  {{- if .Values.global }}{{ if not .Values.global.clusterIpServiceIpAllocation }}
   clusterIP: None
+  {{- end }}{{ end }}
   ports:
-    - name: http1
+    - name: http
       # Port accessible outside cluster
-      port: {{ .Values.config.sbiPortHttp1 }}
-      # Port to forward to inside the pod
-      targetPort: {{ .Values.config.sbiPortHttp1 }}
-      protocol: TCP
-    - name: http2
-      # Port accessible outside cluster
-      port: {{ .Values.config.sbiPortHttp2 }}
-      # Port to forward to inside the pod
-      targetPort: {{ .Values.config.sbiPortHttp2 }}
+      port: {{ .Values.exposedPorts.sbi }}
+      # Port to forward config inside the pod
+      targetPort: {{ .Values.exposedPorts.sbi }}
       protocol: TCP
   selector:
     {{- include "oai-nssf.selectorLabels" . | nindent 4 }}

charts/oai-5g-core/oai-nssf/values.yaml

@@ -24,19 +24,8 @@ podSecurityContext:
 
 #service type is fixed to clusterIP, it is only support for non multus interface (eth0)
 
-config:
-  tz: "Europe/Paris"
-  instance: "0"
-  logLevel: "info"
-  nssfname: "oai-nssf"
-  pidDirectory: "/var/run"
-  nssfFqdn: "oai-nssf-svc"
-  sbiIfName: "eth0"
-  sbiPortHttp1: "80"
-  sbiPortHttp2: "8080"
-  sbiApiVersion: "v1"
-  nssfSliceConfig: "/tmp/nssf_slice_config.yaml"   # Do not change
-
+exposedPorts:
+  sbi: 80
 
 ## Debugging section
 start:

charts/oai-5g-core/oai-smf/README.md

@@ -100,7 +100,7 @@ Better to use the parent charts from:
 
 1. [oai-5g-basic](../oai-5g-basic/README.md) for basic deployment of OAI-5G Core
 2. [oai-5g-mini](../oai-5g-mini/README.md) for mini deployment (AMF, SMF, NRF, UPF) of OAI-5G Core. In this type of deployment AMF plays the role of AUSF and UDR
-3. [oai-5g-slicing](../oai-5g-slicing/README.md) for basic deployment with NSSF extra 
+3. [oai-5g-advance](../oai-5g-slicing/README.md) for basic deployment with NSSF extra 
 
 ## Note
 

charts/oai-5g-core/oai-smf/config.yaml

@@ -16,7 +16,7 @@ log_level:
 
 # If you enable registration, the other NFs will use the NRF discovery mechanism
 register_nf:
-  general: yes
+  general: no
 
 http_version: 2
 
@@ -66,7 +66,7 @@ smf:
     discover_upf: yes
   # we resolve from NRF, this is just to configure usage_reporting
   upfs:
-    - host: oai-spgwu
+    - host: oai-upf
       config:
         enable_usage_reporting: no
   ue_dns:
@@ -84,7 +84,7 @@ smf:
       - sNssai: *embb_slice1
         dnnSmfInfoList:
           - dnn: "oai"
-      - sNssai: *embb_slice1
+      - sNssai: *embb_slice2
         dnnSmfInfoList:
           - dnn: "ims"
   local_subscription_infos:
@@ -94,7 +94,7 @@ smf:
         5qi: 5
         session_ambr_ul: "200Mbps"
         session_ambr_dl: "400Mbps"
-    - single_nssai: *embb_slice1
+    - single_nssai: *embb_slice2
       dnn: "ims"
       qos_profile:
         5qi: 2
@@ -105,7 +105,7 @@ smf:
 dnns:
   - dnn: "oai"
     pdu_session_type: "IPV4"
-    ipv4_subnet: "12.1.1.128/25"
+    ipv4_subnet: "12.1.1.0/24"
   - dnn: "ims"
     pdu_session_type: "IPV4V6"
-    ipv4_subnet: "14.1.1.2/24"
+    ipv4_subnet: "14.1.1.0/24"
\ No newline at end of file

charts/oai-5g-core/oai-smf/values.yaml

@@ -3,8 +3,8 @@ kubernetesType: Vanilla  #Vanilla for community kubernetes distribution else Ope
 ## In case of using these charts on Openshift then please use UBI images
 ## To know more about them follow this tutorial https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/tree/master/openshift
 nfimage:
-  repository: docker.io/oaisoftwarealliance/oai-smf          # dockerhub oaisoftwarealliance/oai-smf
-  version: develop    #image tag, develop tag for experimental features 
+  repository: docker.io/oaisoftwarealliance/oai-smf  #docker.io/oaisoftwarealliance/oai-smf          # dockerhub oaisoftwarealliance/oai-smf
+  version: develop  #image tag, develop tag for experimental features 
   #pullPolicy: IfNotPresent or Never or Always
   pullPolicy: IfNotPresent
 

charts/oai-5g-core/oai-udm/README.md

@@ -85,7 +85,7 @@ Only needed if you are doing advanced debugging
 Better to use the parent charts from:
 
 1. [oai-5g-basic](../oai-5g-basic/README.md) for basic deployment of OAI-5G Core
-2. [oai-5g-slicing](../oai-5g-slicing/README.md) for basic deployment with NSSF extra 
+2. [oai-5g-advance](../oai-5g-slicing/README.md) for basic deployment with NSSF extra 
 
 ## Note
 

charts/oai-5g-core/oai-upf/README.md

@@ -111,7 +111,7 @@ Better to use the parent charts from:
 
 1. [oai-5g-basic](../oai-5g-basic/README.md) for basic deployment of OAI-5G Core
 2. [oai-5g-mini](../oai-5g-mini/README.md) for mini deployment (AMF, SMF, NRF, UPF) of OAI-5G Core. In this type of deployment AMF plays the role of AUSF and UDR
-3. [oai-5g-slicing](../oai-5g-slicing/README.md) for basic deployment with NSSF extra 
+3. [oai-5g-advance](../oai-5g-slicing/README.md) for basic deployment with NSSF extra 
 
 ## Note