Skip to content

Commit 600f584

Browse files
srodenhuisAni1357
andauthored
feat: upgrade Istio Knative and Kiali (#1736)
Co-authored-by: Ani Argjiri <[email protected]>
1 parent 2401eac commit 600f584

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+4642
-6539
lines changed

charts/istio-operator/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v1
22
name: istio-operator
33
# This version is never actually shipped. istio/release-builder will replace it at build-time
44
# with the appropriate version
5-
version: 1.20.5
6-
appVersion: 1.20.5
5+
version: 1.0.0
6+
appVersion: 1.0.0
77
tillerVersion: ">=2.7.2"
88
description: Helm chart for deploying Istio operator
99
keywords:

charts/istio-operator/templates/clusterrole.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,18 @@ rules:
3535
- '*'
3636
verbs:
3737
- '*'
38+
- apiGroups:
39+
- telemetry.istio.io
40+
resources:
41+
- '*'
42+
verbs:
43+
- '*'
44+
- apiGroups:
45+
- extensions.istio.io
46+
resources:
47+
- '*'
48+
verbs:
49+
- '*'
3850
# k8s groups
3951
- apiGroups:
4052
- admissionregistration.k8s.io

charts/istio-operator/values.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
12
hub: docker.io/istio
2-
tag: 1.20.5
3+
tag: 1.22.1
34

45
# ImagePullSecrets for operator ServiceAccount, list of secrets in the same namespace
56
# used to pull operator image. Must be set for any cluster configured with private docker registry.

charts/kiali-operator/Chart.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
apiVersion: v2
2-
appVersion: v1.76.0
3-
description: Kiali is an open source project for service mesh observability, refer
4-
to https://www.kiali.io for details.
2+
name: kiali-operator
3+
description: Kiali is an open source project for service mesh observability, refer to https://www.kiali.io for details.
4+
version: 1.86.1
5+
appVersion: v1.86.1
56
home: https://github.com/kiali/kiali-operator
6-
icon: https://raw.githubusercontent.com/kiali/kiali.io/current/assets/icons/logo.svg
7+
maintainers:
8+
- name: Kiali
9+
10+
url: https://kiali.io
711
keywords:
812
- istio
913
- kiali
1014
- operator
11-
maintainers:
12-
13-
name: Kiali
14-
url: https://kiali.io
15-
name: kiali-operator
1615
sources:
1716
- https://github.com/kiali/kiali
1817
- https://github.com/kiali/kiali-operator
1918
- https://github.com/kiali/helm-charts
20-
version: 1.76.0
19+
icon: https://raw.githubusercontent.com/kiali/kiali.io/current/assets/icons/logo.svg

charts/kiali-operator/crds/crds.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ spec:
2121
openAPIV3Schema:
2222
type: object
2323
x-kubernetes-preserve-unknown-fields: true
24-
...
24+
---

charts/kiali-operator/templates/clusterrole.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,4 +312,4 @@ rules:
312312
- tokenreviews
313313
verbs:
314314
- create
315-
...
315+
---

charts/kiali-operator/templates/clusterrolebinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ roleRef:
1313
kind: ClusterRole
1414
name: {{ include "kiali-operator.fullname" . }}
1515
apiGroup: rbac.authorization.k8s.io
16-
...
16+
---

charts/kiali-operator/templates/deployment.yaml

+20-9
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,22 @@ spec:
4949
args:
5050
- "--zap-log-level=info"
5151
- "--leader-election-id={{ include "kiali-operator.fullname" . }}"
52-
{{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }}
53-
- "--watches-file=./watches-os.yaml"
54-
{{- else }}
55-
- "--watches-file=./watches-k8s.yaml"
56-
{{- end }}
52+
- "--watches-file=./$(WATCHES_FILE)"
5753
securityContext:
5854
{{- if .Values.securityContext }}
5955
{{- toYaml .Values.securityContext | nindent 10 }}
6056
{{- else }}
6157
allowPrivilegeEscalation: false
6258
privileged: false
6359
runAsNonRoot: true
60+
readOnlyRootFilesystem: true
6461
capabilities:
6562
drop:
6663
- ALL
6764
{{- end }}
6865
volumeMounts:
69-
- mountPath: /tmp/ansible-operator/runner
70-
name: runner
66+
- mountPath: /tmp
67+
name: tmp
7168
env:
7269
- name: WATCH_NAMESPACE
7370
value: {{ .Values.watchNamespace | default "\"\"" }}
@@ -109,6 +106,20 @@ spec:
109106
{{- else }}
110107
value: "/etc/ansible/ansible.cfg"
111108
{{- end }}
109+
- name: ANSIBLE_LOCAL_TEMP
110+
value: "/tmp/ansible/tmp"
111+
- name: ANSIBLE_REMOTE_TEMP
112+
value: "/tmp/ansible/tmp"
113+
- name: WATCHES_FILE
114+
{{- if .Values.watchesFile }}
115+
value: "{{ .Values.watchesFile }}"
116+
{{- else }}
117+
{{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }}
118+
value: "watches-os.yaml"
119+
{{- else }}
120+
value: "watches-k8s.yaml"
121+
{{- end }}
122+
{{- end }}
112123
{{- if .Values.env }}
113124
{{- toYaml .Values.env | nindent 8 }}
114125
{{- end }}
@@ -120,8 +131,8 @@ spec:
120131
{{- toYaml .Values.resources | nindent 10 }}
121132
{{- end }}
122133
volumes:
123-
- name: runner
134+
- name: tmp
124135
emptyDir: {}
125136
affinity:
126137
{{- toYaml .Values.affinity | nindent 8 }}
127-
...
138+
---

charts/kiali-operator/templates/kiali-cr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ metadata:
1818
{{- end }}
1919
spec:
2020
{{- toYaml .Values.cr.spec | nindent 2 }}
21-
...
21+
---
2222
{{ end }}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ spec:
3030
openAPIV3Schema:
3131
type: object
3232
x-kubernetes-preserve-unknown-fields: true
33-
...
33+
---
3434
{{- end }}

charts/kiali-operator/templates/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ imagePullSecrets:
1212
- name: {{ . }}
1313
{{- end }}
1414
{{- end }}
15-
...
15+
---

charts/kiali-operator/values.yaml

+10-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ nameOverride: ""
22
fullnameOverride: ""
33

44
image: # see: https://quay.io/repository/kiali/kiali-operator?tab=tags
5-
repo: quay.io/kiali/kiali-operator # quay.io/kiali/kiali-operator
6-
tag: v1.76.0 # version string like v1.39.0 or a digest hash
5+
repo: ${HELM_IMAGE_REPO} # quay.io/kiali/kiali-operator
6+
tag: ${HELM_IMAGE_TAG} # version string like v1.39.0 or a digest hash
77
digest: "" # use "sha256" if tag is a sha256 hash (do NOT prefix this value with a "@")
88
pullPolicy: Always
99
pullSecrets: []
@@ -99,6 +99,14 @@ allowAllAccessibleNamespaces: true
9999
# of the Istio control plane namespace (which is typically, but not necessarily, "istio-system").
100100
accessibleNamespacesLabel: ""
101101

102+
# watchesFile: If specified, this determines what watches file will be used to configure the operator. There are four different
103+
# files that can be selected: (a) `watches-os.yaml`, (b) `watches-os-ns.yaml`, (c) `watches-k8s.yaml` or (d) `watches-k8s-ns.yaml`.
104+
# The first two are for OpenShift only, the last two are for non-OpenShift Kubernetes clusters. The two with "-ns" in their name
105+
# enable the operator to automatically update the Kiali Server with access to new namespaces as those namespaces are created in
106+
# the cluster. This namespace watching feature provides some advanced capabilities but is never required. It is also not
107+
# the default behavior and is not necessary if your Kiali CRs will have `spec.deployment.cluster_wide_access` set to `true`.
108+
watchesFile: ""
109+
102110
# For what a Kiali CR spec can look like, see:
103111
# https://github.com/kiali/kiali-operator/blob/master/deploy/kiali/kiali_cr.yaml
104112
cr:

0 commit comments

Comments
 (0)