Skip to content

Commit 3505879

Browse files
committed
incorporate the changes that are made in
PR istio#548 for issue istio/istio#18819 by adding excludedWorkloads
1 parent 3a2d38c commit 3505879

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

istio-telemetry/kiali/templates/kialicr.yaml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ spec:
3333
deployment:
3434
image_pull_policy: {{ .Values.global.imagePullPolicy }}
3535
namespace: {{ .Release.Namespace }}
36-
{{- if .Values.kiali.accessibleNamespaces }}
36+
{{- if .Values.kiali.accessibleNamespaces }}
3737
accessible_namespaces: {{ .Values.kiali.accessibleNamespaces }}
38-
{{- end }}
38+
{{- end }}
3939
ingress_enabled: {{ .Values.kiali.ingress.enabled }}
4040
verbose_mode: 3
4141
view_only_mode: {{ .Values.kiali.dashboard.viewOnlyMode }}
4242
affinity:
4343
{{- include "nodeaffinity" . | indent 6 }}
4444
{{- include "podAntiAffinity" . | indent 6 }}
45-
{{- if .Values.kiali.tolerations }}
45+
{{- if .Values.kiali.tolerations }}
4646
tolerations:
47-
{{ toYaml .Values.kiali.tolerations | indent 6 }}
48-
{{- end }}
47+
{{ toYaml .Values.kiali.tolerations | indent 6 }}
48+
{{- end }}
4949
secret_name: {{ .Values.kiali.dashboard.secretName }}
5050
external_services:
5151
grafana:
@@ -60,15 +60,20 @@ spec:
6060
{{- end }}
6161
tracing:
6262
url: {{ .Values.kiali.dashboard.jaegerURL }}
63-
{{- if .Values.kiali.security.enabled }}
63+
{{- if .Values.kiali.security.enabled }}
6464
identity:
6565
cert_file: {{ .Values.kiali.security.cert_file }}
6666
private_key_file: {{ .Values.kiali.security.private_key_file }}
67-
{{- end}}
67+
{{- end}}
68+
{{- if .Values.kiali.excludedWorkloads }}
69+
kubernetes_config:
70+
excluded_workloads:
71+
{{ toYaml .Values.kiali.excludedWorkloads | indent 6 }}
72+
{{- end}}
6873
server:
6974
port: 20001
70-
{{- if .Values.kiali.contextPath }}
75+
{{- if .Values.kiali.contextPath }}
7176
web_root: {{ .Values.kiali.contextPath }}
72-
{{- end }}
77+
{{- end }}
7378
{{- end }}
7479
{{- end }}

istio-telemetry/kiali/values.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,14 @@ kiali:
8989
cert_file: /kiali-cert/cert-chain.pem
9090
private_key_file: /kiali-cert/key.pem
9191

92+
excludedWorkloads:
93+
- "CronJob"
94+
- "Job"
95+
# Other options are:
96+
# - DeploymentConfig
97+
# - ReplicationController
98+
# - StatefulSet
99+
92100
# Until https://github.com/helm/helm/pull/6876 is available, the only way to really support
93101
# a fully customized Kiali CR is to be able to pass the full spec here. If this is defined,
94102
# most of the settings above will be ignored and this is used for the Kiali CR spec.

0 commit comments

Comments
 (0)