Setting network name to Aether
Also config knob which tells if config is coming from configPod or helm chart
Change-Id: Ib5178172b844e7c46d9a5ce7492307932879dde3
diff --git a/omec/5g-control-plane/Chart.yaml b/omec/5g-control-plane/Chart.yaml
index e3431a0..9e94cd7 100644
--- a/omec/5g-control-plane/Chart.yaml
+++ b/omec/5g-control-plane/Chart.yaml
@@ -8,7 +8,7 @@
name: 5g-control-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.2.14
+version: 0.2.15
dependencies:
- name: mongodb
diff --git a/omec/5g-control-plane/templates/deployment-amf.yaml b/omec/5g-control-plane/templates/deployment-amf.yaml
index cfd8137..05aa29c 100644
--- a/omec/5g-control-plane/templates/deployment-amf.yaml
+++ b/omec/5g-control-plane/templates/deployment-amf.yaml
@@ -53,10 +53,22 @@
tty: true
command: ["/free5gc/script/amf-run.sh"]
env:
+ - name: GRPC_GO_LOG_VERBOSITY_LEVEL
+ value: {{ .Values.config.grpc.golog_verbosity | quote }}
+ - name: GRPC_GO_LOG_SEVERITY_LEVEL
+ value: {{ .Values.config.grpc.severity | quote }}
+ - name: GRPC_TRACE
+ value: {{ .Values.config.grpc.trace | quote }}
+ - name: GRPC_VERBOSITY
+ value: {{ .Values.config.grpc.verbosity | quote }}
- name: POD_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
+ {{- if .Values.config.managedByConfigPod.enabled }}
+ - name: MANAGED_BY_CONFIG_POD
+ value: "true"
+ {{- end }}
{{- if .Values.resources.enabled }}
resources:
{{ toYaml .Values.resources.amf | indent 10 }}
diff --git a/omec/5g-control-plane/templates/deployment-ausf.yaml b/omec/5g-control-plane/templates/deployment-ausf.yaml
index c73f40d..295e198 100644
--- a/omec/5g-control-plane/templates/deployment-ausf.yaml
+++ b/omec/5g-control-plane/templates/deployment-ausf.yaml
@@ -55,10 +55,22 @@
tty: true
command: ["/free5gc/script/ausf-run.sh"]
env:
+ - name: GRPC_GO_LOG_VERBOSITY_LEVEL
+ value: {{ .Values.config.grpc.golog_verbosity | quote }}
+ - name: GRPC_GO_LOG_SEVERITY_LEVEL
+ value: {{ .Values.config.grpc.severity | quote }}
+ - name: GRPC_TRACE
+ value: {{ .Values.config.grpc.trace | quote }}
+ - name: GRPC_VERBOSITY
+ value: {{ .Values.config.grpc.verbosity | quote }}
- name: POD_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
+ {{- if .Values.config.managedByConfigPod.enabled }}
+ - name: MANAGED_BY_CONFIG_POD
+ value: "true"
+ {{- end }}
{{- if .Values.resources.enabled }}
resources:
{{ toYaml .Values.resources.ausf | indent 10 }}
diff --git a/omec/5g-control-plane/templates/deployment-nrf.yaml b/omec/5g-control-plane/templates/deployment-nrf.yaml
index af22da2..80075f8 100644
--- a/omec/5g-control-plane/templates/deployment-nrf.yaml
+++ b/omec/5g-control-plane/templates/deployment-nrf.yaml
@@ -51,10 +51,22 @@
tty: true
command: ["/free5gc/script/nrf-run.sh"]
env:
+ - name: GRPC_GO_LOG_VERBOSITY_LEVEL
+ value: {{ .Values.config.grpc.golog_verbosity | quote }}
+ - name: GRPC_GO_LOG_SEVERITY_LEVEL
+ value: {{ .Values.config.grpc.severity | quote }}
+ - name: GRPC_TRACE
+ value: {{ .Values.config.grpc.trace | quote }}
+ - name: GRPC_VERBOSITY
+ value: {{ .Values.config.grpc.verbosity | quote }}
- name: POD_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
+ {{- if .Values.config.managedByConfigPod.enabled }}
+ - name: MANAGED_BY_CONFIG_POD
+ value: "true"
+ {{- end }}
{{- if .Values.resources.enabled }}
resources:
{{ toYaml .Values.resources.nrf | indent 10 }}
diff --git a/omec/5g-control-plane/templates/deployment-nssf.yaml b/omec/5g-control-plane/templates/deployment-nssf.yaml
index b75cf8e..2cce254 100644
--- a/omec/5g-control-plane/templates/deployment-nssf.yaml
+++ b/omec/5g-control-plane/templates/deployment-nssf.yaml
@@ -65,6 +65,10 @@
valueFrom:
fieldRef:
fieldPath: status.podIP
+ {{- if .Values.config.managedByConfigPod.enabled }}
+ - name: MANAGED_BY_CONFIG_POD
+ value: "true"
+ {{- end }}
{{- if .Values.resources.enabled }}
resources:
{{ toYaml .Values.resources.nssf | indent 10 }}
diff --git a/omec/5g-control-plane/templates/deployment-pcf.yaml b/omec/5g-control-plane/templates/deployment-pcf.yaml
index 1a2e470..6829ffe 100644
--- a/omec/5g-control-plane/templates/deployment-pcf.yaml
+++ b/omec/5g-control-plane/templates/deployment-pcf.yaml
@@ -53,10 +53,22 @@
tty: true
command: ["/free5gc/script/pcf-run.sh"]
env:
+ - name: GRPC_GO_LOG_VERBOSITY_LEVEL
+ value: {{ .Values.config.grpc.golog_verbosity | quote }}
+ - name: GRPC_GO_LOG_SEVERITY_LEVEL
+ value: {{ .Values.config.grpc.severity | quote }}
+ - name: GRPC_TRACE
+ value: {{ .Values.config.grpc.trace | quote }}
+ - name: GRPC_VERBOSITY
+ value: {{ .Values.config.grpc.verbosity | quote }}
- name: POD_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
+ {{- if .Values.config.managedByConfigPod.enabled }}
+ - name: MANAGED_BY_CONFIG_POD
+ value: "true"
+ {{- end }}
{{- if .Values.resources.enabled }}
resources:
{{ toYaml .Values.resources.pcf | indent 10 }}
diff --git a/omec/5g-control-plane/templates/deployment-smf.yaml b/omec/5g-control-plane/templates/deployment-smf.yaml
index 0ee4676..296bc50 100644
--- a/omec/5g-control-plane/templates/deployment-smf.yaml
+++ b/omec/5g-control-plane/templates/deployment-smf.yaml
@@ -55,10 +55,22 @@
tty: true
command: ["/free5gc/script/smf-run.sh"]
env:
+ - name: GRPC_GO_LOG_VERBOSITY_LEVEL
+ value: {{ .Values.config.grpc.golog_verbosity | quote }}
+ - name: GRPC_GO_LOG_SEVERITY_LEVEL
+ value: {{ .Values.config.grpc.severity | quote }}
+ - name: GRPC_TRACE
+ value: {{ .Values.config.grpc.trace | quote }}
+ - name: GRPC_VERBOSITY
+ value: {{ .Values.config.grpc.verbosity | quote }}
- name: POD_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
+ {{- if .Values.config.managedByConfigPod.enabled }}
+ - name: MANAGED_BY_CONFIG_POD
+ value: "true"
+ {{- end }}
{{- if .Values.resources.enabled }}
resources:
{{ toYaml .Values.resources.smf | indent 10 }}
diff --git a/omec/5g-control-plane/templates/deployment-udm.yaml b/omec/5g-control-plane/templates/deployment-udm.yaml
index e0adc86..2714ef0 100644
--- a/omec/5g-control-plane/templates/deployment-udm.yaml
+++ b/omec/5g-control-plane/templates/deployment-udm.yaml
@@ -57,10 +57,22 @@
tty: true
command: ["/free5gc/script/udm-run.sh"]
env:
+ - name: GRPC_GO_LOG_VERBOSITY_LEVEL
+ value: {{ .Values.config.grpc.golog_verbosity | quote }}
+ - name: GRPC_GO_LOG_SEVERITY_LEVEL
+ value: {{ .Values.config.grpc.severity | quote }}
+ - name: GRPC_TRACE
+ value: {{ .Values.config.grpc.trace | quote }}
+ - name: GRPC_VERBOSITY
+ value: {{ .Values.config.grpc.verbosity | quote }}
- name: POD_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
+ {{- if .Values.config.managedByConfigPod.enabled }}
+ - name: MANAGED_BY_CONFIG_POD
+ value: "true"
+ {{- end }}
{{- if .Values.resources.enabled }}
resources:
{{ toYaml .Values.resources.udm | indent 10 }}
diff --git a/omec/5g-control-plane/templates/deployment-udr.yaml b/omec/5g-control-plane/templates/deployment-udr.yaml
index b6b877a..abe6e64 100644
--- a/omec/5g-control-plane/templates/deployment-udr.yaml
+++ b/omec/5g-control-plane/templates/deployment-udr.yaml
@@ -53,10 +53,22 @@
tty: true
command: ["/free5gc/script/udr-run.sh"]
env:
+ - name: GRPC_GO_LOG_VERBOSITY_LEVEL
+ value: {{ .Values.config.grpc.golog_verbosity | quote }}
+ - name: GRPC_GO_LOG_SEVERITY_LEVEL
+ value: {{ .Values.config.grpc.severity | quote }}
+ - name: GRPC_TRACE
+ value: {{ .Values.config.grpc.trace | quote }}
+ - name: GRPC_VERBOSITY
+ value: {{ .Values.config.grpc.verbosity | quote }}
- name: POD_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
+ {{- if .Values.config.managedByConfigPod.enabled }}
+ - name: MANAGED_BY_CONFIG_POD
+ value: "true"
+ {{- end }}
{{- if .Values.resources.enabled }}
resources:
{{ toYaml .Values.resources.udr | indent 10 }}
diff --git a/omec/5g-control-plane/values.yaml b/omec/5g-control-plane/values.yaml
index 9a2ebd8..2ade82b 100644
--- a/omec/5g-control-plane/values.yaml
+++ b/omec/5g-control-plane/values.yaml
@@ -100,6 +100,9 @@
#replicaCount: 3
config:
+ managedByConfigPod: # config comes from helm by default, if enabled true, then discard
+ enabled: false # helm chart config and use the config from config Pod
+ syncUrl: "" # Get the config from adapater in case control plane is down
useExistingConfigMap: false
coreDump:
enabled: false
@@ -433,8 +436,8 @@
cipheringOrder:
- NEA0
networkName:
- full: free5GC
- short: free
+ full: Aether5G
+ short: Aether
networkFeatureSupport5GS: # 5gs Network Feature Support IE, refer to TS 24.501
enable: true # append this IE in Registration accept or not
imsVoPS: 0 # IMS voice over PS session indicator (uinteger, range: 0~1)