Add an ability to use existing configMap for Kustomize support
Change-Id: Id331042cf363d40ec3d8c0dfd0dfce90fe2dc0fb
diff --git a/omec/5g-control-plane/Chart.yaml b/omec/5g-control-plane/Chart.yaml
index 9a93b90..89bd019 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.1
+version: 0.2.2
dependencies:
- name: mongodb
diff --git a/omec/5g-control-plane/templates/configmap-amf.yaml b/omec/5g-control-plane/templates/configmap-amf.yaml
index d731378..675e85b 100644
--- a/omec/5g-control-plane/templates/configmap-amf.yaml
+++ b/omec/5g-control-plane/templates/configmap-amf.yaml
@@ -6,6 +6,7 @@
{{- if .Values.config.amf.deploy }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- $amfcfg := index .Values.config.amf.cfgFiles "amfcfg.conf" }}
{{- $sbi := index $amfcfg.configuration "sbi" }}
@@ -22,6 +23,7 @@
{{- if not (hasKey $amfcfg.configuration "ngapIpList") -}}
{{- $_ := list "POD_IP" | set $amfcfg.configuration "ngapIpList" -}}
{{- end }}
+{{- end }}
---
apiVersion: v1
@@ -33,8 +35,10 @@
data:
amf-run.sh: |
{{ tuple "bin/_amf-run.sh.tpl" . | include "5g-control-plane.template" | indent 4 }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- range $key, $value := .Values.config.amf.cfgFiles }}
{{ $key }}: |-
{{ toYaml $value | indent 4 }}
{{- end }}
{{- end }}
+{{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-ausf.yaml b/omec/5g-control-plane/templates/configmap-ausf.yaml
index efb0581..b1435ed 100644
--- a/omec/5g-control-plane/templates/configmap-ausf.yaml
+++ b/omec/5g-control-plane/templates/configmap-ausf.yaml
@@ -6,6 +6,7 @@
{{- if .Values.config.ausf.deploy }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- $ausfcfg := index .Values.config.ausf.cfgFiles "ausfcfg.conf" }}
{{- $sbi := index $ausfcfg.configuration "sbi" }}
@@ -18,6 +19,7 @@
{{- if not (hasKey $sbi "port") -}}
{{- $_ := .Values.config.ausf.sbi.port | set $sbi "port" -}}
{{- end }}
+{{- end }}
---
apiVersion: v1
@@ -29,8 +31,10 @@
data:
ausf-run.sh: |
{{ tuple "bin/_ausf-run.sh.tpl" . | include "5g-control-plane.template" | indent 4 }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- range $key, $value := .Values.config.ausf.cfgFiles }}
{{ $key }}: |-
{{ toYaml $value | indent 4 }}
{{- end }}
{{- end }}
+{{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-common.yaml b/omec/5g-control-plane/templates/configmap-common.yaml
index 0b13efb..6697b08 100644
--- a/omec/5g-control-plane/templates/configmap-common.yaml
+++ b/omec/5g-control-plane/templates/configmap-common.yaml
@@ -4,6 +4,7 @@
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/}}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- $config := index .Values.config.commonCfgFiles "free5GC.conf" }}
{{- if not (hasKey $config "db_uri") -}}
{{- $_ := printf "%s/%s" .Values.config.mongodb.url .Values.config.mongodb.name | set $config "db_uri" -}}
@@ -21,3 +22,4 @@
{{ $key }}: |-
{{ toYaml $value | indent 4 }}
{{- end }}
+{{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-nrf.yaml b/omec/5g-control-plane/templates/configmap-nrf.yaml
index da24f20..5841f22 100644
--- a/omec/5g-control-plane/templates/configmap-nrf.yaml
+++ b/omec/5g-control-plane/templates/configmap-nrf.yaml
@@ -6,6 +6,7 @@
{{- if .Values.config.nrf.deploy }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- $nrfcfg := index .Values.config.nrf.cfgFiles "nrfcfg.conf" }}
{{- $config := index $nrfcfg "configuration" }}
{{- $sbi := index $config "sbi" }}
@@ -29,6 +30,7 @@
{{- if not (hasKey $sbi "port") -}}
{{- $_ := .Values.config.nrf.sbi.port | set $sbi "port" -}}
{{- end }}
+{{- end }}
---
apiVersion: v1
@@ -40,8 +42,10 @@
data:
nrf-run.sh: |
{{ tuple "bin/_nrf-run.sh.tpl" . | include "5g-control-plane.template" | indent 4 }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- range $key, $value := .Values.config.nrf.cfgFiles }}
{{ $key }}: |-
{{ toYaml $value | indent 4 }}
{{- end }}
{{- end }}
+{{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-nssf.yaml b/omec/5g-control-plane/templates/configmap-nssf.yaml
index 20e3e69..d30b070 100644
--- a/omec/5g-control-plane/templates/configmap-nssf.yaml
+++ b/omec/5g-control-plane/templates/configmap-nssf.yaml
@@ -6,6 +6,7 @@
{{- if .Values.config.nssf.deploy }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- $nssfcfg := index .Values.config.nssf.cfgFiles "nssfcfg.conf" }}
{{- $sbi := index $nssfcfg.configuration "sbi" }}
@@ -18,6 +19,7 @@
{{- if not (hasKey $sbi "port") -}}
{{- $_ := .Values.config.nssf.sbi.port | set $sbi "port" -}}
{{- end }}
+{{- end }}
---
apiVersion: v1
@@ -29,8 +31,10 @@
data:
nssf-run.sh: |
{{ tuple "bin/_nssf-run.sh.tpl" . | include "5g-control-plane.template" | indent 4 }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- range $key, $value := .Values.config.nssf.cfgFiles }}
{{ $key }}: |-
{{ toYaml $value | indent 4 }}
{{- end }}
{{- end }}
+{{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-pcf.yaml b/omec/5g-control-plane/templates/configmap-pcf.yaml
index 9d5147c..b0af3f7 100644
--- a/omec/5g-control-plane/templates/configmap-pcf.yaml
+++ b/omec/5g-control-plane/templates/configmap-pcf.yaml
@@ -6,6 +6,7 @@
{{- if .Values.config.pcf.deploy }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- $pcfcfg := index .Values.config.pcf.cfgFiles "pcfcfg.conf" }}
{{- $sbi := index $pcfcfg.configuration "sbi" }}
@@ -18,6 +19,7 @@
{{- if not (hasKey $sbi "port") -}}
{{- $_ := .Values.config.pcf.sbi.port | set $sbi "port" -}}
{{- end }}
+{{- end }}
---
apiVersion: v1
@@ -29,8 +31,10 @@
data:
pcf-run.sh: |
{{ tuple "bin/_pcf-run.sh.tpl" . | include "5g-control-plane.template" | indent 4 }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- range $key, $value := .Values.config.pcf.cfgFiles }}
{{ $key }}: |-
{{ toYaml $value | indent 4 }}
{{- end }}
{{- end }}
+{{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-smf.yaml b/omec/5g-control-plane/templates/configmap-smf.yaml
index e5400bf..18120b0 100644
--- a/omec/5g-control-plane/templates/configmap-smf.yaml
+++ b/omec/5g-control-plane/templates/configmap-smf.yaml
@@ -6,6 +6,7 @@
{{- if .Values.config.smf.deploy }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- $smfcfg := index .Values.config.smf.cfgFiles "smfcfg.conf" }}
{{- $sbi := index $smfcfg.configuration "sbi" }}
@@ -21,6 +22,7 @@
{{- if not (hasKey $sbi "port") -}}
{{- $_ := .Values.config.smf.sbi.port | set $sbi "port" -}}
{{- end }}
+{{- end }}
---
apiVersion: v1
@@ -32,8 +34,10 @@
data:
smf-run.sh: |
{{ tuple "bin/_smf-run.sh.tpl" . | include "5g-control-plane.template" | indent 4 }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- range $key, $value := .Values.config.smf.cfgFiles }}
{{ $key }}: |-
{{ toYaml $value | indent 4 }}
{{- end }}
{{- end }}
+{{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-udm.yaml b/omec/5g-control-plane/templates/configmap-udm.yaml
index 1fcf9ae..ea6786b 100644
--- a/omec/5g-control-plane/templates/configmap-udm.yaml
+++ b/omec/5g-control-plane/templates/configmap-udm.yaml
@@ -6,6 +6,7 @@
{{- if .Values.config.udm.deploy }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- $udmcfg := index .Values.config.udm.cfgFiles "udmcfg.conf" }}
{{- $sbi := index $udmcfg.configuration "sbi" }}
@@ -18,6 +19,7 @@
{{- if not (hasKey $sbi "port") -}}
{{- $_ := .Values.config.udm.sbi.port | set $sbi "port" -}}
{{- end }}
+{{- end }}
---
apiVersion: v1
@@ -29,8 +31,10 @@
data:
udm-run.sh: |
{{ tuple "bin/_udm-run.sh.tpl" . | include "5g-control-plane.template" | indent 4 }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- range $key, $value := .Values.config.udm.cfgFiles }}
{{ $key }}: |-
{{ toYaml $value | indent 4 }}
{{- end }}
{{- end }}
+{{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-udr.yaml b/omec/5g-control-plane/templates/configmap-udr.yaml
index 3508ac3..5ce0dc4 100644
--- a/omec/5g-control-plane/templates/configmap-udr.yaml
+++ b/omec/5g-control-plane/templates/configmap-udr.yaml
@@ -6,6 +6,7 @@
{{- if .Values.config.udr.deploy }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- $udrcfg := index .Values.config.udr.cfgFiles "udrcfg.conf" }}
{{- $config := index $udrcfg "configuration" }}
{{- $sbi := index $config "sbi" }}
@@ -23,6 +24,7 @@
{{- if not (hasKey $sbi "port") -}}
{{- $_ := .Values.config.udr.sbi.port | set $sbi "port" -}}
{{- end }}
+{{- end }}
---
apiVersion: v1
@@ -34,8 +36,10 @@
data:
udr-run.sh: |
{{ tuple "bin/_udr-run.sh.tpl" . | include "5g-control-plane.template" | indent 4 }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- range $key, $value := .Values.config.udr.cfgFiles }}
{{ $key }}: |-
{{ toYaml $value | indent 4 }}
{{- end }}
{{- end }}
+{{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-webui.yaml b/omec/5g-control-plane/templates/configmap-webui.yaml
index 14657ed..f4581c3 100644
--- a/omec/5g-control-plane/templates/configmap-webui.yaml
+++ b/omec/5g-control-plane/templates/configmap-webui.yaml
@@ -6,11 +6,13 @@
{{- if .Values.config.webui.deploy }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- $webuicfg := index .Values.config.webui.cfgFiles "webuicfg.conf" }}
{{- $config := index $webuicfg "configuration" }}
{{- if not (hasKey $config "mongodb") -}}
{{- $_ := dict "name" .Values.config.mongodb.name "url" .Values.config.mongodb.url | set $config "mongodb" -}}
{{- end }}
+{{- end }}
---
apiVersion: v1
@@ -22,8 +24,10 @@
data:
webui-run.sh: |
{{ tuple "bin/_webui-run.sh.tpl" . | include "5g-control-plane.template" | indent 4 }}
+{{- if not .Values.config.useExistingConfigMap -}}
{{- range $key, $value := .Values.config.webui.cfgFiles }}
{{ $key }}: |-
{{ toYaml $value | indent 4 }}
{{- end }}
{{- end }}
+{{- end }}
diff --git a/omec/5g-control-plane/values.yaml b/omec/5g-control-plane/values.yaml
index 476caae..49432f8 100644
--- a/omec/5g-control-plane/values.yaml
+++ b/omec/5g-control-plane/values.yaml
@@ -100,6 +100,7 @@
#replicaCount: 3
config:
+ useExistingConfigMap: false
coreDump:
enabled: false
path: /tmp/coredump