Open5gs chart update (#54)

* major open5gs chart refactor * upgrade open5gs chart refactor * upgrade open5gs chart refactor - fix pcrf EnvVars * lint correction * lint correction - now OK Co-authored-by: Carlos Giraldo <[email protected]>
Gradiant · Jul 13, 2022 · fd7ce00 · fd7ce00
1 parent 68640e7
commit fd7ce00
Show file tree

Hide file tree

Showing 100 changed files with 5,219 additions and 2,912 deletions.
diff --git a/charts/open5gs/Chart.yaml b/charts/open5gs/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "2.4.4"
+appVersion: "2.4.8"
 description: >
   Helm chart to deploy Open5gs services on Kubernetes.
 home: https://github.com/gradiant/openverso-charts
@@ -10,7 +10,7 @@ maintainers:
 - email: [email protected]
   name: cgiraldo
 name: open5gs
-version: 0.5.0
+version: 1.1.0
 keywords:
   - epc
   - ngc
@@ -21,6 +21,6 @@ dependencies:
       - bitnami-common
     version: 1.x.x
   - name: mongodb
-    version: ~9.2.2
+    version: ~12.1.19
     repository: https://charts.bitnami.com/bitnami
     condition: mongodb.enabled
diff --git a/charts/open5gs/resources/config/amf.yaml b/charts/open5gs/resources/config/amf.yaml
@@ -1,6 +1,3 @@
-{{- if eq .Values.amf.configType "configYaml" }}
-{{ toYaml .Values.amf.configYaml }}
-{{- else if eq .Values.amf.configType "config" }}
 logger:
   level: {{ .Values.amf.config.logLevel }}
 parameter: {}
@@ -39,5 +36,9 @@ amf:
       ciphering_order : [ NEA0, NEA1, NEA2 ]
   network_name:
       full: Gradiant5G
-  amf_name: open5gs-amf0
-{{- end }}
+  amf_name: {{ include "common.names.fullname" . }}-amf
+  {{- if .Values.amf.metrics.enabled }}
+  metrics:
+    addr: 0.0.0.0
+    port: 9090
+  {{- end }}
diff --git a/charts/open5gs/resources/config/ausf.yaml b/charts/open5gs/resources/config/ausf.yaml
@@ -1,6 +1,3 @@
-{{- if eq .Values.ausf.configType "configYaml" }}
-{{ toYaml .Values.ausf.configYaml }}
-{{- else if eq .Values.ausf.configType "config" }}
 logger:
   level: {{ .Values.ausf.config.logLevel }}
 parameter: {}
@@ -14,5 +11,3 @@ ausf:
   sbi:
     dev: eth0
     port: 7777
-
-{{- end }}
diff --git a/charts/open5gs/resources/config/bsf.yaml b/charts/open5gs/resources/config/bsf.yaml
@@ -1,6 +1,3 @@
-{{- if eq .Values.bsf.configType "configYaml" }}
-{{ toYaml .Values.bsf.configYaml }}
-{{- else if eq .Values.bsf.configType "config" }}
 logger:
   level: {{ .Values.bsf.config.logLevel }}
 parameter: {}
@@ -14,5 +11,3 @@ bsf:
   sbi:
     dev: eth0
     port: 7777
-
-{{- end }}
diff --git a/charts/open5gs/resources/config/diameter-hss.conf b/charts/open5gs/resources/config/diameter-hss.conf
@@ -260,4 +260,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 = "{{ include "common.names.fullname" . }}-mme"; TcTimer = 60; TwTimer = 30; No_TLS; };
+ConnectPeer = "mme.openverso" { ConnectTo = "{{ include "common.names.fullname" . }}-mme-sctp"; TcTimer = 60; TwTimer = 30; No_TLS; };
diff --git a/charts/open5gs/resources/config/diameter-mme.conf b/charts/open5gs/resources/config/diameter-mme.conf
@@ -260,4 +260,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 = "hss.openverso" { ConnectTo = "{{ include "common.names.fullname" . }}-hss"; TcTimer = 60; TwTimer = 30; No_TLS; };
+ConnectPeer = "hss.openverso" { ConnectTo = "{{ include "common.names.fullname" . }}-hss-sctp"; TcTimer = 60; TwTimer = 30; No_TLS; };
diff --git a/charts/open5gs/resources/config/diameter-pcrf.conf b/charts/open5gs/resources/config/diameter-pcrf.conf
@@ -260,4 +260,4 @@ LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx
 #ConnectPeer = "aaa.wide.ad.jp";
 #ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ;
 
-ConnectPeer = "smf.openverso" { ConnectTo = "{{ include "common.names.fullname" . }}-smf"; No_TLS; };
+ConnectPeer = "smf.openverso" { ConnectTo = "{{ include "common.names.fullname" . }}-smf-sctp"; No_TLS; };
diff --git a/charts/open5gs/resources/config/diameter-smf.conf b/charts/open5gs/resources/config/diameter-smf.conf
@@ -262,4 +262,4 @@ LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx
 #ConnectPeer = "aaa.wide.ad.jp";
 #ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ;
 #ConnectPeer = "pcrf.openverso" { ConnectTo = "${PCRF_HOSTNAME}"; No_TLS; };
-ConnectPeer = "pcrf.openverso" { ConnectTo = "{{ include "common.names.fullname" . }}-pcrf"; TcTimer = 60; TwTimer = 30; No_TLS; };
+ConnectPeer = "pcrf.openverso" { ConnectTo = "{{ include "common.names.fullname" . }}-pcrf-sctp"; TcTimer = 60; TwTimer = 30; No_TLS; };
diff --git a/charts/open5gs/resources/config/hss.yaml b/charts/open5gs/resources/config/hss.yaml
@@ -1,11 +1,8 @@
-{{- if eq .Values.hss.configType "configYaml" }}
-{{ toYaml .Values.hss.configYaml }}
-{{- else if eq .Values.hss.configType "config" }}
+db_uri:  {{ default (printf "mongodb://%s-mongodb/open5gs" .Release.Name)  .Values.db_uri  }}
+
 logger:
   level: {{ .Values.hss.config.logLevel }}
 parameter: {}
 
 hss:
   freeDiameter: hss.conf
-
-{{- end }}
diff --git a/charts/open5gs/resources/config/mme.yaml b/charts/open5gs/resources/config/mme.yaml
@@ -1,13 +1,10 @@
-{{- if eq .Values.mme.configType "configYaml" }}
-{{ toYaml .Values.mme.configYaml }}
-{{- else if eq .Values.mme.configType "config" }}
 logger:
   level: {{ .Values.mme.config.logLevel }}
 parameter: {}
 
 sgwc:
   gtpc:
-    - name: "{{ include "common.names.fullname" . }}-sgwc"
+    - name: "{{ include "common.names.fullname" . }}-sgwc-udp"
 
 smf:
   gtpc:
@@ -36,5 +33,3 @@ mme:
       ciphering_order : [ EEA0, EEA1, EEA2 ]
   network_name:
       full: Gradiant4G
-
-{{- end }}
diff --git a/charts/open5gs/resources/config/nrf.yaml b/charts/open5gs/resources/config/nrf.yaml
@@ -1,6 +1,3 @@
-{{- if eq .Values.nrf.configType "configYaml" }}
-{{ toYaml .Values.nrf.configYaml }}
-{{- else if eq .Values.nrf.configType "config" }}
 logger:
   level: {{ .Values.nrf.config.logLevel }}
 parameter: {}
@@ -9,5 +6,3 @@ nrf:
   sbi:
     dev: eth0
     port: 7777
-
-{{- end }}
diff --git a/charts/open5gs/resources/config/nssf.yaml b/charts/open5gs/resources/config/nssf.yaml
@@ -1,6 +1,3 @@
-{{- if eq .Values.nssf.configType "configYaml" }}
-{{ toYaml .Values.nssf.configYaml }}
-{{- else if eq .Values.nssf.configType "config" }}
 logger:
   level: {{ .Values.nssf.config.logLevel }}
 parameter: {}
@@ -20,4 +17,3 @@ nssf:
       s_nssai:
         sd: {{ .Values.nssf.config.nsi.sd | quote }}
         sst: {{ .Values.nssf.config.nsi.sst | quote }}
-{{- end }}
diff --git a/charts/open5gs/resources/config/pcf.yaml b/charts/open5gs/resources/config/pcf.yaml
@@ -1,6 +1,5 @@
-{{- if eq .Values.pcf.configType "configYaml" }}
-{{ toYaml .Values.pcf.configYaml }}
-{{- else if eq .Values.pcf.configType "config" }}
+db_uri:  {{ default (printf "mongodb://%s-mongodb/open5gs" .Release.Name)  .Values.db_uri  }}
+
 logger:
   level: {{ .Values.pcf.config.logLevel }}
 parameter: {}
@@ -15,4 +14,3 @@ pcf:
     dev: eth0
     port: 7777
 
-{{- end }}
diff --git a/charts/open5gs/resources/config/pcrf.yaml b/charts/open5gs/resources/config/pcrf.yaml
@@ -1,11 +1,9 @@
-{{- if eq .Values.pcrf.configType "configYaml" }}
-{{ toYaml .Values.pcrf.configYaml }}
-{{- else if eq .Values.pcrf.configType "config" }}
+db_uri:  {{ default (printf "mongodb://%s-mongodb/open5gs" .Release.Name)  .Values.db_uri  }}
+
 logger:
   level: {{ .Values.pcrf.config.logLevel }}
 parameter: {}
 
 pcrf:
   freeDiameter: pcrf.conf
-
-{{- end }}
+
diff --git a/charts/open5gs/resources/config/sgwc.yaml b/charts/open5gs/resources/config/sgwc.yaml
@@ -1,6 +1,3 @@
-{{- if eq .Values.sgwc.configType "configYaml" }}
-{{ toYaml .Values.sgwc.configYaml }}
-{{- else if eq .Values.sgwc.configType "config" }}
 logger:
   level: {{ .Values.sgwc.config.logLevel }}
 
@@ -15,10 +12,5 @@ sgwc:
 
 sgwu:
   pfcp:
-    - name: "{{ include "common.names.fullname" . }}-sgwu"
-
-{{- end }}
-
-
-
+    - name: "{{ include "common.names.fullname" . }}-sgwu-udp"
 
diff --git a/charts/open5gs/resources/config/sgwu.yaml b/charts/open5gs/resources/config/sgwu.yaml
@@ -1,6 +1,3 @@
-{{- if eq .Values.sgwu.configType "configYaml" }}
-{{ toYaml .Values.sgwu.configYaml }}
-{{- else if eq .Values.sgwu.configType "config" }}
 logger:
   level: {{ .Values.sgwu.config.logLevel }}
 
@@ -10,18 +7,10 @@ parameter:
 sgwu:
   gtpu:
     dev: eth0
-    {{- if .Values.sgwu.externalService.enabled }}
-    {{- if .Values.sgwu.externalService.advertise }}
-    advertise: {{ .Values.sgwu.externalService.advertise }}
-    {{- else }}
-    advertise: {{ include "common.names.fullname" . }}-sgwu-ext.{{ .Release.Namespace }}.{{ .Values.sgwu.externalService.advertiseDomain }}
-    {{- end }}
-    {{- end }}
+    advertise: {{ default (printf "%s-%s-udp" (include "common.names.fullname" .) .component) .Values.upf.advertise }}
   pfcp:
     dev: eth0
 
 sgwc:
   pfcp:
-    - name: "{{ include "common.names.fullname" . }}-sgwc"
-
-{{- end }}
+    - name: "{{ include "common.names.fullname" . }}-sgwc-udp"
diff --git a/charts/open5gs/resources/config/smf.yaml b/charts/open5gs/resources/config/smf.yaml
@@ -1,22 +1,23 @@
-{{- if eq .Values.smf.configType "configYaml" }}
-{{ toYaml .Values.smf.configYaml }}
-{{- else if eq .Values.smf.configType "config" }}
 logger:
   level: {{ .Values.smf.config.logLevel }}
 parameter: {}
 
+{{- if .Values.nrf.enabled }}
 nrf:
   sbi:
     - name: "{{ include "common.names.fullname" . }}-nrf"
       port: 7777
+{{- end }}
 
 upf:
     pfcp:
-      - name: "{{ include "common.names.fullname" . }}-upf"
-        apn: internet
+      - name: "{{ include "common.names.fullname" . }}-upf-udp"
+        dnn: internet
 
 smf:
+  {{- if .Values.pcrf.enabled }}
   freeDiameter: smf.conf
+  {{- end }}
   sbi:
     dev: eth0
     port: 7777
@@ -34,6 +35,3 @@ smf:
     - 8.8.4.4
   mtu: 1400
 
-{{- end }}
-
-
diff --git a/charts/open5gs/resources/config/udm.yaml b/charts/open5gs/resources/config/udm.yaml
@@ -1,6 +1,3 @@
-{{- if eq .Values.udm.configType "configYaml" }}
-{{ toYaml .Values.udm.configYaml }}
-{{- else if eq .Values.udm.configType "config" }}
 logger:
   level: {{ .Values.udm.config.logLevel }}
 parameter: {}
@@ -14,5 +11,3 @@ udm:
   sbi:
     dev: eth0
     port: 7777
-
-{{- end }}
diff --git a/charts/open5gs/resources/config/udr.yaml b/charts/open5gs/resources/config/udr.yaml
@@ -1,6 +1,5 @@
-{{- if eq .Values.udr.configType "configYaml" }}
-{{ toYaml .Values.udr.configYaml }}
-{{- else if eq .Values.udr.configType "config" }}
+db_uri:  {{ default (printf "mongodb://%s-mongodb/open5gs" .Release.Name)  .Values.db_uri  }}
+
 logger:
   level: {{ .Values.udr.config.logLevel }}
 parameter: {}
@@ -14,5 +13,3 @@ udr:
   sbi:
     dev: eth0
     port: 7777
-
-{{- end }}
diff --git a/charts/open5gs/resources/config/upf.yaml b/charts/open5gs/resources/config/upf.yaml
@@ -1,29 +1,18 @@
-{{- if eq .Values.upf.configType "configYaml" }}
-{{ toYaml .Values.upf.configYaml }}
-{{- else if eq .Values.upf.configType "config" }}
 logger:
   level: {{ .Values.upf.config.logLevel }}
 parameter: {}
 
 smf:
-    pfcp:
-      - name: "{{ include "common.names.fullname" . }}-smf"
+    # pfcp:
+    #   - name: "{{ include "common.names.fullname" . }}-smf"
+    #     dnn: internet
 
 upf:
     pfcp:
       dev: eth0
     gtpu:
-      dev: {{ .Values.upf.dev }}
-      {{- if .Values.upf.externalService.enabled }}
-      {{- if .Values.upf.externalService.advertise }}
-      advertise: {{ .Values.upf.externalService.advertise }}
-      {{- else }}
-      advertise: {{ include "common.names.fullname" . }}-upf-ext.{{ .Release.Namespace }}.{{ .Values.upf.externalService.advertiseDomain }}
-      {{- end }}
-      {{- end }}
+      dev: {{ .Values.upf.config.dev }}
+      # advertise: {{ default (printf "%s-%s-udp" (include "common.names.fullname" .) .component) .Values.upf.advertise }}
     subnet:
       - addr: {{ .Values.upf.config.pdn.addr }}
 
-{{- end }}
-
-
diff --git a/charts/open5gs/resources/populate.sh b/charts/open5gs/resources/populate.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+{{- range .Values.jobCommands }}
+{{ . }}
+{{- end }}