From 0850c9de98149d2482d91c17809b508ac7d42318 Mon Sep 17 00:00:00 2001 From: Borjis131 Date: Thu, 5 Dec 2024 13:47:15 +0100 Subject: [PATCH] Modify Helm charts, now SMF supports LoadBalancer for PFCP --- README.md | 4 ++-- helm/amf/Chart.yaml | 2 +- helm/ausf/Chart.yaml | 2 +- helm/bsf/Chart.yaml | 2 +- helm/db/Chart.yaml | 2 +- helm/nrf/Chart.yaml | 2 +- helm/nssf/Chart.yaml | 2 +- helm/open5gs/Chart.yaml | 26 +++++++++++++------------- helm/pcf/Chart.yaml | 2 +- helm/smf/Chart.yaml | 2 +- helm/smf/configs/smf.yaml | 3 +++ helm/smf/templates/service-pfcp.yaml | 6 +++++- helm/smf/values.yaml | 7 +++++++ helm/udm/Chart.yaml | 2 +- helm/udr/Chart.yaml | 2 +- helm/upf/Chart.yaml | 2 +- helm/webui/Chart.yaml | 2 +- 17 files changed, 42 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index bf39bd4..2e66614 100644 --- a/README.md +++ b/README.md @@ -134,8 +134,8 @@ docker compose -f compose-files/basic/docker-compose.yaml --env-file=.env down You can download the packaged charts from the repository or you can use the ones built by yourself. -Current `CHART_VERSION` value for the Open5GS chart is 0.3.2, using `OPEN5GS_VERSION` v2.7.2 as default. -The `CHART_VERSION` for individual charts is 0.3.1, using `OPEN5GS_VERSION` v2.7.2 as default. +Current `CHART_VERSION` value for the Open5GS chart is 0.3.3, using `OPEN5GS_VERSION` v2.7.2 as default. +The `CHART_VERSION` for individual charts is 0.3.2, using `OPEN5GS_VERSION` v2.7.2 as default. To download a chart: ```bash diff --git a/helm/amf/Chart.yaml b/helm/amf/Chart.yaml index 6a2ae0a..c2c384e 100644 --- a/helm/amf/Chart.yaml +++ b/helm/amf/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: amf description: Open5GS AMF Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "v2.7.2" diff --git a/helm/ausf/Chart.yaml b/helm/ausf/Chart.yaml index 0707d16..904efa1 100644 --- a/helm/ausf/Chart.yaml +++ b/helm/ausf/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: ausf description: Open5GS AUSF Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "v2.7.2" diff --git a/helm/bsf/Chart.yaml b/helm/bsf/Chart.yaml index 68028f1..9e91316 100644 --- a/helm/bsf/Chart.yaml +++ b/helm/bsf/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: bsf description: Open5GS BSF Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "v2.7.2" diff --git a/helm/db/Chart.yaml b/helm/db/Chart.yaml index 4e3f12c..2a9ec0f 100644 --- a/helm/db/Chart.yaml +++ b/helm/db/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: db description: Open5GS DB Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "6.0.11" diff --git a/helm/nrf/Chart.yaml b/helm/nrf/Chart.yaml index e93b9c6..1b16cf0 100644 --- a/helm/nrf/Chart.yaml +++ b/helm/nrf/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: nrf description: Open5GS NRF Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "v2.7.2" diff --git a/helm/nssf/Chart.yaml b/helm/nssf/Chart.yaml index 8b4fa32..1378767 100644 --- a/helm/nssf/Chart.yaml +++ b/helm/nssf/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: nssf description: Open5GS NSSF Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "v2.7.2" diff --git a/helm/open5gs/Chart.yaml b/helm/open5gs/Chart.yaml index 812b8d2..a3f26d2 100644 --- a/helm/open5gs/Chart.yaml +++ b/helm/open5gs/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: open5gs description: Open5GS deployment Helm chart -version: 0.3.2 +version: 0.3.3 type: application appVersion: "v2.7.2" @@ -11,60 +11,60 @@ icon: https://open5gs.org/assets/img/open5gs-logo.png dependencies: - name: db repository: file://../db - version: 0.3.1 + version: 0.3.2 condition: db.enabled - name: webui repository: file://../webui - version: 0.3.1 + version: 0.3.2 condition: webui.enabled - name: nrf repository: file://../nrf - version: 0.3.1 + version: 0.3.2 condition: nrf.enabled - name: ausf repository: file://../ausf - version: 0.3.1 + version: 0.3.2 condition: ausf.enabled - name: bsf repository: file://../bsf - version: 0.3.1 + version: 0.3.2 condition: bsf.enabled - name: nssf repository: file://../nssf - version: 0.3.1 + version: 0.3.2 condition: nssf.enabled - name: pcf repository: file://../pcf - version: 0.3.1 + version: 0.3.2 condition: pcf.enabled - name: udm repository: file://../udm - version: 0.3.1 + version: 0.3.2 condition: udm.enabled - name: udr repository: file://../udr - version: 0.3.1 + version: 0.3.2 condition: udr.enabled - name: amf repository: file://../amf - version: 0.3.1 + version: 0.3.2 condition: amf.enabled - name: smf repository: file://../smf - version: 0.3.1 + version: 0.3.2 condition: smf.enabled - name: upf repository: file://../upf - version: 0.3.1 + version: 0.3.2 condition: upf.enabled diff --git a/helm/pcf/Chart.yaml b/helm/pcf/Chart.yaml index f1cd3fe..c1808be 100644 --- a/helm/pcf/Chart.yaml +++ b/helm/pcf/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: pcf description: Open5GS PCF Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "v2.7.2" diff --git a/helm/smf/Chart.yaml b/helm/smf/Chart.yaml index e7f5e48..9dba26c 100644 --- a/helm/smf/Chart.yaml +++ b/helm/smf/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: smf description: Open5GS SMF Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "v2.7.2" diff --git a/helm/smf/configs/smf.yaml b/helm/smf/configs/smf.yaml index 973f4c9..b863f55 100644 --- a/helm/smf/configs/smf.yaml +++ b/helm/smf/configs/smf.yaml @@ -19,6 +19,9 @@ smf: pfcp: server: - dev: eth0 + {{- if eq .Values.services.pfcp.type "LoadBalancer" }} + advertise: {{ .Values.services.pfcp.loadBalancerIP }} + {{- end }} client: gtpu: server: diff --git a/helm/smf/templates/service-pfcp.yaml b/helm/smf/templates/service-pfcp.yaml index 8403b93..70718c6 100644 --- a/helm/smf/templates/service-pfcp.yaml +++ b/helm/smf/templates/service-pfcp.yaml @@ -4,6 +4,10 @@ kind: Service metadata: name: {{ include "common.names.fullname" . }}-service-pfcp namespace: {{ include "common.names.namespace" . }} + annotations: + {{- if eq .Values.services.pfcp.provider "MetalLB" }} + metallb.universe.tf/loadBalancerIPs: {{ .Values.services.pfcp.loadBalancerIP }} + {{- end }} spec: selector: nf: smf @@ -12,4 +16,4 @@ spec: port: 8805 targetPort: 8805 protocol: UDP - type: ClusterIP + type: {{ .Values.services.pfcp.type }} diff --git a/helm/smf/values.yaml b/helm/smf/values.yaml index 53aa494..b0f98ee 100644 --- a/helm/smf/values.yaml +++ b/helm/smf/values.yaml @@ -6,6 +6,13 @@ image: tag: "v2.7.2" pullPolicy: IfNotPresent +services: + pfcp: + type: ClusterIP + #type: LoadBalancer + #loadBalancerIP: 10.33.0.3 + #provider: MetalLB + config: {} global: diff --git a/helm/udm/Chart.yaml b/helm/udm/Chart.yaml index bef53f1..df98bb3 100644 --- a/helm/udm/Chart.yaml +++ b/helm/udm/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: udm description: Open5GS UDM Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "v2.7.2" diff --git a/helm/udr/Chart.yaml b/helm/udr/Chart.yaml index 1a99f23..99fd9b5 100644 --- a/helm/udr/Chart.yaml +++ b/helm/udr/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: udr description: Open5GS UDR Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "v2.7.2" diff --git a/helm/upf/Chart.yaml b/helm/upf/Chart.yaml index c17320e..66be86e 100644 --- a/helm/upf/Chart.yaml +++ b/helm/upf/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: upf description: Open5GS UPF Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "v2.7.2" diff --git a/helm/webui/Chart.yaml b/helm/webui/Chart.yaml index ab26f30..28aadfd 100644 --- a/helm/webui/Chart.yaml +++ b/helm/webui/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: webui description: Open5GS WebUI Helm chart -version: 0.3.1 +version: 0.3.2 type: application appVersion: "v2.7.2"