Merge pull request #20 from Gradiant/feature-open5gs

Feature open5gs
Gradiant · Oct 8, 2021 · 75d76c8 · 75d76c8
2 parents 5db90ea + 258ed65
commit 75d76c8
Show file tree

Hide file tree

Showing 62 changed files with 353 additions and 17 deletions.
diff --git a/charts/open5gs/Chart.yaml b/charts/open5gs/Chart.yaml
@@ -10,7 +10,7 @@ maintainers:
 - email: [email protected]
   name: cgiraldo
 name: open5gs
-version: 0.3.3
+version: 0.3.4
 keywords:
   - epc
   - ngc

diff --git a/charts/open5gs/resources/config/bsf.yaml b/charts/open5gs/resources/config/bsf.yaml
@@ -0,0 +1,28 @@
+logger:
+{{ toYaml .Values.amf.logger | indent 2 }}
+
+{{- if .Values.amf.parameter }}
+parameter:
+{{ toYaml .Values.amf.parameter | indent 2 }}
+{{- end }}
+
+{{- if .Values.amf.max }}
+max:
+{{ toYaml .Values.amf.max | indent 2 }}
+{{- end }}
+
+{{- if .Values.amf.pool }}
+pool:
+{{ toYaml .Values.amf.pool | indent 2 }}
+{{- end }}
+
+
+bsf:
+  sbi:
+    dev: eth0
+    port: 7777
+
+nrf:
+  sbi:
+    - name: "{{ include "common.names.fullname" . }}-nrf"
+      port: 7777
diff --git a/charts/open5gs/resources/config/hss.yaml b/charts/open5gs/resources/config/hss.yaml
@@ -5,4 +5,6 @@ parameter:
 {{ toYaml .Values.hss.parameter | indent 2 }}
 {{- end }}
 hss:
+  {{- if .Values.mme.enabled }}
   freeDiameter: hss.conf
+  {{- end }}
diff --git a/charts/open5gs/resources/config/mme.yaml b/charts/open5gs/resources/config/mme.yaml
@@ -37,6 +37,8 @@ sgwc:
   gtpc:
     - name: "{{ include "common.names.fullname" . }}-sgwc"
 
+{{- if .Values.smf.enabled }}
 smf:
   gtpc:
     - name: "{{ include "common.names.fullname" . }}-smf"
+{{- end }}
diff --git a/charts/open5gs/resources/config/nssf.yaml b/charts/open5gs/resources/config/nssf.yaml
@@ -12,12 +12,12 @@ nssf:
     dev: eth0
     port: 7777
   nsi:
-    - name: "{{ include "common.names.fullname" . }}-nrf"
+    {{- range .Values.nssf.nsi }}  
+    - name: "{{ include "common.names.fullname" $ }}-nrf"
       port: 7777
       s_nssai:
-        sst: 1
-
-
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
 nrf:
   sbi:
     - name: "{{ include "common.names.fullname" . }}-nrf"

diff --git a/charts/open5gs/resources/config/pcrf.yaml b/charts/open5gs/resources/config/pcrf.yaml
@@ -6,4 +6,6 @@ parameter:
 {{- end }}
 
 pcrf:
+  {{- if .Values.smf.enabled }}
   freeDiameter: pcrf.conf
+  {{- end }}
diff --git a/charts/open5gs/resources/config/smf.yaml b/charts/open5gs/resources/config/smf.yaml
@@ -8,7 +8,9 @@ parameter:
 {{- end }}
 
 smf:
+  {{- if .Values.pcrf.enabled }}
   freeDiameter: smf.conf
+  {{- end }}
   sbi:
     dev: eth0
     port: 7777

diff --git a/charts/open5gs/templates/amf-configmap.yaml b/charts/open5gs/templates/amf-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.amf.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,3 +8,4 @@ metadata:
 data:
   amf.yaml: |
 {{ tpl (.Files.Get "resources/config/amf.yaml") . | indent 4 }}
+{{- end }}
diff --git a/charts/open5gs/templates/amf-statefulset.yaml b/charts/open5gs/templates/amf-statefulset.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.amf.enabled -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -48,3 +49,4 @@ spec:
       - name: amf-config
         configMap:
           name: {{ include "common.names.fullname" . }}-amf
+{{- end }}
diff --git a/charts/open5gs/templates/amf-svc.yaml b/charts/open5gs/templates/amf-svc.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.amf.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -16,3 +17,32 @@ spec:
   publishNotReadyAddresses: true
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     app.kubernetes.io/component: amf
+---
+{{- if .Values.amf.externalService.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.names.fullname" . }}-amf-ext
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: amf
+spec:
+  type: {{ .Values.amf.externalService.type }}
+  sessionAffinity: {{ default "None" .Values.amf.externalService.sessionAffinity }}
+  {{- if and .Values.amf.externalService.clusterIP (eq .Values.amf.externalService.type "ClusterIP") }}
+  clusterIP: {{ .Values.amf.externalService.clusterIP }}
+  {{- end }}
+  {{- if and .Values.amf.externalService.loadBalancerIP (eq .Values.amf.externalService.type "LoadBalancer") }}
+  loadBalancerIP: {{ .Values.amf.externalService.loadBalancerIP }}
+  {{- end }}
+  {{- if and (eq .Values.amf.externalService.type "LoadBalancer") .Values.amf.externalService.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.amf.externalService.externalTrafficPolicy }}
+  {{- end }}
+  ports:
+  - name: ngap 
+    port: 38412
+    protocol: SCTP
+  publishNotReadyAddresses: true
+  selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
+    app.kubernetes.io/component: amf
+{{- end }}
+{{- end }}
diff --git a/charts/open5gs/templates/ausf-configmap.yaml b/charts/open5gs/templates/ausf-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.ausf.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,3 +8,4 @@ metadata:
 data:
   ausf.yaml: |
 {{ tpl (.Files.Get "resources/config/ausf.yaml") . | indent 4 }}
+{{- end }}
diff --git a/charts/open5gs/templates/ausf-statefulset.yaml b/charts/open5gs/templates/ausf-statefulset.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.ausf.enabled -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -45,3 +46,4 @@ spec:
       - name: ausf-config
         configMap:
           name: {{ include "common.names.fullname" . }}-ausf
+{{- end }}
diff --git a/charts/open5gs/templates/ausf-svc.yaml b/charts/open5gs/templates/ausf-svc.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.ausf.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -13,3 +14,4 @@ spec:
   publishNotReadyAddresses: true
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     app.kubernetes.io/component: ausf
+{{- end }}
diff --git a/charts/open5gs/templates/bsf-configmap.yaml b/charts/open5gs/templates/bsf-configmap.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.bsf.enabled -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.names.fullname" . }}-bsf
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: bsf
+data:
+  bsf.yaml: |
+{{ tpl (.Files.Get "resources/config/bsf.yaml") . | indent 4 }}
+{{- end }}
diff --git a/charts/open5gs/templates/bsf-statefulset.yaml b/charts/open5gs/templates/bsf-statefulset.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.bsf.enabled -}}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ include "common.names.fullname" . }}-bsf
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: bsf
+spec:
+  replicas: 1
+  serviceName: {{ include "common.names.fullname" . }}-bsf
+  selector:
+    matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
+      app.kubernetes.io/component: bsf
+  template:
+    metadata:
+      labels: {{- include "common.labels.standard" . | nindent 8 }}
+        app.kubernetes.io/component: bsf
+    spec:
+{{ include "open5gs.imagePullSecrets" . | indent 6 }}
+      initContainers:
+      - name: wait-nrf
+        image: busybox:1.28
+        command: ['sh', '-c', 'set -x; sleep 20;']
+      containers:
+      - name: bsf
+        image: {{ template "open5gs.image" . }}
+        imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
+        command: ["open5gs-bsfd"]
+        ports:
+        - name: sbi
+          containerPort: 7777
+          protocol: TCP
+        resources:
+{{ toYaml .Values.bsf.resources | indent 10 }}
+        volumeMounts:
+        - name: bsf-config
+          mountPath: /opt/open5gs/etc/open5gs/bsf.yaml
+          subPath: "bsf.yaml"
+      volumes:
+      - name: bsf-config
+        configMap:
+          name: {{ include "common.names.fullname" . }}-bsf
+{{- end }}
diff --git a/charts/open5gs/templates/bsf-svc.yaml b/charts/open5gs/templates/bsf-svc.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.bsf.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.names.fullname" . }}-bsf
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: bsf
+spec:
+  ports:
+  - name: sbi
+    port: 7777
+    protocol: TCP
+
+  publishNotReadyAddresses: true
+  selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
+    app.kubernetes.io/component: bsf
+{{- end }}
diff --git a/charts/open5gs/templates/hss-configmap.yaml b/charts/open5gs/templates/hss-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.hss.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,3 +8,4 @@ metadata:
 data:
   hss.yaml: |
 {{ tpl (.Files.Get "resources/config/hss.yaml") . | indent 4 }}
+{{- end }}
diff --git a/charts/open5gs/templates/hss-diameter-configmap.yaml b/charts/open5gs/templates/hss-diameter-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.hss.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -6,4 +7,5 @@ metadata:
     app.kubernetes.io/component: hss
 data:
   diameter-hss.conf: |-
-{{ tpl (.Files.Get "resources/config/diameter-hss.conf") . | indent 4 }}
+{{ tpl (.Files.Get "resources/config/diameter-hss.conf") . | indent 4 }}
+{{- end }}
diff --git a/charts/open5gs/templates/hss-statefulset.yaml b/charts/open5gs/templates/hss-statefulset.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.hss.enabled -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -82,3 +83,4 @@ spec:
       #- name: init-certs
       #  configMap:
       #    name: {{ include "common.names.fullname" . }}-init-certs
+{{- end }}
diff --git a/charts/open5gs/templates/hss-svc.yaml b/charts/open5gs/templates/hss-svc.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.hss.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,3 +16,4 @@ spec:
   publishNotReadyAddresses: true
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     app.kubernetes.io/component: hss
+{{- end }}
diff --git a/charts/open5gs/templates/init-certs-configmap.yaml b/charts/open5gs/templates/init-certs-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.hss.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -6,3 +7,4 @@ metadata:
 data:
   init-certs.sh: |
 {{ tpl (.Files.Get "resources/config/init-certs.sh") . | indent 4 }}
+{{- end }}
diff --git a/charts/open5gs/templates/mme-configmap.yaml b/charts/open5gs/templates/mme-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.mme.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,3 +8,4 @@ metadata:
 data:
   mme.yaml: |
 {{ tpl (.Files.Get "resources/config/mme.yaml") . | indent 4 }}
+{{- end }}
diff --git a/charts/open5gs/templates/mme-diameter-configmap.yaml b/charts/open5gs/templates/mme-diameter-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.mme.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -6,4 +7,5 @@ metadata:
     app.kubernetes.io/component: mme
 data:
   diameter-mme.conf: |-
-{{ tpl (.Files.Get "resources/config/diameter-mme.conf") . | indent 4 }}
+{{ tpl (.Files.Get "resources/config/diameter-mme.conf") . | indent 4 }}
+{{- end }}
diff --git a/charts/open5gs/templates/mme-statefulset.yaml b/charts/open5gs/templates/mme-statefulset.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.mme.enabled -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -51,3 +52,4 @@ spec:
       - name: mme-diameter-config
         configMap:
           name: {{ include "common.names.fullname" . }}-mme-diameter
+{{- end }}
diff --git a/charts/open5gs/templates/mme-svc.yaml b/charts/open5gs/templates/mme-svc.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.mme.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -46,4 +47,5 @@ spec:
   publishNotReadyAddresses: true
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     app.kubernetes.io/component: mme
+{{- end }}
 {{- end }}
diff --git a/charts/open5gs/templates/nrf-configmap.yaml b/charts/open5gs/templates/nrf-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.nrf.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,3 +8,4 @@ metadata:
 data:
   nrf.yaml: |
 {{ tpl (.Files.Get "resources/config/nrf.yaml") . | indent 4 }}
+{{- end }}
diff --git a/charts/open5gs/templates/nrf-statefulset.yaml b/charts/open5gs/templates/nrf-statefulset.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.nrf.enabled -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -45,4 +46,4 @@ spec:
       - name: nrf-config
         configMap:
           name: {{ include "common.names.fullname" . }}-nrf
-
+{{- end }}