Skip to content

Commit a2adbf5

Browse files
author
openshift-service-mesh-bot
committed
Automator: merge upstream changes to openshift-service-mesh/istio@master
* upstream/master: (38 commits) Automator: update proxy@master in istio/istio@master (#57870) Automator: update ztunnel@master in istio/istio@master (#57857) Security/check sa for gw secrets (#57716) Automator: update proxy@master in istio/istio@master (#57865) Automator: update proxy@master in istio/istio@master (#57856) Automator: update ztunnel@master in istio/istio@master (#57845) Automator: update proxy@master in istio/istio@master (#57850) Automator: update istio/client-go@master dependency in istio/istio@master (#57848) Remove use of comment module when testing kernel support for iptables version (#57679) Update BASE_VERSION to master-2025-10-01T19-01-35 (#57841) Automator: update istio/client-go@master dependency in istio/istio@master (#57828) Automator: update ztunnel@master in istio/istio@master (#57822) Automator: update proxy@master in istio/istio@master (#57836) gateway: do not fail to startup when alpha BackendTLSPolicy is installed (#57834) Automator: update proxy@master in istio/istio@master (#57829) Update nftables known issues section (#57833) fix TestInformerExistingPodAddErrorAnnotatesWithPartialStatusOnRetry (#57830) Automator: update common-files@master in istio/istio@master (#57826) move to resource monitor to avoid deprecated warnings (#57823) telemetry: default PILOT_SPAWN_UPSTREAM_SPAN_FOR_GATEWAY to true (#57572) ...
2 parents db76426 + 8de61b9 commit a2adbf5

File tree

315 files changed

+14807
-10918
lines changed

Some content is hidden

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

315 files changed

+14807
-10918
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "istio build-tools",
3-
"image": "gcr.io/istio-testing/build-tools:master-2683149c033b2b71ab460170c3045ae85727306e",
3+
"image": "gcr.io/istio-testing/build-tools:master-6ac9cdb3d1ad09092398ab15574ce88cf2ac31ff",
44
"privileged": true,
55
"remoteEnv": {
66
"USE_GKE_GCLOUD_AUTH_PLUGIN": "True",

‎Makefile.core.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ endif
4949
export VERSION
5050

5151
# Base version of Istio image to use
52-
BASE_VERSION ?= master-2025-09-23T19-02-05
52+
BASE_VERSION ?= master-2025-10-01T19-01-35
5353
ISTIO_BASE_REGISTRY ?= gcr.io/istio-release
5454

5555
export GO111MODULE ?= on

‎cni/pkg/install/testdata/kubeconfig-newhost‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ contexts:
1111
name: istio-cni-context
1212
current-context: istio-cni-context
1313
kind: Config
14-
preferences: {}
1514
users:
1615
- name: istio-cni
1716
user:

‎cni/pkg/install/testdata/kubeconfig-skip-tls‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ contexts:
1111
name: istio-cni-context
1212
current-context: istio-cni-context
1313
kind: Config
14-
preferences: {}
1514
users:
1615
- name: istio-cni
1716
user:

‎cni/pkg/install/testdata/kubeconfig-tls‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ contexts:
1111
name: istio-cni-context
1212
current-context: istio-cni-context
1313
kind: Config
14-
preferences: {}
1514
users:
1615
- name: istio-cni
1716
user:

‎cni/pkg/nodeagent/informers_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func TestInformerExistingPodAddErrorAnnotatesWithPartialStatusOnRetry(t *testing
176176
client := kube.NewFakeClient(ns, pod)
177177
fs := &fakeServer{}
178178

179-
fs.On("AddPodToMesh",
179+
call := fs.On("AddPodToMesh",
180180
ctx,
181181
mock.IsType(pod),
182182
util.GetPodIPsIfPresent(pod),
@@ -201,6 +201,11 @@ func TestInformerExistingPodAddErrorAnnotatesWithPartialStatusOnRetry(t *testing
201201

202202
assertPodAnnotatedPending(t, client, pod)
203203

204+
// allow the call to succeed, this will stop further retry events from occurring
205+
call.Return(nil)
206+
// assert that the pod has been annotated before we proceed
207+
assertPodAnnotated(t, client, pod)
208+
204209
// Assert expected calls actually made
205210
fs.AssertExpectations(t)
206211
}

‎common/.commonfiles.sha‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c858f8951846005d3976c045fa3eae390d29a251
1+
be6513cc1433076ebdb636af99c9b171d9a36f27

‎common/config/license-lint.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,9 @@ allowlisted_modules:
143143

144144
# Simplified BSD License: https://github.com/gomarkdown/markdown/blob/master/LICENSE.txt
145145
- github.com/gomarkdown/markdown
146+
147+
# MPL-2.0
148+
# https://github.com/cyphar/filepath-securejoin/blob/main/LICENSE.MPL-2.0
149+
# BSD
150+
# https://github.com/cyphar/filepath-securejoin/blob/main/LICENSE.BSD
151+
- github.com/cyphar/filepath-securejoin

‎common/scripts/setup_env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fi
7777
TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
7878
PROJECT_ID=${PROJECT_ID:-istio-testing}
7979
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
80-
IMAGE_VERSION=master-2683149c033b2b71ab460170c3045ae85727306e
80+
IMAGE_VERSION=master-6ac9cdb3d1ad09092398ab15574ce88cf2ac31ff
8181
fi
8282
if [[ "${IMAGE_NAME:-}" == "" ]]; then
8383
IMAGE_NAME=build-tools

‎go.mod‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ require (
4848
github.com/miekg/dns v1.1.68
4949
github.com/mitchellh/copystructure v1.2.0
5050
github.com/moby/buildkit v0.23.2
51-
github.com/onsi/gomega v1.38.0
51+
github.com/onsi/gomega v1.38.2
5252
github.com/openshift/api v0.0.0-20250806102053-6a7223edb2fc
5353
github.com/pires/go-proxyproto v0.8.1
5454
github.com/planetscale/vtprotobuf v0.6.1-0.20240409071808-615f978279ca
5555
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
56-
github.com/prometheus/client_golang v1.23.0
56+
github.com/prometheus/client_golang v1.23.2
5757
github.com/prometheus/client_model v0.6.2
58-
github.com/prometheus/common v0.65.0
58+
github.com/prometheus/common v0.66.1
5959
github.com/prometheus/procfs v0.17.0
6060
github.com/prometheus/prometheus v0.305.0
6161
github.com/quic-go/quic-go v0.54.0
@@ -64,7 +64,7 @@ require (
6464
github.com/spf13/pflag v1.0.7
6565
github.com/spf13/viper v1.20.1
6666
github.com/stoewer/go-strcase v1.3.1
67-
github.com/stretchr/testify v1.10.0
67+
github.com/stretchr/testify v1.11.1
6868
github.com/vishvananda/netlink v1.3.1
6969
github.com/vishvananda/netns v0.0.5
7070
github.com/yl2chen/cidranger v1.0.2
@@ -82,32 +82,32 @@ require (
8282
go.uber.org/zap v1.27.0
8383
golang.org/x/net v0.43.0
8484
golang.org/x/oauth2 v0.30.0
85-
golang.org/x/sync v0.16.0
85+
golang.org/x/sync v0.17.0
8686
golang.org/x/sys v0.35.0
8787
golang.org/x/time v0.12.0
8888
gomodules.xyz/jsonpatch/v2 v2.5.0
8989
google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a
90-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a
91-
google.golang.org/grpc v1.74.2
92-
google.golang.org/protobuf v1.36.7
90+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1
91+
google.golang.org/grpc v1.75.1
92+
google.golang.org/protobuf v1.36.9
9393
gopkg.in/natefinch/lumberjack.v2 v2.2.1
9494
gopkg.in/yaml.v2 v2.4.0
9595
gopkg.in/yaml.v3 v3.0.1
9696
helm.sh/helm/v3 v3.18.6
97-
istio.io/api v1.26.0-alpha.0.0.20250923205230-1d89957ad280
98-
istio.io/client-go v1.26.0-alpha.0.0.20250923205629-fe2d99063ffd
99-
k8s.io/api v0.33.4
100-
k8s.io/apiextensions-apiserver v0.33.4
101-
k8s.io/apimachinery v0.33.4
102-
k8s.io/apiserver v0.33.4
97+
istio.io/api v1.26.0-alpha.0.0.20251002142010-859b66f07fad
98+
istio.io/client-go v1.26.0-alpha.0.0.20251002142408-752760d8f171
99+
k8s.io/api v0.34.1
100+
k8s.io/apiextensions-apiserver v0.34.1
101+
k8s.io/apimachinery v0.34.1
102+
k8s.io/apiserver v0.34.1
103103
k8s.io/cli-runtime v0.33.3
104-
k8s.io/client-go v0.33.4
104+
k8s.io/client-go v0.34.1
105105
k8s.io/klog/v2 v2.130.1
106106
k8s.io/kubectl v0.33.3
107-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
108-
sigs.k8s.io/controller-runtime v0.21.0
109-
sigs.k8s.io/gateway-api v1.3.0
110-
sigs.k8s.io/gateway-api-inference-extension v1.0.0
107+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
108+
sigs.k8s.io/controller-runtime v0.22.1
109+
sigs.k8s.io/gateway-api v1.3.1-0.20250924180216-ab6b5a251c59
110+
sigs.k8s.io/gateway-api-inference-extension v0.0.0-20250917095812-173ad587b675
111111
sigs.k8s.io/knftables v0.0.19-0.20250623122614-e4307300abb5
112112
sigs.k8s.io/mcs-api v0.2.0
113113
sigs.k8s.io/yaml v1.6.0
@@ -134,23 +134,24 @@ require (
134134
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
135135
github.com/docker/distribution v2.8.3+incompatible // indirect
136136
github.com/docker/docker-credential-helpers v0.9.3 // indirect
137-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
137+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
138138
github.com/envoyproxy/go-control-plane v0.13.5-0.20250705082150-f8f2cd45490a // indirect
139139
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
140140
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
141141
github.com/fatih/camelcase v1.0.0 // indirect
142142
github.com/felixge/httpsnoop v1.0.4 // indirect
143-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
143+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
144144
github.com/go-errors/errors v1.5.1 // indirect
145145
github.com/go-logr/stdr v1.2.2 // indirect
146-
github.com/go-openapi/jsonpointer v0.21.1 // indirect
146+
github.com/go-logr/zapr v1.3.0 // indirect
147+
github.com/go-openapi/jsonpointer v0.21.2 // indirect
147148
github.com/go-openapi/jsonreference v0.21.0 // indirect
148149
github.com/go-openapi/swag v0.23.1 // indirect
149150
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
150151
github.com/gobwas/glob v0.2.3 // indirect
151152
github.com/goccy/go-json v0.10.5 // indirect
152153
github.com/google/btree v1.1.3 // indirect
153-
github.com/google/gnostic-models v0.6.9 // indirect
154+
github.com/google/gnostic-models v0.7.0 // indirect
154155
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
155156
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
156157
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -176,7 +177,7 @@ require (
176177
github.com/moby/spdystream v0.5.0 // indirect
177178
github.com/moby/term v0.5.2 // indirect
178179
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
179-
github.com/modern-go/reflect2 v1.0.2 // indirect
180+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
180181
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
181182
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
182183
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
@@ -208,22 +209,22 @@ require (
208209
go.uber.org/mock v0.5.2 // indirect
209210
go.uber.org/multierr v1.11.0 // indirect
210211
go.yaml.in/yaml/v2 v2.4.2 // indirect
211-
go.yaml.in/yaml/v3 v3.0.3 // indirect
212+
go.yaml.in/yaml/v3 v3.0.4 // indirect
212213
golang.org/x/crypto v0.41.0 // indirect
213214
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
214215
golang.org/x/mod v0.27.0 // indirect
215216
golang.org/x/term v0.34.0 // indirect
216217
golang.org/x/text v0.28.0 // indirect
217218
golang.org/x/tools v0.36.0 // indirect
218-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
219+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
219220
gopkg.in/inf.v0 v0.9.1 // indirect
220-
k8s.io/component-base v0.33.4 // indirect
221+
k8s.io/component-base v0.34.1 // indirect
221222
k8s.io/component-helpers v0.33.3 // indirect
222-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
223+
k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect
223224
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.1 // indirect
224-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
225+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
225226
sigs.k8s.io/kustomize/api v0.19.0 // indirect
226227
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
227228
sigs.k8s.io/randfill v1.0.0 // indirect
228-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
229+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
229230
)

0 commit comments

Comments
 (0)