Skip to content

Commit fac811c

Browse files
authored
bump istio to v1.20.2 (knative-extensions#1237)
1 parent 04509ce commit fac811c

File tree

17 files changed

+424
-116
lines changed

17 files changed

+424
-116
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
go.uber.org/zap v1.26.0
88
golang.org/x/sync v0.6.0
99
google.golang.org/protobuf v1.32.0
10-
istio.io/api v1.20.0
11-
istio.io/client-go v1.20.0
10+
istio.io/api v1.20.2
11+
istio.io/client-go v1.20.2
1212
k8s.io/api v0.28.5
1313
k8s.io/apimachinery v0.28.5
1414
k8s.io/client-go v0.28.5

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,10 +666,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
666666
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
667667
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
668668
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
669-
istio.io/api v1.20.0 h1:heE1eQoMsuZlwWOf7Xm8TKqKLNKVs11G/zMe5QyR1u4=
670-
istio.io/api v1.20.0/go.mod h1:hm1PE/mGdIAsjCDkTIAplP53H7TjO5LUQCiVvF26SVg=
671-
istio.io/client-go v1.20.0 h1:TSSv6A4sYvuBtoKOwyuRmBmPwSb4s++lWlh7RB7+7gY=
672-
istio.io/client-go v1.20.0/go.mod h1:6D76gZsdjz8JtVeIarUYdOn3WA8Zh+j8fIv2+2K3M+Q=
669+
istio.io/api v1.20.2 h1:VjkJB1EfrZt77bcavr1P/3PrO8AP3lOSQsYiYOnGGBU=
670+
istio.io/api v1.20.2/go.mod h1:hm1PE/mGdIAsjCDkTIAplP53H7TjO5LUQCiVvF26SVg=
671+
istio.io/client-go v1.20.2 h1:FL99qw5f5W+QFPHutLpGOoPmoKgLwNFrGCEemAvLm00=
672+
istio.io/client-go v1.20.2/go.mod h1:mub0nwPDAj98cjns7KYLzbvDk0Fg9rx0k2o+KZ4UIUY=
673673
k8s.io/api v0.28.5 h1:XIPNr3nBgTEaCdEiwZ+dXaO9SB4NeTOZ2pNDRrFgfb4=
674674
k8s.io/api v0.28.5/go.mod h1:98zkTCc60iSnqqCIyCB1GI7PYDiRDYTSfL0PRIxpM4c=
675675
k8s.io/apiextensions-apiserver v0.28.5 h1:YKW9O9T/0Gkyl6LTFDLIhCbouSRh+pHt2vMLB38Snfc=

hack/update-k8s-deps.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

third_party/istio-latest/generate-manifests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616

1717
source "$(dirname $0)/../library.sh"
1818

19-
generate "1.20.0" "$(dirname $0)"
19+
generate "1.20.2" "$(dirname $0)"

third_party/istio-latest/istio-ci-ambient/istio.yaml

Lines changed: 91 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -85,31 +85,48 @@ metadata:
8585
istio.io/rev: default
8686
operator.istio.io/component: Cni
8787
release: istio
88-
name: istio-cni-repair-role
88+
name: istio-cni-ambient
8989
rules:
9090
- apiGroups:
9191
- ""
9292
resources:
93-
- pods
93+
- pods/status
9494
verbs:
95-
- get
96-
- list
97-
- watch
98-
- delete
9995
- patch
10096
- update
97+
---
98+
apiVersion: rbac.authorization.k8s.io/v1
99+
kind: ClusterRole
100+
metadata:
101+
labels:
102+
app: istio-cni
103+
install.operator.istio.io/owning-resource: unknown
104+
istio.io/rev: default
105+
operator.istio.io/component: Cni
106+
release: istio
107+
name: istio-cni-repair-role
108+
rules:
101109
- apiGroups:
102110
- ""
103111
resources:
104112
- events
105113
verbs:
114+
- create
115+
- patch
116+
- apiGroups:
117+
- ""
118+
resources:
119+
- pods
120+
verbs:
121+
- watch
106122
- get
107123
- list
108-
- watch
124+
- apiGroups:
125+
- ""
126+
resources:
127+
- pods
128+
verbs:
109129
- delete
110-
- patch
111-
- update
112-
- create
113130
---
114131
apiVersion: rbac.authorization.k8s.io/v1
115132
kind: ClusterRole
@@ -466,6 +483,24 @@ subjects:
466483
---
467484
apiVersion: rbac.authorization.k8s.io/v1
468485
kind: ClusterRoleBinding
486+
metadata:
487+
labels:
488+
install.operator.istio.io/owning-resource: unknown
489+
istio.io/rev: default
490+
k8s-app: istio-cni-repair
491+
operator.istio.io/component: Cni
492+
name: istio-cni-ambient
493+
roleRef:
494+
apiGroup: rbac.authorization.k8s.io
495+
kind: ClusterRole
496+
name: istio-cni-ambient
497+
subjects:
498+
- kind: ServiceAccount
499+
name: istio-cni
500+
namespace: istio-system
501+
---
502+
apiVersion: rbac.authorization.k8s.io/v1
503+
kind: ClusterRoleBinding
469504
metadata:
470505
labels:
471506
install.operator.istio.io/owning-resource: unknown
@@ -828,14 +863,19 @@ spec:
828863
type: object
829864
type: object
830865
targetRef:
866+
description: Optional.
831867
properties:
832868
group:
869+
description: group is the group of the target resource.
833870
type: string
834871
kind:
872+
description: kind is kind of the target resource.
835873
type: string
836874
name:
875+
description: name is the name of the target resource.
837876
type: string
838877
namespace:
878+
description: namespace is the namespace of the referent.
839879
type: string
840880
type: object
841881
type: object
@@ -1023,14 +1063,19 @@ spec:
10231063
type: object
10241064
type: object
10251065
targetRef:
1066+
description: Optional.
10261067
properties:
10271068
group:
1069+
description: group is the group of the target resource.
10281070
type: string
10291071
kind:
1072+
description: kind is kind of the target resource.
10301073
type: string
10311074
name:
1075+
description: name is the name of the target resource.
10321076
type: string
10331077
namespace:
1078+
description: namespace is the namespace of the referent.
10341079
type: string
10351080
type: object
10361081
type: object
@@ -1607,7 +1652,7 @@ spec:
16071652
description: The name of the secret that holds the TLS certs for the client including the CA certificates.
16081653
type: string
16091654
insecureSkipVerify:
1610-
description: InsecureSkipVerify specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.
1655+
description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.'
16111656
nullable: true
16121657
type: boolean
16131658
mode:
@@ -1645,7 +1690,7 @@ spec:
16451690
description: The name of the secret that holds the TLS certs for the client including the CA certificates.
16461691
type: string
16471692
insecureSkipVerify:
1648-
description: InsecureSkipVerify specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.
1693+
description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.'
16491694
nullable: true
16501695
type: boolean
16511696
mode:
@@ -2191,7 +2236,7 @@ spec:
21912236
description: The name of the secret that holds the TLS certs for the client including the CA certificates.
21922237
type: string
21932238
insecureSkipVerify:
2194-
description: InsecureSkipVerify specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.
2239+
description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.'
21952240
nullable: true
21962241
type: boolean
21972242
mode:
@@ -2229,7 +2274,7 @@ spec:
22292274
description: The name of the secret that holds the TLS certs for the client including the CA certificates.
22302275
type: string
22312276
insecureSkipVerify:
2232-
description: InsecureSkipVerify specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.
2277+
description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.'
22332278
nullable: true
22342279
type: boolean
22352280
mode:
@@ -2827,7 +2872,7 @@ spec:
28272872
description: The name of the secret that holds the TLS certs for the client including the CA certificates.
28282873
type: string
28292874
insecureSkipVerify:
2830-
description: InsecureSkipVerify specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.
2875+
description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.'
28312876
nullable: true
28322877
type: boolean
28332878
mode:
@@ -2865,7 +2910,7 @@ spec:
28652910
description: The name of the secret that holds the TLS certs for the client including the CA certificates.
28662911
type: string
28672912
insecureSkipVerify:
2868-
description: InsecureSkipVerify specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.
2913+
description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.'
28692914
nullable: true
28702915
type: boolean
28712916
mode:
@@ -3411,7 +3456,7 @@ spec:
34113456
description: The name of the secret that holds the TLS certs for the client including the CA certificates.
34123457
type: string
34133458
insecureSkipVerify:
3414-
description: InsecureSkipVerify specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.
3459+
description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.'
34153460
nullable: true
34163461
type: boolean
34173462
mode:
@@ -3449,7 +3494,7 @@ spec:
34493494
description: The name of the secret that holds the TLS certs for the client including the CA certificates.
34503495
type: string
34513496
insecureSkipVerify:
3452-
description: InsecureSkipVerify specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.
3497+
description: '`insecureSkipVerify` specifies whether the proxy should skip verifying the CA signature and SAN for the server certificate corresponding to the host.'
34533498
nullable: true
34543499
type: boolean
34553500
mode:
@@ -4344,14 +4389,19 @@ spec:
43444389
type: object
43454390
type: object
43464391
targetRef:
4392+
description: Optional.
43474393
properties:
43484394
group:
4395+
description: group is the group of the target resource.
43494396
type: string
43504397
kind:
4398+
description: kind is kind of the target resource.
43514399
type: string
43524400
name:
4401+
description: name is the name of the target resource.
43534402
type: string
43544403
namespace:
4404+
description: namespace is the namespace of the referent.
43554405
type: string
43564406
type: object
43574407
type: object
@@ -4442,14 +4492,19 @@ spec:
44424492
type: object
44434493
type: object
44444494
targetRef:
4495+
description: Optional.
44454496
properties:
44464497
group:
4498+
description: group is the group of the target resource.
44474499
type: string
44484500
kind:
4501+
description: kind is kind of the target resource.
44494502
type: string
44504503
name:
4504+
description: name is the name of the target resource.
44514505
type: string
44524506
namespace:
4507+
description: namespace is the namespace of the referent.
44534508
type: string
44544509
type: object
44554510
type: object
@@ -5587,14 +5642,19 @@ spec:
55875642
type: object
55885643
type: object
55895644
targetRef:
5645+
description: Optional.
55905646
properties:
55915647
group:
5648+
description: group is the group of the target resource.
55925649
type: string
55935650
kind:
5651+
description: kind is kind of the target resource.
55945652
type: string
55955653
name:
5654+
description: name is the name of the target resource.
55965655
type: string
55975656
namespace:
5657+
description: namespace is the namespace of the referent.
55985658
type: string
55995659
type: object
56005660
tracing:
@@ -7467,14 +7527,19 @@ spec:
74677527
pattern: (^$|^[a-f0-9]{64}$)
74687528
type: string
74697529
targetRef:
7530+
description: Optional.
74707531
properties:
74717532
group:
7533+
description: group is the group of the target resource.
74727534
type: string
74737535
kind:
7536+
description: kind is kind of the target resource.
74747537
type: string
74757538
name:
7539+
description: name is the name of the target resource.
74767540
type: string
74777541
namespace:
7542+
description: namespace is the namespace of the referent.
74787543
type: string
74797544
type: object
74807545
type:
@@ -9911,7 +9976,7 @@ data:
99119976
"sts": {
99129977
"servicePort": 0
99139978
},
9914-
"tag": "1.20.0",
9979+
"tag": "1.20.2",
99159980
"tracer": {
99169981
"datadog": {},
99179982
"lightstep": {},
@@ -10061,7 +10126,7 @@ spec:
1006110126
valueFrom:
1006210127
fieldRef:
1006310128
fieldPath: spec.nodeName
10064-
image: docker.io/istio/proxyv2:1.20.0
10129+
image: docker.io/istio/proxyv2:1.20.2
1006510130
name: istio-proxy
1006610131
ports:
1006710132
- containerPort: 15021
@@ -10265,7 +10330,7 @@ spec:
1026510330
resource: limits.cpu
1026610331
- name: PLATFORM
1026710332
value: ""
10268-
image: docker.io/istio/pilot:1.20.0-distroless
10333+
image: docker.io/istio/pilot:1.20.2-distroless
1026910334
name: discovery
1027010335
ports:
1027110336
- containerPort: 8080
@@ -10713,9 +10778,11 @@ spec:
1071310778
fieldRef:
1071410779
fieldPath: spec.nodeName
1071510780
- name: REPAIR_LABEL_PODS
10716-
value: "true"
10781+
value: "false"
1071710782
- name: REPAIR_DELETE_PODS
1071810783
value: "true"
10784+
- name: REPAIR_REPAIR_PODS
10785+
value: "false"
1071910786
- name: REPAIR_RUN_AS_DAEMON
1072010787
value: "true"
1072110788
- name: REPAIR_SIDECAR_ANNOTATION
@@ -10743,7 +10810,7 @@ spec:
1074310810
valueFrom:
1074410811
resourceFieldRef:
1074510812
resource: limits.cpu
10746-
image: docker.io/istio/install-cni:1.20.0
10813+
image: docker.io/istio/install-cni:1.20.2
1074710814
name: install-cni
1074810815
readinessProbe:
1074910816
httpGet:
@@ -10859,7 +10926,7 @@ spec:
1085910926
valueFrom:
1086010927
fieldRef:
1086110928
fieldPath: spec.serviceAccountName
10862-
image: docker.io/istio/ztunnel:1.20.0-distroless
10929+
image: docker.io/istio/ztunnel:1.20.2-distroless
1086310930
name: istio-proxy
1086410931
ports:
1086510932
- containerPort: 15020

0 commit comments

Comments
 (0)