X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=helm%2Finfrastructure%2Fsubcharts%2Fkong%2Ftemplates%2Fconfig-dbless.yaml;h=5619b59a53b0049143ec8d54a574baef72110f54;hb=refs%2Fchanges%2F69%2F12969%2F1;hp=186c0fa805f71393f74af8ae65c39c1da8ed0f32;hpb=38dc857062b14145f5b9db89d10eba0ae5b90d11;p=ric-plt%2Fric-dep.git

diff --git a/helm/infrastructure/subcharts/kong/templates/config-dbless.yaml b/helm/infrastructure/subcharts/kong/templates/config-dbless.yaml
old mode 100755
new mode 100644
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 }}