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 "Add override flag to the ingress template"
[oom.git]
/
kubernetes
/
vfc
/
charts
/
vfc-vnfres
/
templates
/
deployment.yaml
diff --git
a/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml
b/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml
index
767b709
..
a913138
100644
(file)
--- a/
kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml
+++ b/
kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml
@@
-20,7
+20,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,7
+28,7
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
annotations:
sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
spec:
annotations:
sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
spec:
@@
-37,7
+37,7
@@
spec:
- /root/ready.py
args:
- --container-name
- /root/ready.py
args:
- --container-name
- - vfc-db
+ - vfc-
maria
db
env:
- name: NAMESPACE
valueFrom:
env:
- name: NAMESPACE
valueFrom:
@@
-72,6
+72,10
@@
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: REDIS_ADDR
+ value: "{{ .Values.global.config.redisServiceName }}:{{ .Values.global.config.redisPort }}"
+ - name: MYSQL_AUTH
+ value: "{{ .Values.global.config.dbUser }}:{{ .Values.global.config.mariadbRootPassword }}"
volumeMounts:
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
volumeMounts:
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
@@
-82,7
+86,7
@@
spec:
mountPath: /opt/vfc/gvnfm-vnfres/config/log.yml
subPath: log.yml
resources:
mountPath: /opt/vfc/gvnfm-vnfres/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 }}
@@
-117,7
+121,7
@@
spec:
- name: {{ include "common.fullname" . }}-filebeat-conf
configMap:
- name: {{ include "common.fullname" . }}-filebeat-conf
configMap:
- name: {{
.Release.Name
}}-vfc-filebeat-configmap
+ name: {{
include "common.release" .
}}-vfc-filebeat-configmap
- name: {{ include "common.fullname" . }}-data-filebeat
emptyDir: {}
imagePullSecrets:
- name: {{ include "common.fullname" . }}-data-filebeat
emptyDir: {}
imagePullSecrets: