Merge pull request #134 from Gradiant/open5gs-scp

Added scp service
Gradiant · Aug 30, 2023 · fe676f2 · fe676f2
2 parents 6b62768 + 72bb65e
commit fe676f2
Show file tree

Hide file tree

Showing 90 changed files with 1,693 additions and 196 deletions.
diff --git a/charts/open5gs-amf/Chart.yaml b/charts/open5gs-amf/Chart.yaml
@@ -10,7 +10,7 @@ maintainers:
   - email: [email protected]
     name: cgiraldo
 name: open5gs-amf
-version: 2.0.13
+version: 2.1.0
 keywords:
   - ngc
 dependencies:

diff --git a/charts/open5gs-amf/README.md b/charts/open5gs-amf/README.md
@@ -1,6 +1,6 @@
 # open5gs-amf
 
-![Version: 2.0.13](https://img.shields.io/badge/Version-2.0.13-informational?style=flat-square) ![AppVersion: 2.4.11](https://img.shields.io/badge/AppVersion-2.4.11-informational?style=flat-square)
+![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![AppVersion: 2.4.11](https://img.shields.io/badge/AppVersion-2.4.11-informational?style=flat-square)
 
 Helm chart to deploy Open5gs AMF service on Kubernetes.
 
@@ -37,6 +37,7 @@ Helm chart to deploy Open5gs AMF service on Kubernetes.
 | config.guamiList[0].plmn_id.mnc | string | `"70"` |  |
 | config.logLevel | string | `"info"` |  |
 | config.networkName | string | `"Gradiant"` |  |
+| config.nrf.enabled | bool | `true` |  |
 | config.nrf.sbi.hostname | string | `""` |  |
 | config.nrf.sbi.port | int | `7777` |  |
 | config.plmnList[0].plmn_id.mcc | string | `"999"` |  |
@@ -46,6 +47,9 @@ Helm chart to deploy Open5gs AMF service on Kubernetes.
 | config.sbi.advertise | string | `""` |  |
 | config.sbi.client.no_tls | bool | `true` |  |
 | config.sbi.server.no_tls | bool | `true` |  |
+| config.scp.enabled | bool | `false` |  |
+| config.scp.sbi.hostname | string | `""` |  |
+| config.scp.sbi.port | int | `7777` |  |
 | config.taiList[0].plmn_id.mcc | string | `"999"` |  |
 | config.taiList[0].plmn_id.mnc | string | `"70"` |  |
 | config.taiList[0].tac[0] | int | `1` |  |
@@ -78,7 +82,7 @@ Helm chart to deploy Open5gs AMF service on Kubernetes.
 | image.pullSecrets | list | `[]` |  |
 | image.registry | string | `"docker.io"` |  |
 | image.repository | string | `"openverso/open5gs"` |  |
-| image.tag | string | `"2.4.11"` |  |
+| image.tag | string | `"2.6.4"` |  |
 | initContainers | list | `[]` |  |
 | kubeVersion | string | `""` |  |
 | lifecycleHooks | object | `{}` |  |

diff --git a/charts/open5gs-amf/resources/config/amf.yaml b/charts/open5gs-amf/resources/config/amf.yaml
@@ -44,7 +44,16 @@ amf:
     integrity_order : [ NIA2, NIA1, NIA0 ]
     ciphering_order : [ NEA0, NEA1, NEA2 ]
 
+{{- if .Values.config.nrf.enabled }}
 nrf:
   sbi:
     - name: {{ default (printf "%s-nrf-sbi" $open5gsName) .Values.config.nrf.sbi.hostname }}
       port: {{ .Values.config.nrf.sbi.port }}
+{{- end }}
+
+{{- if .Values.config.scp.enabled }}
+scp:
+  sbi:
+    - name: {{ default (printf "%s-scp-sbi" $open5gsName) .Values.config.scp.sbi.hostname }}
+      port: {{ .Values.config.scp.sbi.port }}
+{{- end }}
diff --git a/charts/open5gs-amf/templates/deployment.yaml b/charts/open5gs-amf/templates/deployment.yaml
@@ -150,7 +150,8 @@ spec:
           {{- end }}
           volumeMounts:
             - name: config
-              mountPath:  /opt/open5gs/etc/open5gs/
+              mountPath:  /opt/open5gs/etc/open5gs/amf.yaml
+              subPath: "amf.yaml"
             {{- if .Values.extraVolumeMounts }}
             {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
             {{- end }}

diff --git a/charts/open5gs-amf/values.yaml b/charts/open5gs-amf/values.yaml
@@ -56,7 +56,7 @@ extraDeploy: []
 image:
   registry: docker.io
   repository: openverso/open5gs
-  tag: "2.4.11"
+  tag: "2.6.4"
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -85,6 +85,12 @@ config:
     client:
       no_tls: true
   nrf:
+    enabled: true
+    sbi:
+      hostname: ""  # if empty default is autogenerated open5gs svc fullname
+      port: 7777
+  scp:
+    enabled: false
     sbi:
       hostname: ""  # if empty default is autogenerated open5gs svc fullname
       port: 7777

diff --git a/charts/open5gs-ausf/Chart.yaml b/charts/open5gs-ausf/Chart.yaml
@@ -10,7 +10,7 @@ maintainers:
 - email: [email protected]
   name: cgiraldo
 name: open5gs-ausf
-version: 2.0.7
+version: 2.1.0
 keywords:
   - ngc
 dependencies:

diff --git a/charts/open5gs-ausf/README.md b/charts/open5gs-ausf/README.md
@@ -1,6 +1,6 @@
 # open5gs-ausf
 
-![Version: 2.0.7](https://img.shields.io/badge/Version-2.0.7-informational?style=flat-square) ![AppVersion: 2.4.11](https://img.shields.io/badge/AppVersion-2.4.11-informational?style=flat-square)
+![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![AppVersion: 2.4.11](https://img.shields.io/badge/AppVersion-2.4.11-informational?style=flat-square)
 
 Helm chart to deploy Open5gs AUSF service on Kubernetes.
 
@@ -32,11 +32,15 @@ Helm chart to deploy Open5gs AUSF service on Kubernetes.
 | commonAnnotations | object | `{}` |  |
 | commonLabels | object | `{}` |  |
 | config.logLevel | string | `"info"` |  |
+| config.nrf.enabled | bool | `true` |  |
 | config.nrf.sbi.hostname | string | `""` |  |
 | config.nrf.sbi.port | int | `7777` |  |
 | config.sbi.advertise | string | `""` |  |
 | config.sbi.client.no_tls | bool | `true` |  |
 | config.sbi.server.no_tls | bool | `true` |  |
+| config.scp.enabled | bool | `false` |  |
+| config.scp.sbi.hostname | string | `""` |  |
+| config.scp.sbi.port | int | `7777` |  |
 | containerPorts.sbi | int | `7777` |  |
 | containerSecurityContext.enabled | bool | `true` |  |
 | containerSecurityContext.runAsNonRoot | bool | `true` |  |
@@ -62,7 +66,7 @@ Helm chart to deploy Open5gs AUSF service on Kubernetes.
 | image.pullSecrets | list | `[]` |  |
 | image.registry | string | `"docker.io"` |  |
 | image.repository | string | `"openverso/open5gs"` |  |
-| image.tag | string | `"2.4.11"` |  |
+| image.tag | string | `"2.6.4"` |  |
 | initContainers | list | `[]` |  |
 | kubeVersion | string | `""` |  |
 | lifecycleHooks | object | `{}` |  |

diff --git a/charts/open5gs-ausf/resources/config/ausf.yaml b/charts/open5gs-ausf/resources/config/ausf.yaml
@@ -18,7 +18,16 @@ ausf:
       advertise: "{{ tpl .Values.config.sbi.advertise . }}"
       {{- end }}
 
+{{- if .Values.config.nrf.enabled }}
 nrf:
   sbi:
     - name: {{ default (printf "%s-nrf-sbi" $open5gsName) .Values.config.nrf.sbi.hostname }}
       port: {{ .Values.config.nrf.sbi.port }}
+{{- end }}
+
+{{- if .Values.config.scp.enabled }}
+scp:
+  sbi:
+    - name: {{ default (printf "%s-scp-sbi" $open5gsName) .Values.config.scp.sbi.hostname }}
+      port: {{ .Values.config.scp.sbi.port }}
+{{- end }}
diff --git a/charts/open5gs-ausf/templates/deployment.yaml b/charts/open5gs-ausf/templates/deployment.yaml
@@ -145,7 +145,8 @@ spec:
           {{- end }}
           volumeMounts:
             - name: config
-              mountPath:  /opt/open5gs/etc/open5gs/
+              mountPath:  /opt/open5gs/etc/open5gs/ausf.yaml
+              subPath: "ausf.yaml"
             {{- if .Values.extraVolumeMounts }}
             {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
             {{- end }}

diff --git a/charts/open5gs-ausf/values.yaml b/charts/open5gs-ausf/values.yaml
@@ -56,7 +56,7 @@ extraDeploy: []
 image:
   registry: docker.io
   repository: openverso/open5gs
-  tag: "2.4.11"
+  tag: "2.6.4"
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -85,6 +85,12 @@ config:
     client:
       no_tls: true
   nrf:
+    enabled: true
+    sbi:
+      hostname: ""  # if empty default is autogenerated open5gs svc fullname
+      port: 7777
+  scp:
+    enabled: false
     sbi:
       hostname: ""  # if empty default is autogenerated open5gs svc fullname
       port: 7777

diff --git a/charts/open5gs-bsf/Chart.yaml b/charts/open5gs-bsf/Chart.yaml
@@ -10,7 +10,7 @@ maintainers:
 - email: [email protected]
   name: cgiraldo
 name: open5gs-bsf
-version: 2.0.7
+version: 2.1.0
 keywords:
   - ngc
 dependencies:

diff --git a/charts/open5gs-bsf/README.md b/charts/open5gs-bsf/README.md
@@ -1,6 +1,6 @@
 # open5gs-bsf
 
-![Version: 2.0.7](https://img.shields.io/badge/Version-2.0.7-informational?style=flat-square) ![AppVersion: 2.4.11](https://img.shields.io/badge/AppVersion-2.4.11-informational?style=flat-square)
+![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![AppVersion: 2.4.11](https://img.shields.io/badge/AppVersion-2.4.11-informational?style=flat-square)
 
 Helm chart to deploy Open5gs BSF service on Kubernetes.
 
@@ -32,11 +32,15 @@ Helm chart to deploy Open5gs BSF service on Kubernetes.
 | commonAnnotations | object | `{}` |  |
 | commonLabels | object | `{}` |  |
 | config.logLevel | string | `"info"` |  |
+| config.nrf.enabled | bool | `true` |  |
 | config.nrf.sbi.hostname | string | `""` |  |
 | config.nrf.sbi.port | int | `7777` |  |
 | config.sbi.advertise | string | `""` |  |
 | config.sbi.client.no_tls | bool | `true` |  |
 | config.sbi.server.no_tls | bool | `true` |  |
+| config.scp.enabled | bool | `false` |  |
+| config.scp.sbi.hostname | string | `""` |  |
+| config.scp.sbi.port | int | `7777` |  |
 | containerPorts.sbi | int | `7777` |  |
 | containerSecurityContext.enabled | bool | `true` |  |
 | containerSecurityContext.runAsNonRoot | bool | `true` |  |
@@ -62,7 +66,7 @@ Helm chart to deploy Open5gs BSF service on Kubernetes.
 | image.pullSecrets | list | `[]` |  |
 | image.registry | string | `"docker.io"` |  |
 | image.repository | string | `"openverso/open5gs"` |  |
-| image.tag | string | `"2.4.11"` |  |
+| image.tag | string | `"2.6.4"` |  |
 | initContainers | list | `[]` |  |
 | kubeVersion | string | `""` |  |
 | lifecycleHooks | object | `{}` |  |

diff --git a/charts/open5gs-bsf/resources/config/bsf.yaml b/charts/open5gs-bsf/resources/config/bsf.yaml
@@ -18,7 +18,16 @@ bsf:
       advertise: "{{ tpl .Values.config.sbi.advertise . }}"
       {{- end }}
 
+{{- if .Values.config.nrf.enabled }}
 nrf:
   sbi:
     - name: {{ default (printf "%s-nrf-sbi" $open5gsName) .Values.config.nrf.sbi.hostname }}
       port: {{ .Values.config.nrf.sbi.port }}
+{{- end }}
+
+{{- if .Values.config.scp.enabled }}
+scp:
+  sbi:
+    - name: {{ default (printf "%s-scp-sbi" $open5gsName) .Values.config.scp.sbi.hostname }}
+      port: {{ .Values.config.scp.sbi.port }}
+{{- end }}
diff --git a/charts/open5gs-bsf/templates/deployment.yaml b/charts/open5gs-bsf/templates/deployment.yaml
@@ -145,7 +145,8 @@ spec:
           {{- end }}
           volumeMounts:
             - name: config
-              mountPath:  /opt/open5gs/etc/open5gs/
+              mountPath:  /opt/open5gs/etc/open5gs/bsf.yaml
+              subPath: "bsf.yaml"
             {{- if .Values.extraVolumeMounts }}
             {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
             {{- end }}

diff --git a/charts/open5gs-bsf/values.yaml b/charts/open5gs-bsf/values.yaml
@@ -56,7 +56,7 @@ extraDeploy: []
 image:
   registry: docker.io
   repository: openverso/open5gs
-  tag: "2.4.11"
+  tag: "2.6.4"
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -85,6 +85,12 @@ config:
     client:
       no_tls: true
   nrf:
+    enabled: true
+    sbi:
+      hostname: ""  # if empty default is autogenerated open5gs svc fullname
+      port: 7777
+  scp:
+    enabled: false
     sbi:
       hostname: ""  # if empty default is autogenerated open5gs svc fullname
       port: 7777

diff --git a/charts/open5gs-hss/Chart.yaml b/charts/open5gs-hss/Chart.yaml
@@ -10,7 +10,7 @@ maintainers:
 - email: [email protected]
   name: cgiraldo
 name: open5gs-hss
-version: 2.0.5
+version: 2.1.0
 keywords:
   - epc
   - ngc

diff --git a/charts/open5gs-hss/README.md b/charts/open5gs-hss/README.md
@@ -1,6 +1,6 @@
 # open5gs-hss
 
-![Version: 2.0.5](https://img.shields.io/badge/Version-2.0.5-informational?style=flat-square) ![AppVersion: 2.4.11](https://img.shields.io/badge/AppVersion-2.4.11-informational?style=flat-square)
+![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![AppVersion: 2.4.11](https://img.shields.io/badge/AppVersion-2.4.11-informational?style=flat-square)
 
 Helm chart to deploy Open5gs HSS service on Kubernetes.
 
@@ -61,7 +61,7 @@ Helm chart to deploy Open5gs HSS service on Kubernetes.
 | image.pullSecrets | list | `[]` |  |
 | image.registry | string | `"docker.io"` |  |
 | image.repository | string | `"openverso/open5gs"` |  |
-| image.tag | string | `"2.4.11"` |  |
+| image.tag | string | `"2.6.4"` |  |
 | initContainers | list | `[]` |  |
 | kubeVersion | string | `""` |  |
 | lifecycleHooks | object | `{}` |  |

diff --git a/charts/open5gs-hss/resources/config/diameter-hss.conf b/charts/open5gs-hss/resources/config/diameter-hss.conf
@@ -17,12 +17,12 @@
 # This must be a valid FQDN that resolves to the local host.
 # Default: hostname's FQDN
 #Identity = "aaa.koganei.freediameter.net";
-Identity = "hss.openverso";
+Identity = "hss.localdomain";
 
 # The Diameter Realm of this daemon.
 # Default: the domain part of Identity (after the first dot).
 #Realm = "koganei.freediameter.net";
-Realm = "openverso";
+Realm = "localdomain";
 
 ##############################################################
 ##  Transport protocol configuration
@@ -107,15 +107,15 @@ Port = {{ .Values.containerPorts.frdi }};
 # Default : NO DEFAULT
 #TLS_Cred = "<x509 certif file.PEM>" , "<x509 private key file.PEM>";
 #TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key";
-TLS_Cred = "/opt/open5gs/etc/freeDiameter/hss.cert.pem", "/opt/open5gs/etc/freeDiameter/hss.key.pem";
+TLS_Cred = "/opt/open5gs/etc/open5gs/tls/hss.crt", "/opt/open5gs/etc/open5gs/tls/hss.key";
 
 # Certificate authority / trust anchors
 # The file containing the list of trusted Certificate Authorities (PEM list)
 # (This parameter is passed to gnutls_certificate_set_x509_trust_file function)
 # The directive can appear several times to specify several files.
 # Default : GNUTLS default behavior
 #TLS_CA = "<file.PEM>";
-TLS_CA = "/opt/open5gs/etc/freeDiameter/cacert.pem";
+TLS_CA = "/opt/open5gs/etc/open5gs/tls/ca.crt";
 
 # Certificate Revocation List file
 # The information about revoked certificates.
@@ -223,13 +223,13 @@ TLS_CA = "/opt/open5gs/etc/freeDiameter/cacert.pem";
 #  4 - full    - display the complete information on a single long line
 #  8 - tree    - display the complete information in an easier to read format spanning several lines.
 
-LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dbg_msg_dumps.fdx" : "0x8888";
-LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_rfc5777.fdx";
-LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_mip6i.fdx";
-LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_nasreq.fdx";
-LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_nas_mipv6.fdx";
-LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_dcca.fdx";
-LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx";
+LoadExtension = "/opt/open5gs/lib/x86_64-linux-gnu/freeDiameter/dbg_msg_dumps.fdx" : "0x8888";
+LoadExtension = "/opt/open5gs/lib/x86_64-linux-gnu/freeDiameter/dict_rfc5777.fdx";
+LoadExtension = "/opt/open5gs/lib/x86_64-linux-gnu/freeDiameter/dict_mip6i.fdx";
+LoadExtension = "/opt/open5gs/lib/x86_64-linux-gnu/freeDiameter/dict_nasreq.fdx";
+LoadExtension = "/opt/open5gs/lib/x86_64-linux-gnu/freeDiameter/dict_nas_mipv6.fdx";
+LoadExtension = "/opt/open5gs/lib/x86_64-linux-gnu/freeDiameter/dict_dcca.fdx";
+LoadExtension = "/opt/open5gs/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx";
 
 
 ##############################################################
@@ -261,4 +261,4 @@ LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx
 # Examples:
 #ConnectPeer = "aaa.wide.ad.jp";
 #ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ;
-ConnectPeer = "mme.openverso" { ConnectTo = "{{ default (printf "%s-mme-frdi" $open5gsName) .Values.config.mme.frdi.hostname }}"; TcTimer = 60; TwTimer = 30; No_TLS; Port={{ .Values.config.mme.frdi.port }}; };
+ConnectPeer = "mme.localdomain" { ConnectTo = "{{ default (printf "%s-mme-frdi" $open5gsName) .Values.config.mme.frdi.hostname }}"; TcTimer = 60; TwTimer = 30; No_TLS; Port={{ .Values.config.mme.frdi.port }}; };
diff --git a/charts/open5gs-hss/templates/deployment.yaml b/charts/open5gs-hss/templates/deployment.yaml
@@ -125,7 +125,8 @@ spec:
               mountPath: /opt/open5gs/etc/freeDiameter/hss.conf
               subPath: "hss.conf"
             - name: config
-              mountPath:  /opt/open5gs/etc/open5gs/
+              mountPath:  /opt/open5gs/etc/open5gs/hss.yaml
+              subPath: "hss.yaml"
             {{- if .Values.extraVolumeMounts }}
             {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
             {{- end }}

diff --git a/charts/open5gs-hss/values.yaml b/charts/open5gs-hss/values.yaml
@@ -56,7 +56,7 @@ extraDeploy: []
 image:
   registry: docker.io
   repository: openverso/open5gs
-  tag: "2.4.11"
+  tag: "2.6.4"
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'

diff --git a/charts/open5gs-mme/Chart.yaml b/charts/open5gs-mme/Chart.yaml
@@ -10,7 +10,7 @@ maintainers:
 - email: [email protected]
   name: cgiraldo
 name: open5gs-mme
-version: 2.0.5
+version: 2.1.0
 keywords:
   - epc
   - ngc