Add NFs config.yaml as a independent file

charts/free5gc/charts/free5gc-amf/config.yaml

@@ -0,0 +1,93 @@
+amfName: AMF
+serviceNameList:
+  - namf-comm
+  - namf-evts
+  - namf-mt
+  - namf-loc
+  - namf-oam
+servedGuamiList:
+  - plmnId:
+      mcc: 208
+      mnc: 93
+    amfId: cafe00
+supportTaiList:
+  - plmnId:
+      mcc: 208
+      mnc: 93
+    tac: 000001
+plmnSupportList:
+  - plmnId:
+      mcc: 208
+      mnc: 93
+    snssaiList:
+      - sst: 1
+        sd: 010203
+      - sst: 1
+        sd: 112233
+supportDnnList:
+  - internet
+security:
+  integrityOrder:
+    - NIA2
+  cipheringOrder:
+    - NEA0
+networkName:
+  full: free5GC
+  short: free
+ngapIE: # Optional NGAP IEs
+  mobilityRestrictionList: # Mobility Restriction List IE, refer to TS 38.413
+    enable: true # append this IE in related message or not
+  maskedIMEISV: # Masked IMEISV IE, refer to TS 38.413
+    enable: true # append this IE in related message or not
+  redirectionVoiceFallback: # Redirection Voice Fallback IE, refer to TS 38.413
+    enable: false # append this IE in related message or not
+nasIE: # Optional NAS IEs
+  networkFeatureSupport5GS: # 5gs Network Feature Support IE, refer to TS 24.501
+    enable: true # append this IE in Registration accept or not
+    length: 1 # IE content length (uinteger, range: 1~3)
+    imsVoPS: 0 # IMS voice over PS session indicator (uinteger, range: 0~1)
+    emc: 0 # Emergency service support indicator for 3GPP access (uinteger, range: 0~3)
+    emf: 0 # Emergency service fallback indicator for 3GPP access (uinteger, range: 0~3)
+    iwkN26: 0 # Interworking without N26 interface indicator (uinteger, range: 0~1)
+    mpsi: 0 # MPS indicator (uinteger, range: 0~1)
+    emcN3: 0 # Emergency service support indicator for Non-3GPP access (uinteger, range: 0~1)
+    mcsi: 0 # MCS indicator (uinteger, range: 0~1)
+t3502Value: 720
+t3512Value: 3600
+non3gppDeregTimerValue: 3240
+# retransmission timer for paging message
+t3513:
+  enable: true     # true or false
+  expireTime: 6s   # default is 6 seconds
+  maxRetryTimes: 4 # the max number of retransmission
+# retransmission timer for NAS Registration Accept message
+t3522:
+  enable: true     # true or false
+  expireTime: 6s   # default is 6 seconds
+  maxRetryTimes: 4 # the max number of retransmission
+# retransmission timer for NAS Registration Accept message
+t3550:
+  enable: true     # true or false
+  expireTime: 6s   # default is 6 seconds
+  maxRetryTimes: 4 # the max number of retransmission
+# retransmission timer for NAS Authentication Request/Security Mode Command message
+t3560:
+  enable: true     # true or false
+  expireTime: 6s   # default is 6 seconds
+  maxRetryTimes: 4 # the max number of retransmission
+# retransmission timer for NAS Notification message
+t3565:
+  enable: true     # true or false
+  expireTime: 6s   # default is 6 seconds
+  maxRetryTimes: 4 # the max number of retransmission
+t3570:
+  enable: true     # true or false
+  expireTime: 6s   # default is 6 seconds
+  maxRetryTimes: 4 # the max number of retransmission
+locality: area1 # Name of the location where a set of AMF, SMF, PCF and UPFs are located
+sctp: # set the sctp server setting <optinal>, once this field is set, please also add maxInputStream, maxOsStream, maxAttempts, maxInitTimeOut
+  numOstreams: 3 # the maximum out streams of each sctp connection
+  maxInstreams: 5 # the maximum in streams of each sctp connection
+  maxAttempts: 2 # the maximum attempts of each sctp connection
+  maxInitTimeout: 2 # the maximum init timeout of each sctp connection
+defaultUECtxReq: false # the default value of UE Context Request to decide when triggering Initial Context Setup procedure

charts/free5gc/charts/free5gc-amf/templates/amf-configmap.yaml

@@ -45,8 +45,7 @@ data:
 
       nrfUri: {{ $.Values.global.sbi.scheme }}://{{ $.Values.global.nrf.service.name }}:{{ $.Values.global.nrf.service.port }}
 
-      {{- .configuration.configuration | nindent 6 }}
-
+      {{- $.Files.Get "config.yaml" | nindent 6 }}
     logger:
       {{- toYaml .configuration.logger | nindent 6 }}
 

charts/free5gc/charts/free5gc-amf/values.yaml

@@ -119,101 +119,6 @@ amf:
         - namf-mt
         - namf-loc
         - namf-oam
-    configuration: |-
-      amfName: AMF
-      serviceNameList:
-        - namf-comm
-        - namf-evts
-        - namf-mt
-        - namf-loc
-        - namf-oam
-      servedGuamiList:
-        - plmnId:
-            mcc: 208
-            mnc: 93
-          amfId: cafe00
-      supportTaiList:
-        - plmnId:
-            mcc: 208
-            mnc: 93
-          tac: 000001
-      plmnSupportList:
-        - plmnId:
-            mcc: 208
-            mnc: 93
-          snssaiList:
-            - sst: 1
-              sd: 010203
-            - sst: 1
-              sd: 112233
-      supportDnnList:
-        - internet
-      security:
-        integrityOrder:
-          - NIA2
-        cipheringOrder:
-          - NEA0
-      networkName:
-        full: free5GC
-        short: free
-      ngapIE: # Optional NGAP IEs
-        mobilityRestrictionList: # Mobility Restriction List IE, refer to TS 38.413
-          enable: true # append this IE in related message or not
-        maskedIMEISV: # Masked IMEISV IE, refer to TS 38.413
-          enable: true # append this IE in related message or not
-        redirectionVoiceFallback: # Redirection Voice Fallback IE, refer to TS 38.413
-          enable: false # append this IE in related message or not
-      nasIE: # Optional NAS IEs
-        networkFeatureSupport5GS: # 5gs Network Feature Support IE, refer to TS 24.501
-          enable: true # append this IE in Registration accept or not
-          length: 1 # IE content length (uinteger, range: 1~3)
-          imsVoPS: 0 # IMS voice over PS session indicator (uinteger, range: 0~1)
-          emc: 0 # Emergency service support indicator for 3GPP access (uinteger, range: 0~3)
-          emf: 0 # Emergency service fallback indicator for 3GPP access (uinteger, range: 0~3)
-          iwkN26: 0 # Interworking without N26 interface indicator (uinteger, range: 0~1)
-          mpsi: 0 # MPS indicator (uinteger, range: 0~1)
-          emcN3: 0 # Emergency service support indicator for Non-3GPP access (uinteger, range: 0~1)
-          mcsi: 0 # MCS indicator (uinteger, range: 0~1)
-      t3502Value: 720
-      t3512Value: 3600
-      non3gppDeregTimerValue: 3240
-      # retransmission timer for paging message
-      t3513:
-        enable: true     # true or false
-        expireTime: 6s   # default is 6 seconds
-        maxRetryTimes: 4 # the max number of retransmission
-      # retransmission timer for NAS Registration Accept message
-      t3522:
-        enable: true     # true or false
-        expireTime: 6s   # default is 6 seconds
-        maxRetryTimes: 4 # the max number of retransmission
-      # retransmission timer for NAS Registration Accept message
-      t3550:
-        enable: true     # true or false
-        expireTime: 6s   # default is 6 seconds
-        maxRetryTimes: 4 # the max number of retransmission
-      # retransmission timer for NAS Authentication Request/Security Mode Command message
-      t3560:
-        enable: true     # true or false
-        expireTime: 6s   # default is 6 seconds
-        maxRetryTimes: 4 # the max number of retransmission
-      # retransmission timer for NAS Notification message
-      t3565:
-        enable: true     # true or false
-        expireTime: 6s   # default is 6 seconds
-        maxRetryTimes: 4 # the max number of retransmission
-      t3570:
-        enable: true     # true or false
-        expireTime: 6s   # default is 6 seconds
-        maxRetryTimes: 4 # the max number of retransmission
-      locality: area1 # Name of the location where a set of AMF, SMF, PCF and UPFs are located
-      sctp: # set the sctp server setting <optinal>, once this field is set, please also add maxInputStream, maxOsStream, maxAttempts, maxInitTimeOut
-        numOstreams: 3 # the maximum out streams of each sctp connection
-        maxInstreams: 5 # the maximum in streams of each sctp connection
-        maxAttempts: 2 # the maximum attempts of each sctp connection
-        maxInitTimeout: 2 # the maximum init timeout of each sctp connection
-      defaultUECtxReq: false # the default value of UE Context Request to decide when triggering Initial Context Setup procedure
-
     logger: # log output setting
       enable: true # true or false
       level: info # how detailed to output, value: trace, debug, info, warn, error, fatal, panic

charts/free5gc/charts/free5gc-ausf/config.yaml

@@ -0,0 +1,7 @@
+plmnSupportList:
+  - mcc: 208
+    mnc: 93
+  - mcc: 123
+    mnc: 45
+groupId: ausfGroup001
+eapAkaSupiImsiPrefix: false

charts/free5gc/charts/free5gc-ausf/templates/ausf-configmap.yaml

@@ -38,8 +38,7 @@ data:
 
       nrfUri: {{ $.Values.global.sbi.scheme }}://{{ $.Values.global.nrf.service.name }}:{{ $.Values.global.nrf.service.port }}
 
-      {{- .configuration.configuration | nindent 6 }}
-
+      {{- $.Files.Get "config.yaml" | nindent 6 }}
     logger:
       {{- toYaml .configuration.logger | nindent 6 }}
 

charts/free5gc/charts/free5gc-ausf/values.yaml

@@ -93,14 +93,6 @@ ausf:
   configuration:
     serviceNameList: |-
       - nausf-auth
-    configuration: |-
-      plmnSupportList:
-        - mcc: 208
-          mnc: 93
-        - mcc: 123
-          mnc: 45
-      groupId: ausfGroup001
-      eapAkaSupiImsiPrefix: false
     # the kind of log output
       # debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
       # ReportCaller: enable the caller report or not, value: true or false

charts/free5gc/charts/free5gc-n3iwf/config.yaml

@@ -0,0 +1,44 @@
+N3IWFInformation:
+  GlobalN3IWFID:
+    PLMNID:
+      MCC: 208
+      MNC: 93
+    N3IWFID: 135
+  Name:
+    free5GC_N3IWF
+  SupportedTAList:
+    - TAC: 000001
+      BroadcastPLMNList:
+        - PLMNID:
+            MCC: 208
+            MNC: 93
+          TAISliceSupportList:
+            - SNSSAI:
+                SST: 1
+                SD: 010203
+            - SNSSAI:
+                SST: 1
+                SD: 112233
+
+# IPSec virtual interface
+IPSecInterfaceAddress: 10.0.0.1
+
+# IPSec virtual interface mark
+IPSecInterfaceMark: 5
+
+# NAS TCP Listen Port
+NASTCPPort: 20000
+
+# N3IWF FQDN
+FQDN: n3iwf.free5gc.org
+
+# Security
+# Private Key File Path
+PrivateKey: ../cert/n3iwf.key
+# Certificate Authority (CA)
+CertificateAuthority: ../cert/n3iwf.pem
+# Certificate
+Certificate: ../cert/n3iwf.pem
+
+# IP address that will be allocated to UE in IPSec tunnel
+UEIPAddressRange: 10.0.0.0/24

charts/free5gc/charts/free5gc-n3iwf/templates/n3iwf-configmap.yaml

@@ -41,8 +41,7 @@ data:
       # GTP interface
       GTPBindAddress: {{ .n3if.ipAddress }}
 
-      {{- .configuration.configuration | nindent 6 }}
-
+      {{- $.Files.Get "config.yaml" | nindent 6 }}
     logger:
       {{- toYaml .configuration.logger | nindent 6 }}
 

charts/free5gc/charts/free5gc-n3iwf/values.yaml

@@ -104,52 +104,6 @@ n3iwf:
 
   configuration:
     IPSecInterfaceAddress: 10.0.0.1
-    configuration: |-
-      N3IWFInformation:
-        GlobalN3IWFID:
-          PLMNID:
-            MCC: 208
-            MNC: 93
-          N3IWFID: 135
-        Name:
-          free5GC_N3IWF
-        SupportedTAList:
-          - TAC: 000001
-            BroadcastPLMNList:
-              - PLMNID:
-                  MCC: 208
-                  MNC: 93
-                TAISliceSupportList:
-                  - SNSSAI:
-                      SST: 1
-                      SD: 010203
-                  - SNSSAI:
-                      SST: 1
-                      SD: 112233
-
-      # IPSec virtual interface
-      IPSecInterfaceAddress: 10.0.0.1
-
-      # IPSec virtual interface mark
-      IPSecInterfaceMark: 5
-
-      # NAS TCP Listen Port
-      NASTCPPort: 20000
-
-      # N3IWF FQDN
-      FQDN: n3iwf.free5gc.org
-
-      # Security
-      # Private Key File Path
-      PrivateKey: ../cert/n3iwf.key
-      # Certificate Authority (CA)
-      CertificateAuthority: ../cert/n3iwf.pem
-      # Certificate
-      Certificate: ../cert/n3iwf.pem
-
-      # IP address that will be allocated to UE in IPSec tunnel
-      UEIPAddressRange: 10.0.0.0/24
-
     # the kind of log output
       # debugLevel: how detailed to output, value: trace, debug, info, warn, error, fatal, panic
       # ReportCaller: enable the caller report or not, value: true or false

charts/free5gc/charts/free5gc-nrf/config.yaml

@@ -0,0 +1,3 @@
+DefaultPlmnId:
+  mcc: 208
+  mnc: 93

charts/free5gc/charts/free5gc-nrf/templates/nrf-configmap.yaml

@@ -39,8 +39,7 @@ data:
           key: ../cert/nrf.key
           pem: ../cert/nrf.pem
 
-      {{- .configuration.configuration | nindent 6 }}
-
+      {{- $.Files.Get "config.yaml" | nindent 6 }}
     logger:
       {{- toYaml .configuration.logger | nindent 6 }}
 

charts/free5gc/charts/free5gc-nrf/values.yaml

@@ -108,10 +108,6 @@ nrf:
     serviceNameList: |-
       - nnrf-nfm
       - nnrf-disc
-    configuration: |-
-      DefaultPlmnId:
-        mcc: 208
-        mnc: 93
     logger: # log output setting
       enable: true # true or false
       level: info # how detailed to output, value: trace, debug, info, warn, error, fatal, panic