Skip to content

Commit a858b09

Browse files
authored
chore(chart-deps): update kiali-operator to version 2.17.0 (#2591)
1 parent 5d69dbe commit a858b09

File tree

11 files changed

+2164
-12
lines changed

11 files changed

+2164
-12
lines changed

apps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ appsInfo:
154154
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.
155155
kiali:
156156
title: Kiali Operator
157-
appVersion: 2.10.0
157+
appVersion: 2.17.0
158158
repo: https://github.com/kiali/kiali
159159
maintainers: Kiali
160160
relatedLinks:

chart/chart-index/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ dependencies:
6262
version: 7.1.3
6363
repository: https://codecentric.github.io/helm-charts
6464
- name: kiali-operator
65-
version: 2.10.0
65+
version: 2.17.0
6666
repository: https://kiali.org/helm-charts
6767
- name: knative-operator
6868
version: v1.18.1

charts/kiali-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: v2.10.0
2+
appVersion: v2.17.0
33
description: Kiali is an open source project for service mesh observability, refer
44
to https://www.kiali.io for details.
55
home: https://github.com/kiali/kiali-operator
@@ -17,4 +17,4 @@ sources:
1717
- https://github.com/kiali/kiali
1818
- https://github.com/kiali/kiali-operator
1919
- https://github.com/kiali/helm-charts
20-
version: 2.10.0
20+
version: 2.17.0

charts/kiali-operator/crds/crds.yaml

Lines changed: 2028 additions & 1 deletion
Large diffs are not rendered by default.

charts/kiali-operator/templates/NOTES.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
Welcome to Kiali! For more details on Kiali, see: https://kiali.io
22

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

516
{{- if .Values.cr.create }}
617
{{- 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)) }}

charts/kiali-operator/templates/_helpers.tpl

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,18 @@ app.kubernetes.io/name: {{ include "kiali-operator.name" . }}
5656
app.kubernetes.io/instance: {{ .Release.Name }}
5757
{{- end }}
5858

59+
{{/*
60+
Returns true if the given resource kind is in .Values.skipResources
61+
This aborts if .Values.skipResources has invalid values.
62+
*/}}
63+
{{- define "kiali-operator.isSkippedResource" -}}
64+
{{- $validSkipResources := dict "clusterrole" true "clusterrolebinding" true "sa" true }}
65+
{{- $ctx := .ctx }}
66+
{{- $name := .name }}
67+
{{- range $i, $item := $ctx.Values.skipResources }}
68+
{{- if not (hasKey $validSkipResources $item) }}
69+
{{- fail (printf "Aborting due to an invalid entry [%q] in skipResources: %q. Valid list item values are: %q" $item $ctx.Values.skipResources (keys $validSkipResources)) }}
70+
{{- end }}
71+
{{- end }}
72+
{{- has $name $ctx.Values.skipResources }}
73+
{{- end }}

charts/kiali-operator/templates/clusterrole.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if eq "false" (include "kiali-operator.isSkippedResource" (dict "ctx" . "name" "clusterrole")) -}}
12
---
23
apiVersion: rbac.authorization.k8s.io/v1
34
kind: ClusterRole
@@ -135,6 +136,7 @@ rules:
135136
- apiGroups: ["extensions", "networking.k8s.io"]
136137
resources:
137138
- ingresses
139+
- networkpolicies
138140
verbs:
139141
- create
140142
- delete
@@ -275,6 +277,7 @@ rules:
275277
- extensions.istio.io
276278
- telemetry.istio.io
277279
- gateway.networking.k8s.io
280+
- inference.networking.k8s.io
278281
resources: ["*"]
279282
verbs:
280283
- get
@@ -295,11 +298,6 @@ rules:
295298
{{- if eq .Values.onlyViewOnlyMode false }}
296299
- patch
297300
{{- end }}
298-
- apiGroups: ["project.openshift.io"]
299-
resources:
300-
- projects
301-
verbs:
302-
- get
303301
- apiGroups: ["route.openshift.io"]
304302
resources:
305303
- routes
@@ -318,3 +316,4 @@ rules:
318316
- list
319317
- watch
320318
...
319+
{{- end -}}

charts/kiali-operator/templates/clusterrolebinding.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if eq "false" (include "kiali-operator.isSkippedResource" (dict "ctx" . "name" "clusterrolebinding")) -}}
12
---
23
apiVersion: rbac.authorization.k8s.io/v1
34
kind: ClusterRoleBinding
@@ -14,3 +15,4 @@ roleRef:
1415
name: {{ include "kiali-operator.fullname" . }}
1516
apiGroup: rbac.authorization.k8s.io
1617
...
18+
{{- end -}}

charts/kiali-operator/templates/ossmconsole-crd.yaml

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ apiVersion: apiextensions.k8s.io/v1
1212
kind: CustomResourceDefinition
1313
metadata:
1414
name: ossmconsoles.kiali.io
15+
labels:
16+
app: kiali-operator
17+
app.kubernetes.io/name: kiali-operator
1518
spec:
1619
group: kiali.io
1720
names:
@@ -29,6 +32,86 @@ spec:
2932
schema:
3033
openAPIV3Schema:
3134
type: object
32-
x-kubernetes-preserve-unknown-fields: true
35+
properties:
36+
status:
37+
description: "The processing status of this CR as reported by the OpenShift Service Mesh Console Operator."
38+
type: object
39+
x-kubernetes-preserve-unknown-fields: true
40+
spec:
41+
description: "This is the CRD for the resources called OSSMConsole CRs. The OpenShift Service Mesh Console Operator will watch for resources of this type and when it detects an OSSMConsole CR has been added, deleted, or modified, it will install, uninstall, and update the associated OSSM Console installation."
42+
type: object
43+
properties:
44+
version:
45+
description: |
46+
The version of the Ansible role that will be executed in order to install OSSM Console.
47+
This also indirectly determines the version of OSSM Console that will be installed.
48+
You normally will want to use `default` since this is the only officially supported value today.
49+
50+
If not specified, the value of `default` is assumed which means the most recent Ansible role is used;
51+
thus the most recent release of OSSM Console will be installed.
52+
53+
Refer to this file to see what the valid values are for this `version` field (as defined in the master branch),
54+
https://github.com/kiali/kiali-operator/blob/master/playbooks/ossmconsole-default-supported-images.yml
55+
56+
This `version` setting affects the defaults of the `deployment.imageName` and
57+
`deployment.imageVersion` settings. See the documentation for those settings below for
58+
additional details. In short, this `version` setting will dictate which version of the
59+
OSSM Console image will be deployed by default. However, if you explicitly set `deployment.imageName`
60+
and/or `deployment.imageVersion` to reference your own custom image, that will override the
61+
default OSSM Console image to be installed; therefore, you are responsible for ensuring those settings
62+
are compatible with the Ansible role that will be executed in order to install OSSM Console (i.e. your
63+
custom OSSM Console image must be compatible with the rest of the configuration and resources the
64+
operator will install).
65+
type: string
66+
deployment:
67+
type: object
68+
properties:
69+
imageDigest:
70+
description: "If `deployment.imageVersion` is a digest hash, this value indicates what type of digest it is. A typical value would be 'sha256'. Note: do NOT prefix this value with a '@'."
71+
type: string
72+
imageName:
73+
description: "Determines which OSSM Console image to download and install. If you set this to a specific name (i.e. you do not leave it as the default empty string), you must make sure that image is supported by the operator. If empty, the operator will use a known supported image name based on which `version` was defined. Note that, as a security measure, a cluster admin may have configured the operator to ignore this setting. A cluster admin may do this to ensure the operator only installs a single, specific OSSM Console version, thus this setting may have no effect depending on how the operator itself was configured."
74+
type: string
75+
imagePullPolicy:
76+
description: "The Kubernetes pull policy for the OSSM Console deployment. This is overridden to be 'Always' if `deployment.imageVersion` is set to 'latest'."
77+
type: string
78+
default: "IfNotPresent"
79+
imagePullSecrets:
80+
description: "The names of the secrets to be used when container images are to be pulled."
81+
type: array
82+
items:
83+
type: string
84+
imageVersion:
85+
description: |
86+
Determines which version of OSSM Console to install.
87+
Choose 'lastrelease' to use the last OSSM Console release.
88+
Choose 'latest' to use the latest image (which may or may not be a released version of the OSSM Console).
89+
Choose 'operator_version' to use the image whose version is the same as the operator version.
90+
Otherwise, you can set this to any valid OSSM Console version (such as 'v1.0') or any valid OSSM Console
91+
digest hash (if you set this to a digest hash, you must indicate the digest in `deployment.imageDigest`).
92+
Note that if this is set to 'latest' then the `deployment.imagePullPolicy` will be set to 'Always'.
93+
If you set this to a specific version (i.e. you do not leave it as the default empty string),
94+
you must make sure that image is supported by the operator.
95+
If empty, the operator will use a known supported image version based on which 'version' was defined.
96+
Note that, as a security measure, a cluster admin may have configured the operator to
97+
ignore this setting. A cluster admin may do this to ensure the operator only installs
98+
a single, specific OSSM Console version, thus this setting may have no effect depending on how the
99+
operator itself was configured.
100+
type: string
101+
namespace:
102+
description: "The namespace into which OSSM Console is to be installed. If this is empty or not defined, the default will be the namespace where the OSSMConsole CR is located. Currently the only namespace supported is the namespace where the OSSMConsole CR is located."
103+
type: string
104+
kiali:
105+
type: object
106+
properties:
107+
serviceName:
108+
description: "The internal Kiali service that the OpenShift Console will use to proxy API calls. If empty, an attempt will be made to auto-discover it from the Kiali OpenShift Route."
109+
type: string
110+
serviceNamespace:
111+
description: "The namespace where the Kiali service is deployed. If empty, an attempt will be made to auto-discover it from the Kiali OpenShift Route. It will assume that the OpenShift Route and the Kiali service are deployed in the same namespace."
112+
type: string
113+
servicePort:
114+
description: "The internal port used by the Kiali service for the API. If empty, an attempt will be made to auto-discover it from the Kiali OpenShift Route."
115+
type: integer
33116
...
34117
{{- end }}

charts/kiali-operator/templates/serviceaccount.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if eq "false" (include "kiali-operator.isSkippedResource" (dict "ctx" . "name" "sa")) -}}
12
---
23
apiVersion: v1
34
kind: ServiceAccount
@@ -13,3 +14,4 @@ imagePullSecrets:
1314
{{- end }}
1415
{{- end }}
1516
...
17+
{{- end -}}

0 commit comments

Comments
 (0)