Update update_deps.sh to use debian11 instead of debian10 (istio#35468)

* Update update_deps.sh to use debian11 instead of debian10 * run ./bin/update_deps.sh; make gen * Do not update proxy * Re-run * Revert istio.deps
caitui · Oct 4, 2021 · 3f14af8 · 3f14af8
1 parent 2604842
commit 3f14af8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/bin/update_deps.sh b/bin/update_deps.sh
@@ -47,8 +47,8 @@ go mod tidy
 sed -i "s/^BUILDER_SHA=.*\$/BUILDER_SHA=$(getSha release-builder)/" prow/release-commit.sh
 sed -i '/PROXY_REPO_SHA/,/lastStableSHA/ { s/"lastStableSHA":.*/"lastStableSHA": "'"$(getSha proxy)"'"/  }' istio.deps
 
-LATEST_DEB10_DISTROLESS_SHA256=$(docker image pull gcr.io/distroless/static-debian10 | grep Digest | awk -F\\: '{print $3}')
-sed -i -E "s/sha256:[a-z0-9]+/sha256:${LATEST_DEB10_DISTROLESS_SHA256}/g" docker/Dockerfile.distroless
+LATEST_DEB11_DISTROLESS_SHA256=$(docker image pull gcr.io/distroless/static-debian11 | grep Digest | awk -F\\: '{print $3}')
+sed -i -E "s/sha256:[a-z0-9]+/sha256:${LATEST_DEB11_DISTROLESS_SHA256}/g" docker/Dockerfile.distroless
 
 LATEST_IPTABLES_DISTROLESS_SHA256=$(docker image pull gcr.io/istio-release/iptables | grep Digest | awk -F\\: '{print $3}')
 sed -i -E "s/sha256:[a-z0-9]+/sha256:${LATEST_IPTABLES_DISTROLESS_SHA256}/g" pilot/docker/Dockerfile.proxyv2
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:85f0110fd9096b784376948d52e874e2bf79436bd949e9d7e9fca365ded4e611 as distroless_source
+FROM gcr.io/distroless/static-debian11@sha256:1061399c202961ab567994c1bd42327bccd6380a345dcf88bf9ad7d5c8e29571 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
@@ -95,8 +95,8 @@ require (
 	helm.sh/helm/v3 v3.7.0
 	istio.io/api v0.0.0-20211004165642-37d9b25d0467
 	istio.io/client-go v1.12.0-alpha.1.0.20211004170059-18e528fadcac
-	istio.io/gogo-genproto v0.0.0-20210913204419-9ca283dc56e4
-	istio.io/pkg v0.0.0-20210914184925-da9399ebffe5
+	istio.io/gogo-genproto v0.0.0-20211001182530-c2c8a5e36d62
+	istio.io/pkg v0.0.0-20211001182530-b43287a0e105
 	k8s.io/api v0.22.2
 	k8s.io/apiextensions-apiserver v0.22.2
 	k8s.io/apimachinery v0.22.2

diff --git a/go.sum b/go.sum
@@ -1874,10 +1874,10 @@ istio.io/api v0.0.0-20211004165642-37d9b25d0467/go.mod h1:nsSFw1LIMmGL7r/+6fJI6F
 istio.io/client-go v1.12.0-alpha.1.0.20211004170059-18e528fadcac h1:L9ptvPsdA5casvlSvvAjW0DWBrO3vfzESbEiIxdomw4=
 istio.io/client-go v1.12.0-alpha.1.0.20211004170059-18e528fadcac/go.mod h1:V1k6m077h+sN0Rd/AnEOhbc1BhwolFU7apY7zJaRvew=
 istio.io/gogo-genproto v0.0.0-20210113155706-4daf5697332f/go.mod h1:6BwTZRNbWS570wHX/uR1Wqk5e0157TofTAUMzT7N4+s=
-istio.io/gogo-genproto v0.0.0-20210913204419-9ca283dc56e4 h1:5CF+RyB1tli/IlZfAWLYpqe4T3IARwfvURgWkEbilOk=
-istio.io/gogo-genproto v0.0.0-20210913204419-9ca283dc56e4/go.mod h1:6BwTZRNbWS570wHX/uR1Wqk5e0157TofTAUMzT7N4+s=
-istio.io/pkg v0.0.0-20210914184925-da9399ebffe5 h1:a9BTDf4yGOeMo9KKYETOUrNhUF4vclYl4WtJFqx1xGc=
-istio.io/pkg v0.0.0-20210914184925-da9399ebffe5/go.mod h1:rJLxqU2GEnFR3cIiun1uoiG87ghuQSD8jFkcjyT3Qes=
+istio.io/gogo-genproto v0.0.0-20211001182530-c2c8a5e36d62 h1:ecF9RHgTLwZaE61uy+Cio0xsMgU0bXvUH87RjsCJKK4=
+istio.io/gogo-genproto v0.0.0-20211001182530-c2c8a5e36d62/go.mod h1:6BwTZRNbWS570wHX/uR1Wqk5e0157TofTAUMzT7N4+s=
+istio.io/pkg v0.0.0-20211001182530-b43287a0e105 h1:X1yUmn/iK9BH4OMB9uNWEISdxaEunWWFVcp68RumRiY=
+istio.io/pkg v0.0.0-20211001182530-b43287a0e105/go.mod h1:rJLxqU2GEnFR3cIiun1uoiG87ghuQSD8jFkcjyT3Qes=
 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
@@ -32,7 +32,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=828c898ff8924700fb223864e52a8b758524c9e6
+BUILDER_SHA=788d53d2da0c8c940280955eced4dc189b6bcdcd
 
 # Reference to the next minor version of Istio
 # This will create a version like 1.4-alpha.sha