Skip to content

Commit

Permalink
incorporate the changes that are made in
Browse files Browse the repository at this point in the history
PR istio#548
for issue istio/istio#18819
by adding excludedWorkloads
  • Loading branch information
jmazzitelli committed Nov 19, 2019
1 parent 3a2d38c commit 3505879
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 9 deletions.
23 changes: 14 additions & 9 deletions istio-telemetry/kiali/templates/kialicr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
8 changes: 8 additions & 0 deletions istio-telemetry/kiali/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 3505879

Please sign in to comment.