summaryrefslogtreecommitdiffstats
path: root/kubernetes/multicloud/charts/multicloud-vio/templates
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/multicloud/charts/multicloud-vio/templates')
-rw-r--r--kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml5
-rw-r--r--kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml4
2 files changed, 6 insertions, 3 deletions
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
index fa9646657b..6ef2e582b3 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
@@ -35,6 +35,8 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
name: {{ include "common.name" . }}
+ annotations:
+ sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
spec:
containers:
- env:
@@ -63,6 +65,8 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
+ # disable liveness probe when breakpoints set in debugger
+ # so K8s doesn't restart unresponsive container
{{- if eq .Values.liveness.enabled true }}
livenessProbe:
httpGet:
@@ -75,7 +79,6 @@ spec:
successThreshold: {{ .Values.liveness.successThreshold }}
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end -}}
-
# side car containers
- image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
index dcaf37d192..e8374970bb 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
@@ -38,13 +38,13 @@ metadata:
spec:
ports:
{{if eq .Values.service.type "NodePort" -}}
- - name: {{ .Values.service.name }}
+ - name: http-{{ .Values.service.name }}
port: {{ .Values.service.externalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: http-{{ .Values.service.name }}
{{- end}}
selector:
app: {{ include "common.name" . }}