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
old mode 100755 (executable)
new mode 100644 (file)
index 186c0fa..5619b59
--- a/helm/infrastructure/subcharts/kong/templates/config-dbless.yaml
+++ b/helm/infrastructure/subcharts/kong/templates/config-dbless.yaml
@@ -1,16 +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:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- 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 }}