Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update vfc chart using OOM shared mariadb galera
[oom.git]
/
kubernetes
/
vfc
/
charts
/
vfc-catalog
/
templates
/
deployment.yaml
diff --git
a/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml
b/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml
index
6533911
..
1849c46
100644
(file)
--- a/
kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml
+++ b/
kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml
@@
-72,7
+72,13
@@
spec:
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
- name: MYSQL_ADDR
value: "{{ .Values.global.config.dbServiceName }}:{{ .Values.global.config.dbPort }}"
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
- name: MYSQL_ADDR
value: "{{ .Values.global.config.dbServiceName }}:{{ .Values.global.config.dbPort }}"
+ - name: MYSQL_AUTH
+ value: "{{ .Values.global.config.dbUser }}:{{ .Values.global.config.mariadbRootPassword }}"
+ - name: REDIS_ADDR
+ value: "{{ .Values.global.config.redisServiceName }}:{{ .Values.global.config.redisPort }}"
volumeMounts:
volumeMounts:
+ - name: {{ include "common.fullname" . }}-catalog
+ mountPath: /service/vfc/nfvo/catalog/static
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
readOnly: true
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
readOnly: true
@@
-82,7
+88,7
@@
spec:
mountPath: /opt/vfc/catalog/config/log.yml
subPath: log.yml
resources:
mountPath: /opt/vfc/catalog/config/log.yml
subPath: log.yml
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 }}
@@
-106,6
+112,13
@@
spec:
mountPath: /usr/share/filebeat/data
volumes:
mountPath: /usr/share/filebeat/data
volumes:
+ - name: {{ include "common.fullname" . }}-catalog
+ {{- if .Values.persistence.enabled }}
+ persistentVolumeClaim:
+ claimName: {{ include "common.fullname" . }}
+ {{- else }}
+ emptyDir: {}
+ {{- end }}
- name: {{ include "common.fullname" . }}-localtime
hostPath:
path: /etc/localtime
- name: {{ include "common.fullname" . }}-localtime
hostPath:
path: /etc/localtime