Skip to content

Commit 36de920

Browse files
my-git9my-git9
authored
addons: Bump addons version (#57887)
Signed-off-by: xin.li <[email protected]>
1 parent 298fbd7 commit 36de920

File tree

3 files changed

+50
-53
lines changed

3 files changed

+50
-53
lines changed

‎manifests/addons/gen.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ ADDONS="${WD}/../../samples/addons"
2626
DASHBOARDS="${WD}/dashboards"
2727
mkdir -p "${ADDONS}"
2828
TMP=$(mktemp -d)
29-
LOKI_VERSION=${LOKI_VERSION:-"6.38.0"}
29+
LOKI_VERSION=${LOKI_VERSION:-"6.42.0"}
3030
GRAFANA_VERSION=${GRAFANA_VERSION:-"9.2.2"}
3131

3232
# Set up kiali
3333
{
3434
helm3 template kiali-server \
3535
--namespace istio-system \
36-
--version 2.15.0 \
37-
--set deployment.image_version=v2.13 \
36+
--version 2.16.0 \
37+
--set deployment.image_version=v2.16 \
3838
--include-crds \
3939
kiali-server \
4040
--repo https://kiali.org/helm-charts \

‎samples/addons/kiali.yaml‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ metadata:
77
namespace: "istio-system"
88
labels:
99

10-
helm.sh/chart: kiali-server-2.15.0
10+
helm.sh/chart: kiali-server-2.16.0
1111
app: kiali
1212
app.kubernetes.io/name: kiali
1313
app.kubernetes.io/instance: kiali
14-
version: "v2.15.0"
15-
app.kubernetes.io/version: "v2.15.0"
14+
version: "v2.16.0"
15+
app.kubernetes.io/version: "v2.16.0"
1616
app.kubernetes.io/part-of: "kiali"
1717
...
1818
---
@@ -24,12 +24,12 @@ metadata:
2424
namespace: "istio-system"
2525
labels:
2626

27-
helm.sh/chart: kiali-server-2.15.0
27+
helm.sh/chart: kiali-server-2.16.0
2828
app: kiali
2929
app.kubernetes.io/name: kiali
3030
app.kubernetes.io/instance: kiali
31-
version: "v2.15.0"
32-
app.kubernetes.io/version: "v2.15.0"
31+
version: "v2.16.0"
32+
app.kubernetes.io/version: "v2.16.0"
3333
app.kubernetes.io/part-of: "kiali"
3434
data:
3535
config.yaml: |
@@ -69,7 +69,7 @@ data:
6969
image_name: quay.io/kiali/kiali
7070
image_pull_policy: IfNotPresent
7171
image_pull_secrets: []
72-
image_version: v2.13
72+
image_version: v2.16
7373
ingress:
7474
additional_labels: {}
7575
class_name: nginx
@@ -114,7 +114,7 @@ data:
114114
service_type: ""
115115
tolerations: []
116116
topology_spread_constraints: []
117-
version_label: v2.15.0
117+
version_label: v2.16.0
118118
view_only_mode: false
119119
external_services:
120120
custom_dashboards:
@@ -150,12 +150,12 @@ metadata:
150150
name: kiali
151151
labels:
152152

153-
helm.sh/chart: kiali-server-2.15.0
153+
helm.sh/chart: kiali-server-2.16.0
154154
app: kiali
155155
app.kubernetes.io/name: kiali
156156
app.kubernetes.io/instance: kiali
157-
version: "v2.15.0"
158-
app.kubernetes.io/version: "v2.15.0"
157+
version: "v2.16.0"
158+
app.kubernetes.io/version: "v2.16.0"
159159
app.kubernetes.io/part-of: "kiali"
160160
rules:
161161
- apiGroups: [""]
@@ -227,11 +227,6 @@ rules:
227227
- list
228228
- watch
229229
- patch
230-
- apiGroups: ["project.openshift.io"]
231-
resources:
232-
- projects
233-
verbs:
234-
- get
235230
- apiGroups: ["route.openshift.io"]
236231
resources:
237232
- routes
@@ -265,12 +260,12 @@ metadata:
265260
name: kiali
266261
labels:
267262

268-
helm.sh/chart: kiali-server-2.15.0
263+
helm.sh/chart: kiali-server-2.16.0
269264
app: kiali
270265
app.kubernetes.io/name: kiali
271266
app.kubernetes.io/instance: kiali
272-
version: "v2.15.0"
273-
app.kubernetes.io/version: "v2.15.0"
267+
version: "v2.16.0"
268+
app.kubernetes.io/version: "v2.16.0"
274269
app.kubernetes.io/part-of: "kiali"
275270
roleRef:
276271
apiGroup: rbac.authorization.k8s.io
@@ -290,12 +285,12 @@ metadata:
290285
namespace: "istio-system"
291286
labels:
292287

293-
helm.sh/chart: kiali-server-2.15.0
288+
helm.sh/chart: kiali-server-2.16.0
294289
app: kiali
295290
app.kubernetes.io/name: kiali
296291
app.kubernetes.io/instance: kiali
297-
version: "v2.15.0"
298-
app.kubernetes.io/version: "v2.15.0"
292+
version: "v2.16.0"
293+
app.kubernetes.io/version: "v2.16.0"
299294
app.kubernetes.io/part-of: "kiali"
300295
annotations:
301296
spec:
@@ -321,12 +316,12 @@ metadata:
321316
namespace: "istio-system"
322317
labels:
323318

324-
helm.sh/chart: kiali-server-2.15.0
319+
helm.sh/chart: kiali-server-2.16.0
325320
app: kiali
326321
app.kubernetes.io/name: kiali
327322
app.kubernetes.io/instance: kiali
328-
version: "v2.15.0"
329-
app.kubernetes.io/version: "v2.15.0"
323+
version: "v2.16.0"
324+
app.kubernetes.io/version: "v2.16.0"
330325
app.kubernetes.io/part-of: "kiali"
331326
spec:
332327
replicas: 1
@@ -344,24 +339,24 @@ spec:
344339
name: kiali
345340
labels:
346341

347-
helm.sh/chart: kiali-server-2.15.0
342+
helm.sh/chart: kiali-server-2.16.0
348343
app: kiali
349344
app.kubernetes.io/name: kiali
350345
app.kubernetes.io/instance: kiali
351-
version: "v2.15.0"
352-
app.kubernetes.io/version: "v2.15.0"
346+
version: "v2.16.0"
347+
app.kubernetes.io/version: "v2.16.0"
353348
app.kubernetes.io/part-of: "kiali"
354349
sidecar.istio.io/inject: "false"
355350
annotations:
356-
checksum/config: 152c1bb4fdda62061cd7e71c0fd583fd007a62d5af751876b2d6016c80619109
351+
checksum/config: 580a9fd573cf01d964d19ff5c3659dba6c86e70ba728e5ce4f32e679d216cec2
357352
prometheus.io/scrape: "true"
358353
prometheus.io/port: "9090"
359354
kiali.io/dashboards: go,kiali
360355
proxy.istio.io/config: '{ "holdApplicationUntilProxyStarts": true }'
361356
spec:
362357
serviceAccountName: kiali
363358
containers:
364-
- image: "quay.io/kiali/kiali:v2.13"
359+
- image: "quay.io/kiali/kiali:v2.16"
365360
imagePullPolicy: IfNotPresent
366361
name: kiali
367362
command:

‎samples/addons/loki.yaml‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: loki
77
namespace: istio-system
88
labels:
9-
helm.sh/chart: loki-6.38.0
9+
helm.sh/chart: loki-6.42.0
1010
app.kubernetes.io/name: loki
1111
app.kubernetes.io/instance: loki
12-
app.kubernetes.io/version: "3.5.3"
12+
app.kubernetes.io/version: "3.5.5"
1313
automountServiceAccountToken: true
1414
---
1515
# Source: loki/templates/config.yaml
@@ -19,10 +19,10 @@ metadata:
1919
name: loki
2020
namespace: istio-system
2121
labels:
22-
helm.sh/chart: loki-6.38.0
22+
helm.sh/chart: loki-6.42.0
2323
app.kubernetes.io/name: loki
2424
app.kubernetes.io/instance: loki
25-
app.kubernetes.io/version: "3.5.3"
25+
app.kubernetes.io/version: "3.5.5"
2626
data:
2727
config.yaml: |
2828
@@ -109,10 +109,10 @@ metadata:
109109
name: loki-runtime
110110
namespace: istio-system
111111
labels:
112-
helm.sh/chart: loki-6.38.0
112+
helm.sh/chart: loki-6.42.0
113113
app.kubernetes.io/name: loki
114114
app.kubernetes.io/instance: loki
115-
app.kubernetes.io/version: "3.5.3"
115+
app.kubernetes.io/version: "3.5.5"
116116
data:
117117
runtime-config.yaml: |
118118
{}
@@ -122,10 +122,10 @@ kind: ClusterRole
122122
apiVersion: rbac.authorization.k8s.io/v1
123123
metadata:
124124
labels:
125-
helm.sh/chart: loki-6.38.0
125+
helm.sh/chart: loki-6.42.0
126126
app.kubernetes.io/name: loki
127127
app.kubernetes.io/instance: loki
128-
app.kubernetes.io/version: "3.5.3"
128+
app.kubernetes.io/version: "3.5.5"
129129
name: loki-clusterrole
130130
rules:
131131
- apiGroups: [""] # "" indicates the core API group
@@ -138,10 +138,10 @@ apiVersion: rbac.authorization.k8s.io/v1
138138
metadata:
139139
name: loki-clusterrolebinding
140140
labels:
141-
helm.sh/chart: loki-6.38.0
141+
helm.sh/chart: loki-6.42.0
142142
app.kubernetes.io/name: loki
143143
app.kubernetes.io/instance: loki
144-
app.kubernetes.io/version: "3.5.3"
144+
app.kubernetes.io/version: "3.5.5"
145145
subjects:
146146
- kind: ServiceAccount
147147
name: loki
@@ -158,10 +158,10 @@ metadata:
158158
name: loki-memberlist
159159
namespace: istio-system
160160
labels:
161-
helm.sh/chart: loki-6.38.0
161+
helm.sh/chart: loki-6.42.0
162162
app.kubernetes.io/name: loki
163163
app.kubernetes.io/instance: loki
164-
app.kubernetes.io/version: "3.5.3"
164+
app.kubernetes.io/version: "3.5.5"
165165
annotations:
166166
spec:
167167
type: ClusterIP
@@ -183,10 +183,10 @@ metadata:
183183
name: loki-headless
184184
namespace: istio-system
185185
labels:
186-
helm.sh/chart: loki-6.38.0
186+
helm.sh/chart: loki-6.42.0
187187
app.kubernetes.io/name: loki
188188
app.kubernetes.io/instance: loki
189-
app.kubernetes.io/version: "3.5.3"
189+
app.kubernetes.io/version: "3.5.5"
190190
variant: headless
191191
prometheus.io/service-monitor: "false"
192192
annotations:
@@ -208,10 +208,10 @@ metadata:
208208
name: loki
209209
namespace: istio-system
210210
labels:
211-
helm.sh/chart: loki-6.38.0
211+
helm.sh/chart: loki-6.42.0
212212
app.kubernetes.io/name: loki
213213
app.kubernetes.io/instance: loki
214-
app.kubernetes.io/version: "3.5.3"
214+
app.kubernetes.io/version: "3.5.5"
215215
annotations:
216216
spec:
217217
type: ClusterIP
@@ -236,10 +236,10 @@ metadata:
236236
name: loki
237237
namespace: istio-system
238238
labels:
239-
helm.sh/chart: loki-6.38.0
239+
helm.sh/chart: loki-6.42.0
240240
app.kubernetes.io/name: loki
241241
app.kubernetes.io/instance: loki
242-
app.kubernetes.io/version: "3.5.3"
242+
app.kubernetes.io/version: "3.5.5"
243243
app.kubernetes.io/component: single-binary
244244
app.kubernetes.io/part-of: memberlist
245245
spec:
@@ -282,7 +282,7 @@ spec:
282282
terminationGracePeriodSeconds: 30
283283
containers:
284284
- name: loki
285-
image: docker.io/grafana/loki:3.5.3
285+
image: docker.io/grafana/loki:3.5.5
286286
imagePullPolicy: IfNotPresent
287287
args:
288288
- -config.file=/etc/loki/config/config.yaml
@@ -323,7 +323,7 @@ spec:
323323
resources:
324324
{}
325325
- name: loki-sc-rules
326-
image: "kiwigrid/k8s-sidecar:1.30.7"
326+
image: "docker.io/kiwigrid/k8s-sidecar:1.30.10"
327327
imagePullPolicy: IfNotPresent
328328
env:
329329
- name: METHOD
@@ -355,6 +355,8 @@ spec:
355355
- labelSelector:
356356
matchLabels:
357357
app.kubernetes.io/component: single-binary
358+
app.kubernetes.io/instance: 'loki'
359+
app.kubernetes.io/name: 'loki'
358360
topologyKey: kubernetes.io/hostname
359361
volumes:
360362
- name: tmp

0 commit comments

Comments
 (0)