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 "DNS add option for display target machine info"
[oom.git]
/
kubernetes
/
vfc
/
charts
/
vfc-resmgr
/
templates
/
deployment.yaml
diff --git
a/kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml
b/kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml
index
9012540
..
54ff350
100644
(file)
--- a/
kubernetes/vfc/charts/vfc-resmgr/templates/deployment.yaml
+++ b/
kubernetes/vfc/charts/vfc-resmgr/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,9
@@
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:
initContainers:
#Example init container for dependency checking
spec:
initContainers:
#Example init container for dependency checking
@@
-67,8
+69,14
@@
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
- name: MSB_ADDR
- value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}:{{ .Values.config.msbPort }}"
+ value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ - name: REG_TO_MSB_WHEN_START
+ value: "{{ .Values.global.config.reg_to_msb_when_start }}"
volumeMounts:
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
volumeMounts:
- name: {{ include "common.fullname" . }}-localtime
mountPath: /etc/localtime
@@
-79,7
+87,7
@@
spec:
mountPath: /opt/vfc/resmgr/config/log4j.properties
subPath: log4j.properties
resources:
mountPath: /opt/vfc/resmgr/config/log4j.properties
subPath: log4j.properties
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 }}
@@
-114,7
+122,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: