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 "Migrate OOF to v14 AAI schema"
[oom.git]
/
kubernetes
/
vfc
/
charts
/
vfc-workflow
/
templates
/
deployment.yaml
diff --git
a/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml
b/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml
index
64fab80
..
a42769b
100644
(file)
--- a/
kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml
+++ b/
kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml
@@
-29,6
+29,8
@@
spec:
labels:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
labels:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
+ annotations:
+ sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
spec:
initContainers:
#Example init container for dependency checking
spec:
initContainers:
#Example init container for dependency checking
@@
-74,11
+76,11
@@
spec:
- name: SERVICE_PORT
value: "{{ .Values.service.externalPort }}"
- name: OPENPALETTE_MSB_IP
- name: SERVICE_PORT
value: "{{ .Values.service.externalPort }}"
- name: OPENPALETTE_MSB_IP
- value: "{{ .
Release.Name }}-msb-iag.{{ include "common.namespace" .
}}"
+ value: "{{ .
Values.global.config.msbServiceName
}}"
- name: OPENPALETTE_MSB_PORT
- name: OPENPALETTE_MSB_PORT
- value: "{{ .Values.config.msbPort | default 80 }}"
+ value: "{{ .Values.
global.
config.msbPort | default 80 }}"
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 }}