Skip to content

Commit 9031ae7

Browse files
authored
Automated branching step 1 (istio#52080)
1 parent 623c915 commit 9031ae7

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

docker/Dockerfile.distroless

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# prepare a distroless source context to copy files from
2-
FROM cgr.dev/chainguard/static@sha256:873e9709e2a83acc995ff24e71c100480f9c0368e0d86eaee9c3c7cb8fb5f0e0 AS distroless_source
2+
FROM cgr.dev/chainguard/static@sha256:e78eb21f59f52446a23f7d45e78805c4f26406a6e9c4b21ec50dfdf07e6bec57 AS distroless_source
33

44
# prepare a base dev to modify file contents
55
FROM ubuntu:noble AS ubuntu_source

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/coreos/go-oidc/v3 v3.10.0
2121
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
2222
github.com/docker/cli v26.1.4+incompatible
23-
github.com/envoyproxy/go-control-plane v0.12.1-0.20240712172404-1da4500d00e2
23+
github.com/envoyproxy/go-control-plane v0.12.1-0.20240716023226-bc563f4e9b28
2424
github.com/evanphx/json-patch/v5 v5.9.0
2525
github.com/fatih/color v1.17.0
2626
github.com/felixge/fgprof v0.9.4
@@ -92,7 +92,7 @@ require (
9292
gomodules.xyz/jsonpatch/v2 v2.4.0
9393
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117
9494
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117
95-
google.golang.org/grpc v1.64.1
95+
google.golang.org/grpc v1.65.0
9696
google.golang.org/protobuf v1.34.1
9797
gopkg.in/natefinch/lumberjack.v2 v2.2.1
9898
gopkg.in/yaml.v2 v2.4.0

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRr
160160
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
161161
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
162162
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
163-
github.com/envoyproxy/go-control-plane v0.12.1-0.20240712172404-1da4500d00e2 h1:srxDNbrp+NoyasdIUVEDwu/xkoajQwNyBr/NDKW/27o=
164-
github.com/envoyproxy/go-control-plane v0.12.1-0.20240712172404-1da4500d00e2/go.mod h1:GK6eJxJBjVz+a2poLMTx017aQ1mfAkZ5knBOlpWe+hc=
163+
github.com/envoyproxy/go-control-plane v0.12.1-0.20240716023226-bc563f4e9b28 h1:XVTfL79z4+FmNQPagc18t8GpZOzyQN+pPjYDO6V/9mU=
164+
github.com/envoyproxy/go-control-plane v0.12.1-0.20240716023226-bc563f4e9b28/go.mod h1:GRaKG3dwvFoTg4nj7aXdZnvMg4d7nvT/wl9WgVXn3Q8=
165165
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
166166
github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
167167
github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
@@ -956,8 +956,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
956956
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
957957
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
958958
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
959-
google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA=
960-
google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
959+
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
960+
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
961961
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
962962
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
963963
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

istio.deps

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"name": "ZTUNNEL_REPO_SHA",
1212
"repoName": "ztunnel",
1313
"file": "",
14-
"lastStableSHA": "c61af130a0c2d835bcc9a1011e4577b11580fd4a"
14+
"lastStableSHA": "43049a683763a2e172e18133ca35e2db10399428"
1515
}
1616
]

prow/release-commit.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ docker run --rm --privileged "${DOCKER_HUB}/qemu-user-static" --reset -p yes
3636
export ISTIO_DOCKER_QEMU=true
3737

3838
# Use a pinned version in case breaking changes are needed
39-
BUILDER_SHA=688fa89ab3602da40cfb0b4646a5116fd25c3d71
39+
BUILDER_SHA=843e8f0d1a9396a80eaa1530d4d38a808a31f427
4040

4141
# Reference to the next minor version of Istio
4242
# This will create a version like 1.4-alpha.sha

0 commit comments

Comments
 (0)