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 "Adding NSSMF adapter chart"
[oom.git]
/
kubernetes
/
clamp
/
charts
/
mariadb
/
templates
/
deployment.yaml
diff --git
a/kubernetes/clamp/charts/mariadb/templates/deployment.yaml
b/kubernetes/clamp/charts/mariadb/templates/deployment.yaml
index
e1db655
..
be46f89
100644
(file)
--- a/
kubernetes/clamp/charts/mariadb/templates/deployment.yaml
+++ b/
kubernetes/clamp/charts/mariadb/templates/deployment.yaml
@@
-1,4
+1,5
@@
# Copyright © 2017 Amdocs, Bell Canada
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-20,7
+21,7
@@
metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
@@
-28,11
+29,11
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
spec:
containers:
- name: {{ include "common.name" . }}
spec:
containers:
- name: {{ include "common.name" . }}
- image:
{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}
+ image:
"{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
@@
-57,14
+58,12
@@
spec:
name: {{ template "common.fullname" . }}
key: db-root-password
volumeMounts:
name: {{ template "common.fullname" . }}
key: db-root-password
volumeMounts:
- - mountPath: /docker-entrypoint-initdb.d/
load-sql-files-tests-automation
.sh
+ - mountPath: /docker-entrypoint-initdb.d/
bootstrap-database
.sh
name: docker-entrypoint-initdb
name: docker-entrypoint-initdb
- subPath:
load-sql-files-tests-automation
.sh
+ subPath:
bootstrap-database
.sh
- mountPath: /etc/localtime
name: localtime
readOnly: true
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - mountPath: /docker-entrypoint-initdb.d/drop/
- name: docker-entrypoint-clds-drop
- mountPath: /docker-entrypoint-initdb.d/bulkload/
name: docker-entrypoint-bulkload
- mountPath: /etc/mysql/conf.d/conf1/
- mountPath: /docker-entrypoint-initdb.d/bulkload/
name: docker-entrypoint-bulkload
- mountPath: /etc/mysql/conf.d/conf1/
@@
-72,7
+71,7
@@
spec:
- mountPath: /var/lib/mysql
name: clamp-mariadb-data
resources:
- mountPath: /var/lib/mysql
name: clamp-mariadb-data
resources:
-{{
toYaml .Values.resources
| indent 12 }}
+{{
include "common.resources" .
| indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
@@
-92,9
+91,6
@@
spec:
- name: docker-entrypoint-initdb
configMap:
name: clamp-entrypoint-initdb-configmap
- name: docker-entrypoint-initdb
configMap:
name: clamp-entrypoint-initdb-configmap
- - name: docker-entrypoint-clds-drop
- configMap:
- name: clamp-entrypoint-drop-configmap
- name: docker-entrypoint-bulkload
configMap:
name: clamp-entrypoint-bulkload-configmap
- name: docker-entrypoint-bulkload
configMap:
name: clamp-entrypoint-bulkload-configmap