Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ appsInfo:
integration: The SSO login page for APL is served by Keycloak. Keycloak is used as an identity broker or provider for all APL integrated applications. By default Keycloak is configured as an Identity Broker. Keycloak is part of the core of APL and is always enabled.
kiali:
title: Kiali Operator
appVersion: 2.10.0
appVersion: 2.14.0
repo: https://github.com/kiali/kiali
maintainers: Kiali
relatedLinks:
Expand Down
2 changes: 1 addition & 1 deletion chart/chart-index/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies:
version: 24.9.0
repository: https://charts.bitnami.com/bitnami
- name: kiali-operator
version: 2.10.0
version: 2.14.0
repository: https://kiali.org/helm-charts
- name: knative-operator
version: 1.18.1
Expand Down
4 changes: 2 additions & 2 deletions charts/kiali-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: v2.10.0
appVersion: v2.14.0
description: Kiali is an open source project for service mesh observability, refer
to https://www.kiali.io for details.
home: https://github.com/kiali/kiali-operator
Expand All @@ -17,4 +17,4 @@ sources:
- https://github.com/kiali/kiali
- https://github.com/kiali/kiali-operator
- https://github.com/kiali/helm-charts
version: 2.10.0
version: 2.14.0
11 changes: 11 additions & 0 deletions charts/kiali-operator/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
Welcome to Kiali! For more details on Kiali, see: https://kiali.io

{{- if .Values.skipResources }}
The Kiali Operator [{{ .Chart.AppVersion }}] has been installed in namespace [{{ .Release.Namespace }}].
===============
!!! WARNING !!!
===============
You have configured the "skipResources" setting. This helm chart will not create or manage those resources.
It is your responsibility to manually create those resources yourself. Until you create those
resources with their correct configurations, the operator WILL NOT work.
{{- else }}
The Kiali Operator [{{ .Chart.AppVersion }}] has been installed in namespace [{{ .Release.Namespace }}]. It will be ready soon.
{{- end }}
===============

{{- if .Values.cr.create }}
{{- if or (and (not .Values.watchNamespace) (not .Values.cr.namespace)) (and (.Values.watchNamespace) (eq .Values.watchNamespace .Release.Namespace)) (and (.Values.cr.namespace) (eq .Values.cr.namespace .Release.Namespace)) }}
Expand Down
15 changes: 15 additions & 0 deletions charts/kiali-operator/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,18 @@ app.kubernetes.io/name: {{ include "kiali-operator.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
Returns true if the given resource kind is in .Values.skipResources
This aborts if .Values.skipResources has invalid values.
*/}}
{{- define "kiali-operator.isSkippedResource" -}}
{{- $validSkipResources := dict "clusterrole" true "clusterrolebinding" true "sa" true }}
{{- $ctx := .ctx }}
{{- $name := .name }}
{{- range $i, $item := $ctx.Values.skipResources }}
{{- if not (hasKey $validSkipResources $item) }}
{{- fail (printf "Aborting due to an invalid entry [%q] in skipResources: %q. Valid list item values are: %q" $item $ctx.Values.skipResources (keys $validSkipResources)) }}
{{- end }}
{{- end }}
{{- has $name $ctx.Values.skipResources }}
{{- end }}
3 changes: 3 additions & 0 deletions charts/kiali-operator/templates/clusterrole.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if eq "false" (include "kiali-operator.isSkippedResource" (dict "ctx" . "name" "clusterrole")) -}}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand Down Expand Up @@ -275,6 +276,7 @@ rules:
- extensions.istio.io
- telemetry.istio.io
- gateway.networking.k8s.io
- inference.networking.x-k8s.io
resources: ["*"]
verbs:
- get
Expand Down Expand Up @@ -318,3 +320,4 @@ rules:
- list
- watch
...
{{- end -}}
2 changes: 2 additions & 0 deletions charts/kiali-operator/templates/clusterrolebinding.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if eq "false" (include "kiali-operator.isSkippedResource" (dict "ctx" . "name" "clusterrolebinding")) -}}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand All @@ -14,3 +15,4 @@ roleRef:
name: {{ include "kiali-operator.fullname" . }}
apiGroup: rbac.authorization.k8s.io
...
{{- end -}}
2 changes: 2 additions & 0 deletions charts/kiali-operator/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if eq "false" (include "kiali-operator.isSkippedResource" (dict "ctx" . "name" "sa")) -}}
---
apiVersion: v1
kind: ServiceAccount
Expand All @@ -13,3 +14,4 @@ imagePullSecrets:
{{- end }}
{{- end }}
...
{{- end -}}
15 changes: 14 additions & 1 deletion charts/kiali-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fullnameOverride: ""

image: # see: https://quay.io/repository/kiali/kiali-operator?tab=tags
repo: quay.io/kiali/kiali-operator # quay.io/kiali/kiali-operator
tag: v2.10.0 # version string like v1.39.0 or a digest hash
tag: v2.14.0 # version string like v1.39.0 or a digest hash
digest: "" # use "sha256" if tag is a sha256 hash (do NOT prefix this value with a "@")
pullPolicy: Always
pullSecrets: []
Expand All @@ -24,6 +24,19 @@ replicaCount: 1
priorityClassName: ""
securityContext: {}

# This helm chart will create Kubernetes resources such as cluster roles, cluster role bindings, and service accounts.
# For very rare use-cases, users may want to manage some of these resources manually, outside
# of this helm chart. In cases like this, you can inform this helm chart to skip the creation of
# those resources that you want to manage yourself.
# For example, if you want to manage cluster roles and cluster role bindings yourself, but you still want this helm
# chart to create service accounts, set the value of "skipResources" to an array
# value of ["clusterrole", "clusterrolebinding"].
# If you use this feature, you must be aware that you then bear the responsibility of
# creating these resources yourself manually; if you do not then the installation
# will be broken. Therefore, only use this feature if you know what you are doing.
# Valid list item values are: "clusterrole", "clusterrolebinding", "sa"
skipResources: []

# metrics.enabled: set to true if you want Prometheus to collect metrics from the operator
metrics:
enabled: true
Expand Down