From f9ee71a7ee928d30bca1b336031480bde0820252 Mon Sep 17 00:00:00 2001 From: Xinnan Wen Date: Tue, 10 Dec 2019 11:38:50 -0800 Subject: [PATCH 1/2] add tolerations --- istio-telemetry/kiali/templates/deployment.yaml | 3 +++ istio-telemetry/kiali/values.yaml | 1 + istio-telemetry/tracing/templates/deployment-jaeger.yaml | 3 +++ istio-telemetry/tracing/templates/deployment-opencensus.yaml | 3 +++ istio-telemetry/tracing/templates/deployment-zipkin.yaml | 3 +++ istio-telemetry/tracing/values.yaml | 3 +++ 6 files changed, 16 insertions(+) diff --git a/istio-telemetry/kiali/templates/deployment.yaml b/istio-telemetry/kiali/templates/deployment.yaml index 24479a1f..71ac059a 100644 --- a/istio-telemetry/kiali/templates/deployment.yaml +++ b/istio-telemetry/kiali/templates/deployment.yaml @@ -90,3 +90,6 @@ spec: affinity: {{- include "nodeaffinity" . | indent 6 }} {{- include "podAntiAffinity" . | indent 6 }} + {{- if .Values.kiali.tolerations }} + tolerations: + {{ toYaml .Values.kiali.tolerations | indent 6 }} diff --git a/istio-telemetry/kiali/values.yaml b/istio-telemetry/kiali/values.yaml index 18aa36e3..c88fc69e 100644 --- a/istio-telemetry/kiali/values.yaml +++ b/istio-telemetry/kiali/values.yaml @@ -10,6 +10,7 @@ kiali: contextPath: /kiali # The root context path to access the Kiali UI. nodeSelector: {} podAnnotations: {} + tolerations: [] # Specify the pod anti-affinity that allows you to constrain which nodes # your pod is eligible to be scheduled based on labels on pods that are diff --git a/istio-telemetry/tracing/templates/deployment-jaeger.yaml b/istio-telemetry/tracing/templates/deployment-jaeger.yaml index 7d90c575..ee8ef848 100644 --- a/istio-telemetry/tracing/templates/deployment-jaeger.yaml +++ b/istio-telemetry/tracing/templates/deployment-jaeger.yaml @@ -95,6 +95,9 @@ spec: affinity: {{- include "nodeaffinity" . | indent 6 }} {{- include "podAntiAffinity" . | indent 6 }} +{{- if .Values.tracing.jaeger.tolerations }} + tolerations: +{{ toYaml .Values.tracing.jaeger.tolerations | indent 6 }} {{- if eq .Values.tracing.jaeger.spanStorageType "badger" }} volumes: - name: data diff --git a/istio-telemetry/tracing/templates/deployment-opencensus.yaml b/istio-telemetry/tracing/templates/deployment-opencensus.yaml index dafe8ebb..1516dffa 100644 --- a/istio-telemetry/tracing/templates/deployment-opencensus.yaml +++ b/istio-telemetry/tracing/templates/deployment-opencensus.yaml @@ -94,4 +94,7 @@ spec: affinity: {{- include "nodeaffinity" . | indent 6 }} {{- include "podAntiAffinity" . | indent 6 }} +{{- if .Values.tracing.opencensus.tolerations }} + tolerations: +{{ toYaml .Values.tracing.opencensus.tolerations | indent 6 }} {{ end }} diff --git a/istio-telemetry/tracing/templates/deployment-zipkin.yaml b/istio-telemetry/tracing/templates/deployment-zipkin.yaml index 0893fa0d..8cfbded9 100644 --- a/istio-telemetry/tracing/templates/deployment-zipkin.yaml +++ b/istio-telemetry/tracing/templates/deployment-zipkin.yaml @@ -71,4 +71,7 @@ spec: affinity: {{- include "nodeaffinity" . | indent 6 }} {{- include "podAntiAffinity" . | indent 6 }} + {{- if .Values.tracing.zipkin.tolerations }} + tolerations: + {{ toYaml .Values.tracing.zipkin.tolerations | indent 6 }} {{ end }} diff --git a/istio-telemetry/tracing/values.yaml b/istio-telemetry/tracing/values.yaml index 705d21ce..e7072daf 100644 --- a/istio-telemetry/tracing/values.yaml +++ b/istio-telemetry/tracing/values.yaml @@ -44,6 +44,7 @@ tracing: storageClassName: "" accessMode: ReadWriteMany podAnnotations: {} + tolerations: [] zipkin: hub: docker.io/openzipkin @@ -67,6 +68,7 @@ tracing: node: cpus: 2 podAnnotations: {} + tolerations: [] opencensus: hub: docker.io/omnition @@ -82,6 +84,7 @@ tracing: stackdriver: enable_tracing: true podAnnotations: {} + tolerations: [] service: annotations: {} From 6640a6d10f0875d6953e467f395247262c8e26ab Mon Sep 17 00:00:00 2001 From: Xinnan Wen Date: Tue, 10 Dec 2019 17:12:51 -0800 Subject: [PATCH 2/2] Fix format --- istio-telemetry/kiali/templates/deployment.yaml | 1 + istio-telemetry/tracing/templates/deployment-jaeger.yaml | 1 + istio-telemetry/tracing/templates/deployment-opencensus.yaml | 1 + istio-telemetry/tracing/templates/deployment-zipkin.yaml | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/istio-telemetry/kiali/templates/deployment.yaml b/istio-telemetry/kiali/templates/deployment.yaml index 71ac059a..9abe3d2d 100644 --- a/istio-telemetry/kiali/templates/deployment.yaml +++ b/istio-telemetry/kiali/templates/deployment.yaml @@ -93,3 +93,4 @@ spec: {{- if .Values.kiali.tolerations }} tolerations: {{ toYaml .Values.kiali.tolerations | indent 6 }} + {{- end }} diff --git a/istio-telemetry/tracing/templates/deployment-jaeger.yaml b/istio-telemetry/tracing/templates/deployment-jaeger.yaml index ee8ef848..942bc3f2 100644 --- a/istio-telemetry/tracing/templates/deployment-jaeger.yaml +++ b/istio-telemetry/tracing/templates/deployment-jaeger.yaml @@ -98,6 +98,7 @@ spec: {{- if .Values.tracing.jaeger.tolerations }} tolerations: {{ toYaml .Values.tracing.jaeger.tolerations | indent 6 }} +{{- end }} {{- if eq .Values.tracing.jaeger.spanStorageType "badger" }} volumes: - name: data diff --git a/istio-telemetry/tracing/templates/deployment-opencensus.yaml b/istio-telemetry/tracing/templates/deployment-opencensus.yaml index 1516dffa..74f8c136 100644 --- a/istio-telemetry/tracing/templates/deployment-opencensus.yaml +++ b/istio-telemetry/tracing/templates/deployment-opencensus.yaml @@ -97,4 +97,5 @@ spec: {{- if .Values.tracing.opencensus.tolerations }} tolerations: {{ toYaml .Values.tracing.opencensus.tolerations | indent 6 }} +{{- end }} {{ end }} diff --git a/istio-telemetry/tracing/templates/deployment-zipkin.yaml b/istio-telemetry/tracing/templates/deployment-zipkin.yaml index 8cfbded9..29b2e48a 100644 --- a/istio-telemetry/tracing/templates/deployment-zipkin.yaml +++ b/istio-telemetry/tracing/templates/deployment-zipkin.yaml @@ -74,4 +74,5 @@ spec: {{- if .Values.tracing.zipkin.tolerations }} tolerations: {{ toYaml .Values.tracing.zipkin.tolerations | indent 6 }} -{{ end }} + {{- end }} + {{ end }}