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 "Removed use of vfc-redis from etsicatalog component"
[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
e33d749
..
8e5d097
100644
(file)
--- a/
kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml
+++ b/
kubernetes/vfc/charts/vfc-catalog/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:
@@
-68,11
+68,21
@@
spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
+ - name: MSB_PROTO
+ value: "{{ .Values.global.config.msbprotocol }}"
+ - name: SSL_ENABLED
+ value: "{{ .Values.global.config.ssl_enabled }}"
- name: MSB_ADDR
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
- name: MYSQL_ADDR
value: "{{ .Values.global.config.dbServiceName }}:{{ .Values.global.config.dbPort }}"
- name: MSB_ADDR
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
@@
-106,6
+116,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
@@
-117,7
+134,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: