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 "[MODELING]Modify the owner of static directory to onap instead of root"
[oom.git]
/
kubernetes
/
clamp
/
charts
/
mariadb
/
templates
/
configmap.yaml
diff --git
a/kubernetes/clamp/charts/mariadb/templates/configmap.yaml
b/kubernetes/clamp/charts/mariadb/templates/configmap.yaml
index
705c38f
..
01420aa
100644
(file)
--- a/
kubernetes/clamp/charts/mariadb/templates/configmap.yaml
+++ b/
kubernetes/clamp/charts/mariadb/templates/configmap.yaml
@@
-17,7
+17,7
@@
apiVersion: v1
kind: ConfigMap
metadata:
apiVersion: v1
kind: ConfigMap
metadata:
- name: clamp-entrypoint-
initdb
-configmap
+ name: clamp-entrypoint-
bulkload
-configmap
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@
-30,7
+30,7
@@
data:
apiVersion: v1
kind: ConfigMap
metadata:
apiVersion: v1
kind: ConfigMap
metadata:
- name: clamp-
entrypoint-bulkload
-configmap
+ name: clamp-
mariadb-conf
-configmap
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@
-38,12
+38,12
@@
metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/mariadb/
docker-entrypoint-initdb.d/bulkload
/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/mariadb/
conf.d/conf1
/*").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
metadata:
---
apiVersion: v1
kind: ConfigMap
metadata:
- name:
clamp-mariadb-conf-configmap
+ name:
{{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@
-51,5
+51,5
@@
metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/
mariadb/conf.d/conf1
/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/
init
/*").AsConfig . | indent 2 }}
#{{ end }}
#{{ end }}