Skip to content

Commit 6e7680d

Browse files
mbilal92mbilal92
authored
Merge pull request #28 from gab-arrobo/update-charts
Update values files based on changes to SD-Core Helm Charts
2 parents c1fc8d6 + 0b27263 commit 6e7680d

File tree

3 files changed

+36
-21
lines changed

3 files changed

+36
-21
lines changed

‎roles/core/templates/radio-5g-values.yaml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ omec-control-plane:
3030
enabled: false
3131
architecture: replicaset
3232
replicaCount: 2
33+
3334
resources:
3435
enabled: false
3536

@@ -38,10 +39,8 @@ omec-control-plane:
3839
# # network function
3940
# AMF:
4041
# debugLevel: trace
41-
# ReportCaller: false
4242
# SMF:
4343
# debugLevel: trace
44-
# ReportCaller: false
4544

4645
mongodb:
4746
name: free5gc
@@ -70,30 +69,36 @@ omec-control-plane:
7069
# directly provided through Helm Charts
7170
amf:
7271
cfgFiles:
73-
amfcfg.conf:
72+
amfcfg.yaml:
7473
configuration:
7574
enableDBStore: true # Store AMF subscribers in the datastore
7675

7776
# SMF config override. Refer to Helm Charts values for more options
7877
smf:
7978
cfgFiles:
80-
smfcfg.conf:
79+
smfcfg.yaml:
8180
configuration:
8281
enableDBStore: true # Store SMF subscribers in the datastore
8382

8483
#pcf:
8584
# cfgFiles:
86-
# pcfcfg.conf:
85+
# pcfcfg.yaml:
8786
# configuration:
8887

8988
nrf:
9089
cfgFiles:
91-
nrfcfg.conf:
90+
nrfcfg.yaml:
9291
configuration:
9392
mongoDBStreamEnable: false # enable/disable MongoDB stream in NRF
9493
nfProfileExpiryEnable: true # If enabled, remove NF profile if no keepalive received
9594
nfKeepAliveTime: 60 # default timeout for NF profiles
9695

96+
webui:
97+
cfgFiles:
98+
webuicfg.yaml:
99+
configuration:
100+
managedByConfigPod:
101+
enabled: {{ not core.standalone }}
97102

98103
# Override values for omec-sub-provision (subscriber) Helm Chart
99104
# https://github.com/omec-project/sdcore-helm-charts/blob/main/omec-sub-provision/values.yaml
@@ -225,7 +230,7 @@ omec-user-plane:
225230
cniPlugin: macvlan # Can be any other plugin. Dictates how IP address are assigned
226231
iface: {{ core.data_iface }}
227232
gateway: 192.168.250.1
228-
ip: {{ core.upf.default_upf.ip.core }}
233+
ip: {{ core.upf.default_upf.ip.core }}
229234
cfgFiles:
230235
upf.jsonc:
231236
mode: af_packet # This mode implies no DPDK

‎roles/core/templates/sdcore-5g-sriov-values.yaml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ omec-control-plane:
3030
enabled: false
3131
architecture: replicaset
3232
replicaCount: 2
33+
3334
resources:
3435
enabled: false
3536

@@ -38,10 +39,8 @@ omec-control-plane:
3839
# # network function
3940
# AMF:
4041
# debugLevel: trace
41-
# ReportCaller: false
4242
# SMF:
4343
# debugLevel: trace
44-
# ReportCaller: false
4544

4645
mongodb:
4746
name: free5gc
@@ -70,30 +69,36 @@ omec-control-plane:
7069
# directly provided through Helm Charts
7170
amf:
7271
cfgFiles:
73-
amfcfg.conf:
72+
amfcfg.yaml:
7473
configuration:
7574
enableDBStore: true # Store AMF subscribers in the datastore
7675

7776
# SMF config override. Refer to Helm Charts values for more options
7877
smf:
7978
cfgFiles:
80-
smfcfg.conf:
79+
smfcfg.yaml:
8180
configuration:
8281
enableDBStore: true # Store SMF subscribers in the datastore
8382

8483
#pcf:
8584
# cfgFiles:
86-
# pcfcfg.conf:
85+
# pcfcfg.yaml:
8786
# configuration:
8887

8988
nrf:
9089
cfgFiles:
91-
nrfcfg.conf:
90+
nrfcfg.yaml:
9291
configuration:
9392
mongoDBStreamEnable: false # enable/disable MongoDB stream in NRF
9493
nfProfileExpiryEnable: true # If enabled, remove NF profile if no keepalive received
9594
nfKeepAliveTime: 60 # default timeout for NF profiles
9695

96+
webui:
97+
cfgFiles:
98+
webuicfg.yaml:
99+
configuration:
100+
managedByConfigPod:
101+
enabled: {{ not core.standalone }}
97102

98103
# Override values for omec-sub-provision (subscriber) Helm Chart
99104
# https://github.com/omec-project/sdcore-helm-charts/blob/main/omec-sub-provision/values.yaml
@@ -333,7 +338,7 @@ omec-user-plane:
333338
iface: {{ core.data_iface }}
334339
resourceName: "intel.com/intel_sriov_vfio_core"
335340
gateway: 192.168.250.1
336-
ip: {{ core.upf.default_upf.ip.core }}
341+
ip: {{ core.upf.default_upf.ip.core }}
337342
cfgFiles:
338343
upf.jsonc:
339344
mode: dpdk

‎roles/core/templates/sdcore-5g-values.yaml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ omec-control-plane:
3030
enabled: false
3131
architecture: replicaset
3232
replicaCount: 2
33+
3334
resources:
3435
enabled: false
3536

@@ -38,10 +39,8 @@ omec-control-plane:
3839
# # network function
3940
# AMF:
4041
# debugLevel: trace
41-
# ReportCaller: false
4242
# SMF:
4343
# debugLevel: trace
44-
# ReportCaller: false
4544

4645
mongodb:
4746
name: free5gc
@@ -70,30 +69,36 @@ omec-control-plane:
7069
# directly provided through Helm Charts
7170
amf:
7271
cfgFiles:
73-
amfcfg.conf:
72+
amfcfg.yaml:
7473
configuration:
7574
enableDBStore: true # Store AMF subscribers in the datastore
7675

7776
# SMF config override. Refer to Helm Charts values for more options
7877
smf:
7978
cfgFiles:
80-
smfcfg.conf:
79+
smfcfg.yaml:
8180
configuration:
8281
enableDBStore: true # Store SMF subscribers in the datastore
8382

8483
#pcf:
8584
# cfgFiles:
86-
# pcfcfg.conf:
85+
# pcfcfg.yaml:
8786
# configuration:
8887

8988
nrf:
9089
cfgFiles:
91-
nrfcfg.conf:
90+
nrfcfg.yaml:
9291
configuration:
9392
mongoDBStreamEnable: false # enable/disable MongoDB stream in NRF
9493
nfProfileExpiryEnable: true # If enabled, remove NF profile if no keepalive received
9594
nfKeepAliveTime: 60 # default timeout for NF profiles
9695

96+
webui:
97+
cfgFiles:
98+
webuicfg.yaml:
99+
configuration:
100+
managedByConfigPod:
101+
enabled: {{ not core.standalone }}
97102

98103
# Override values for omec-sub-provision (subscriber) Helm Chart
99104
# https://github.com/omec-project/sdcore-helm-charts/blob/main/omec-sub-provision/values.yaml
@@ -330,7 +335,7 @@ omec-user-plane:
330335
cniPlugin: macvlan # Can be any other plugin. Dictates how IP address are assigned
331336
iface: {{ core.data_iface }}
332337
gateway: 192.168.250.1
333-
ip: {{ core.upf.default_upf.ip.core }}
338+
ip: {{ core.upf.default_upf.ip.core }}
334339
cfgFiles:
335340
upf.jsonc:
336341
mode: af_packet # This mode implies no DPDK

0 commit comments

Comments
 (0)