From 35058796b9ef160f1cce187a8efbb054a5ac4d2f Mon Sep 17 00:00:00 2001
From: John Mazzitelli <mazz@redhat.com>
Date: Tue, 19 Nov 2019 11:12:30 -0500
Subject: [PATCH] incorporate the changes that are made in PR
 https://github.com/istio/installer/pull/548 for issue
 https://github.com/istio/istio/pull/18819 by adding excludedWorkloads

---
 istio-telemetry/kiali/templates/kialicr.yaml | 23 ++++++++++++--------
 istio-telemetry/kiali/values.yaml            |  8 +++++++
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/istio-telemetry/kiali/templates/kialicr.yaml b/istio-telemetry/kiali/templates/kialicr.yaml
index c7f8c01d..78739fb4 100644
--- a/istio-telemetry/kiali/templates/kialicr.yaml
+++ b/istio-telemetry/kiali/templates/kialicr.yaml
@@ -33,19 +33,19 @@ spec:
   deployment:
     image_pull_policy: {{ .Values.global.imagePullPolicy }}
     namespace: {{ .Release.Namespace }}
-    {{- if .Values.kiali.accessibleNamespaces }}
+{{- if .Values.kiali.accessibleNamespaces }}
     accessible_namespaces: {{ .Values.kiali.accessibleNamespaces }}
-    {{- end }}
+{{- end }}
     ingress_enabled: {{ .Values.kiali.ingress.enabled }}
     verbose_mode: 3
     view_only_mode: {{ .Values.kiali.dashboard.viewOnlyMode }}
     affinity:
     {{- include "nodeaffinity" . | indent 6 }}
     {{- include "podAntiAffinity" . | indent 6 }}
-    {{- if .Values.kiali.tolerations }}
+{{- if .Values.kiali.tolerations }}
     tolerations:
-    {{ toYaml .Values.kiali.tolerations | indent 6 }}
-    {{- end }}
+{{ toYaml .Values.kiali.tolerations | indent 6 }}
+{{- end }}
     secret_name: {{ .Values.kiali.dashboard.secretName }}
   external_services:
     grafana:
@@ -60,15 +60,20 @@ spec:
 {{- end }}
     tracing:
       url: {{ .Values.kiali.dashboard.jaegerURL }}
-  {{- if .Values.kiali.security.enabled }}
+{{- if .Values.kiali.security.enabled }}
   identity:
     cert_file: {{ .Values.kiali.security.cert_file }}
     private_key_file: {{ .Values.kiali.security.private_key_file }}
-  {{- end}}
+{{- end}}
+{{- if .Values.kiali.excludedWorkloads }}
+  kubernetes_config:
+    excluded_workloads:
+{{ toYaml .Values.kiali.excludedWorkloads | indent 6 }}
+{{- end}}
   server:
     port: 20001
-    {{- if .Values.kiali.contextPath }}
+{{- if .Values.kiali.contextPath }}
     web_root: {{ .Values.kiali.contextPath }}
-    {{- end }}
+{{- end }}
 {{- end }}
 {{- end }}
diff --git a/istio-telemetry/kiali/values.yaml b/istio-telemetry/kiali/values.yaml
index 86da9eae..5c18a398 100644
--- a/istio-telemetry/kiali/values.yaml
+++ b/istio-telemetry/kiali/values.yaml
@@ -89,6 +89,14 @@ kiali:
     cert_file: /kiali-cert/cert-chain.pem
     private_key_file: /kiali-cert/key.pem
 
+  excludedWorkloads:
+    - "CronJob"
+    - "Job"
+  # Other options are:
+  #  - DeploymentConfig
+  #  - ReplicationController
+  #  - StatefulSet
+
   # Until https://github.com/helm/helm/pull/6876 is available, the only way to really support
   # a fully customized Kiali CR is to be able to pass the full spec here. If this is defined,
   # most of the settings above will be ignored and this is used for the Kiali CR spec.