diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-04-30 06:08:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-04-30 06:08:03 +0000 |
| commit | 74d9c9b6286d381dade24abbbcad8a41a4fdf4b4 (patch) | |
| tree | a6c77a16b9a2bb214b0244aa7e051a66c41c0be8 /kubernetes/cps/resources | |
| parent | c903b986e64ea873f3885951f70638e20ff667de (diff) | |
| parent | 5a47eaff250a8b4b5035586447ca1284ba620695 (diff) | |
Merge "[CPS] Remove duplicate configuration"
Diffstat (limited to 'kubernetes/cps/resources')
| -rwxr-xr-x | kubernetes/cps/resources/config/application-helm.yml (renamed from kubernetes/cps/resources/config/application.yml) | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kubernetes/cps/resources/config/application.yml b/kubernetes/cps/resources/config/application-helm.yml index d85d341081..5f19007231 100755 --- a/kubernetes/cps/resources/config/application.yml +++ b/kubernetes/cps/resources/config/application-helm.yml @@ -50,7 +50,7 @@ spring: liquibase: change-log: classpath:changelog/changelog-master.yaml - labels: ${LIQUIBASE_LABELS} + labels: {{ .Values.config.liquibaseLabels }} security: # comma-separated uri patterns which do not require authorization @@ -79,3 +79,9 @@ logging: level: org: springframework: {{ .Values.logging.level }} + +{{- if .Values.config.additional }} +{{ toYaml .Values.config.additional | nindent 2 }} +{{- end }} + +# Last empty line is required otherwise the last property will be missing from application.yml file in the pod. |