Skip to content

Commit 1b69b46

Browse files
Merge branch 'opennetworkinglab:master' into dpdk-mode
2 parents 7842137 + 4b976cb commit 1b69b46

File tree

5 files changed

+40
-4
lines changed

5 files changed

+40
-4
lines changed

roles/core/defaults/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ core:
55
ran_subnet: "" # set it to empty to get subnet from 'data_iface'
66

77
helm:
8+
local_charts: false
89
chart_ref: aether/sd-core
9-
chart_version: 0.12.6
10+
chart_version: 1.0.4

roles/core/tasks/install.yml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,34 @@
3939
dest: "/tmp/sdcore-5g-values.yaml"
4040
when: inventory_hostname in groups['master_nodes']
4141

42+
- set_fact:
43+
chart_ref_sd_core: "{{ core.helm.chart_ref | regex_replace('^(.*)/.*$', '\\1') }}"
44+
when: inventory_hostname in groups['master_nodes'] and core.helm.local_charts
45+
46+
- debug:
47+
var: "chart_ref_sd_core"
48+
when: inventory_hostname in groups['master_nodes'] and core.helm.local_charts
49+
50+
- name: copy local_charts "{{ chart_ref_sd_core }}" to /tmp/sdcore-helm-charts
51+
synchronize:
52+
src: "{{ chart_ref_sd_core }}/"
53+
dest: /tmp/sdcore-helm-charts
54+
recursive: yes
55+
rsync_opts:
56+
- "--exclude=.git"
57+
when: inventory_hostname in groups['master_nodes'] and core.helm.local_charts
58+
59+
- set_fact:
60+
chart_ref_sd_core: "/tmp/sdcore-helm-charts/{{ core.helm.chart_ref | regex_replace('^.*/(.*)$', '\\1') }}"
61+
when: inventory_hostname in groups['master_nodes'] and core.helm.local_charts
62+
63+
- debug:
64+
var: "chart_ref_sd_core"
65+
when: inventory_hostname in groups['master_nodes'] and core.helm.local_charts
66+
4267
- name: update aether 5gc helm dependencies
4368
shell: |
44-
helm dep up "{{ core.helm.chart_ref }}"
69+
helm dep up {{chart_ref_sd_core}}
4570
when: inventory_hostname in groups['master_nodes'] and core.helm.local_charts
4671

4772
# TODO: add systems check to avoid issues (e.g., mongodb needing avx support)
@@ -53,7 +78,7 @@
5378
name: sd-core
5479
release_namespace: omec
5580
create_namespace: true
56-
chart_ref: "{{ core.helm.chart_ref }}"
81+
chart_ref: "{{ core.helm.chart_ref if core.helm.local_charts == false else chart_ref_sd_core }}"
5782
chart_version: "{{ core.helm.chart_version }}"
5883
values_files:
5984
- /tmp/sdcore-5g-values.yaml

roles/core/tasks/uninstall.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
---
22

3+
- name: delete local charts from /tmp/sdcore-helm-charts/
4+
file:
5+
path: /tmp/sdcore-helm-charts/
6+
state: absent
7+
when: inventory_hostname in groups['master_nodes'] and core.helm.local_charts
8+
ignore_errors: yes
9+
310
- name: remove aether 5gc
411
kubernetes.core.helm:
512
name: sd-core

roles/upf/defaults/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ core:
44

55
upf:
66
helm:
7+
local_charts: false
78
chart_ref: aether/bess-upf
9+
chart_version: 1.0.2
810
values_file: "roles/upf/templates/upf-5g-values.yaml"
911
additional_upfs:
1012
"1":

vars/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ core:
55
ran_subnet: "172.20.0.0/16" # set it to empty to get subnet from 'data_iface'
66

77
helm:
8+
local_charts: false
89
chart_ref: aether/sd-core
9-
chart_version: 0.12.6
10+
chart_version: 1.0.4
1011

1112
upf:
1213
ip_prefix: "192.168.252.0/24"

0 commit comments

Comments
 (0)