Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update Keystore cert"
[oom.git]
/
kubernetes
/
aai
/
charts
/
aai-sparky-be
/
templates
/
configmap.yaml
diff --git
a/kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml
b/kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml
index
6a00fe7
..
50238aa
100644
(file)
--- a/
kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml
+++ b/
kubernetes/aai/charts/aai-sparky-be/templates/configmap.yaml
@@
-17,6
+17,11
@@
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-prop
namespace: {{ include "common.namespace" . }}
metadata:
name: {{ include "common.fullname" . }}-prop
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/application.properties").AsConfig . | indent 2 }}
{{ tpl (.Files.Glob "resources/config/application-resources.properties").AsConfig . | indent 2 }}
data:
{{ tpl (.Files.Glob "resources/config/application.properties").AsConfig . | indent 2 }}
{{ tpl (.Files.Glob "resources/config/application-resources.properties").AsConfig . | indent 2 }}
@@
-24,12
+29,19
@@
data:
{{ tpl (.Files.Glob "resources/config/application-oxm-default.properties").AsConfig . | indent 2 }}
{{ tpl (.Files.Glob "resources/config/application-oxm-override.properties").AsConfig . | indent 2 }}
{{ tpl (.Files.Glob "resources/config/application-oxm-schema-prod.properties").AsConfig . | indent 2 }}
{{ tpl (.Files.Glob "resources/config/application-oxm-default.properties").AsConfig . | indent 2 }}
{{ tpl (.Files.Glob "resources/config/application-oxm-override.properties").AsConfig . | indent 2 }}
{{ tpl (.Files.Glob "resources/config/application-oxm-schema-prod.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/roles.config").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/users.config").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
---
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
---
data:
{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
---
@@
-38,6
+50,11
@@
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-portal
namespace: {{ include "common.namespace" . }}
metadata:
name: {{ include "common.fullname" . }}-portal
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/portal/*").AsConfig . | indent 2 }}
---
data:
{{ tpl (.Files.Glob "resources/config/portal/*").AsConfig . | indent 2 }}
---
@@
-46,5
+63,10
@@
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-portal-props
namespace: {{ include "common.namespace" . }}
metadata:
name: {{ include "common.fullname" . }}-portal-props
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
data:
-{{ tpl (.Files.Glob "resources/config/portal/BOOT-INF/classes/*").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/portal/BOOT-INF/classes/*").AsConfig . | indent 2 }}