Automated branching step 1 (istio#42863)

WillardHu · Jan 18, 2023 · 9b769d6 · 9b769d6
1 parent d2ffbb9
commit 9b769d6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/docker/Dockerfile.distroless b/docker/Dockerfile.distroless
@@ -1,5 +1,5 @@
 # prepare a distroless source context to copy files from
-FROM gcr.io/distroless/static-debian11@sha256:cb0f70353c21d1e472a9ed2055c8a62fd842de52dd2db9dfb31c6e019648bf51 as distroless_source
+FROM gcr.io/distroless/static-debian11@sha256:11364b4198394878b7689ad61c5ea2aae2cd2ed127c09fc7b68ca8ed63219030 as distroless_source
 
 # prepare a base dev to modify file contents
 FROM ubuntu:focal as ubuntu_source

diff --git a/go.mod b/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/coreos/go-oidc/v3 v3.5.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/docker/cli v23.0.0-rc.2+incompatible
-	github.com/envoyproxy/go-control-plane v0.10.3-0.20230112152335-f832e0144bcd
+	github.com/envoyproxy/go-control-plane v0.10.3-0.20230117170948-335df8c6b7f1
 	github.com/evanphx/json-patch/v5 v5.6.0
 	github.com/fatih/color v1.13.0
 	github.com/felixge/fgprof v0.9.3
@@ -87,8 +87,8 @@ require (
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.10.3
 	istio.io/api v0.0.0-20230117175011-1dce51134dae
-	istio.io/client-go v1.12.0-alpha.5.0.20230117175411-c404265e5f58
-	istio.io/pkg v0.0.0-20230109165950-4d649447a1d7
+	istio.io/client-go v1.12.0-alpha.5.0.20230117175711-57988e293c64
+	istio.io/pkg v0.0.0-20230117175411-c5010484eff7
 	k8s.io/api v0.26.0
 	k8s.io/apiextensions-apiserver v0.26.0
 	k8s.io/apimachinery v0.26.0

diff --git a/go.sum b/go.sum
@@ -225,8 +225,8 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/go-control-plane v0.10.3-0.20230112152335-f832e0144bcd h1:gmZD9+u4fpIjrv4Aj6qrUq/wRWAryXiuy6xygrNzXPo=
-github.com/envoyproxy/go-control-plane v0.10.3-0.20230112152335-f832e0144bcd/go.mod h1:UALwhbhGBkLjUdMvqIZsYgWO7+cRd+++LXRa0Y/FNyU=
+github.com/envoyproxy/go-control-plane v0.10.3-0.20230117170948-335df8c6b7f1 h1:DKdGlbLNxSFzXasRpacm6QCz8z1HUcVzCCwAKYIlj44=
+github.com/envoyproxy/go-control-plane v0.10.3-0.20230117170948-335df8c6b7f1/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v0.9.1 h1:PS7VIOgmSVhWUEeZwTe7z7zouA22Cr590PzXKbZHOVY=
 github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
@@ -1404,10 +1404,10 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 istio.io/api v0.0.0-20230117175011-1dce51134dae h1:XckOjTP9yqGF5qkjcYlSYFKxfQdth+kpzdtWXAvgyaI=
 istio.io/api v0.0.0-20230117175011-1dce51134dae/go.mod h1:owGDRg9uqMob8CN1gxaOzk6nJxnbT8wrP7PmggpJHHY=
-istio.io/client-go v1.12.0-alpha.5.0.20230117175411-c404265e5f58 h1:2IzzJnaYkPcnQYNCCHSuwiDWuR7WAiEcF5k3nTsK5s4=
-istio.io/client-go v1.12.0-alpha.5.0.20230117175411-c404265e5f58/go.mod h1:bjrBxDbcz8EriYRePKOIz8euzX6atAkH/+4bSECqXRE=
-istio.io/pkg v0.0.0-20230109165950-4d649447a1d7 h1:Be5w+PI4gUtDDFGLNwX3z5ZzFFovA9Nz5XK1S/KBjMk=
-istio.io/pkg v0.0.0-20230109165950-4d649447a1d7/go.mod h1:BrWkMDfL8n60pWeRnHoNBckpgBOzMFasZsGUGCP9grE=
+istio.io/client-go v1.12.0-alpha.5.0.20230117175711-57988e293c64 h1:Ed1U9XpzeJB3WOXCbTOKOYK9RL6VE9XIKjqULRowX5o=
+istio.io/client-go v1.12.0-alpha.5.0.20230117175711-57988e293c64/go.mod h1:bjrBxDbcz8EriYRePKOIz8euzX6atAkH/+4bSECqXRE=
+istio.io/pkg v0.0.0-20230117175411-c5010484eff7 h1:f8kwTQNUBaxh2tE+Klb1xoPRe68GRQT8bhtpd7W3sc8=
+istio.io/pkg v0.0.0-20230117175411-c5010484eff7/go.mod h1:BrWkMDfL8n60pWeRnHoNBckpgBOzMFasZsGUGCP9grE=
 k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
 k8s.io/api v0.18.3/go.mod h1:UOaMwERbqJMfeeeHc8XJKawj4P9TgDRnViIqqBeH2QA=
 k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4=

diff --git a/prow/release-commit.sh b/prow/release-commit.sh
@@ -36,7 +36,7 @@ DOCKER_HUB=${DOCKER_HUB:-gcr.io/istio-testing}
 GCS_BUCKET=${GCS_BUCKET:-istio-build/dev}
 
 # Use a pinned version in case breaking changes are needed
-BUILDER_SHA=67285336fa7f822a014529ff7cbfab5061d840f9
+BUILDER_SHA=52e63e25a8d2fff5ac04c33e7cee9dbe4826b51b
 
 # Reference to the next minor version of Istio
 # This will create a version like 1.4-alpha.sha