J release changes

[ric-plt/ric-dep.git] / helm / infrastructure / subcharts / kong / templates / config-dbless.yaml

diff --git a/helm/infrastructure/subcharts/kong/templates/config-dbless.yaml b/helm/infrastructure/subcharts/kong/templates/config-dbless.yaml
index 7a0cbc5..5619b59 100644 (file)
--- a/helm/infrastructure/subcharts/kong/templates/config-dbless.yaml
+++ b/helm/infrastructure/subcharts/kong/templates/config-dbless.yaml
@@ -1,13 +1,17 @@
+{{- if .Values.deployment.kong.enabled }}
 {{- if (and (not .Values.ingressController.enabled) (eq .Values.env.database "off")) }}
-{{- if not .Values.dblessConfig.configMap }}
+{{- if not (or .Values.dblessConfig.configMap .Values.dblessConfig.secret) }}
+{{- if .Values.dblessConfig.config }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "kong.dblessConfig.fullname" . }}
+  namespace: {{ template "kong.namespace" . }}
   labels:
     {{- include "kong.metaLabels" . | nindent 4 }}
 data:
-  kong.yml: |
-{{ .Values.dblessConfig.config | toYaml | indent 4 }}
+  kong.yml: | {{- .Values.dblessConfig.config | nindent 4 }}
+{{- end }}
+{{- end }}
 {{- end }}
 {{- end }}