Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
MariaDB startup issue
[oom.git]
/
kubernetes
/
portal
/
charts
/
portal-mariadb
/
templates
/
deployment.yaml
diff --git
a/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml
b/kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml
index
fd5e524
..
aeaef14
100644
(file)
--- a/
kubernetes/portal/charts/portal-mariadb/templates/deployment.yaml
+++ b/
kubernetes/portal/charts/portal-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.
@@
-32,7
+33,7
@@
spec:
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 }}
@@
-52,7
+53,7
@@
spec:
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: MYSQL_HOST
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: MYSQL_HOST
- value: "{{
.Values.service.name
}}"
+ value: "{{
include "common.servicename" .
}}"
- name: MYSQL_ROOT_PASSWORD
valueFrom:
secretKeyRef:
- name: MYSQL_ROOT_PASSWORD
valueFrom:
secretKeyRef:
@@
-64,11
+65,11
@@
spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- mountPath: /etc/localtime
name: localtime
readOnly: true
- -
name: mariadb-docker-entrypoint-initdb
- mountPath: /docker-entrypoint-initdb.d/zzz_apps_users_onboarding.sql
- subPath: Apps_Users_OnBoarding_Script.sql
+ -
mountPath: /usr/local/bin/docker-entrypoint.sh
+ subPath: docker-entrypoint.sh
+ name: docker-entry
resources:
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 }}
@@
-85,11
+86,12
@@
spec:
{{- else }}
emptyDir: {}
{{- end }}
{{- else }}
emptyDir: {}
{{- end }}
- - name: mariadb-docker-entrypoint-initdb
- configMap:
- name: {{ include "common.fullname" . }}-docker-entry-initd
- name: localtime
hostPath:
path: /etc/localtime
- name: localtime
hostPath:
path: /etc/localtime
+ - name: docker-entry
+ configMap:
+ name: {{ include "common.fullname" . }}-mariadb
+ defaultMode: 0755
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"