Skip to content

Commit

Permalink
update deps for 1.21.3 (#51186)
Browse files Browse the repository at this point in the history
  • Loading branch information
aryan16 committed May 22, 2024
1 parent 98d4c3b commit 694f18b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile.distroless
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# prepare a distroless source context to copy files from
FROM gcr.io/distroless/static-debian11@sha256:072d78bc452a2998929a9579464e55067db4bf6d2c5f9cde582e33c10a415bd1 as distroless_source
FROM gcr.io/distroless/static-debian11@sha256:6d31326376a7834b106f281b04f67b5d015c31732f594930f2ea81365f99d60c as distroless_source

# prepare a base dev to modify file contents
FROM ubuntu:focal as ubuntu_source
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ require (
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.14.2
istio.io/api v1.21.2-0.20240422111456-ce2c1feea604
istio.io/client-go v1.21.2-0.20240422111956-6caf45ef5297
istio.io/api v1.21.3-0.20240422111456-ce2c1feea604
istio.io/client-go v1.21.3-0.20240422111956-6caf45ef5297
k8s.io/api v0.29.0
k8s.io/apiextensions-apiserver v0.29.0
k8s.io/apimachinery v0.29.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1089,10 +1089,10 @@ helm.sh/helm/v3 v3.14.2/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
istio.io/api v1.21.2-0.20240422111456-ce2c1feea604 h1:tugqgOG5LNmwKXEVO+rhgxlMxOA1Ua7BQQugMfrZ0NI=
istio.io/api v1.21.2-0.20240422111456-ce2c1feea604/go.mod h1:TFCMUCAHRjxBv1CsIsFCsYHPHi4axVI4vdIzVr8eFjY=
istio.io/client-go v1.21.2-0.20240422111956-6caf45ef5297 h1:UsqKCsgMu86XKV/A3i11ktX5CJW/bz8drc+8UUesbX8=
istio.io/client-go v1.21.2-0.20240422111956-6caf45ef5297/go.mod h1:9LEzw82gl2VZrc9fNnWrkGMmhWSrYsgcgi650KY3LII=
istio.io/api v1.21.3-0.20240422111456-ce2c1feea604 h1:rBkCndZuKojMaNBV6iC7zD/q8zwDKDaWs+1t8mrf13Q=
istio.io/api v1.21.3-0.20240422111456-ce2c1feea604/go.mod h1:TFCMUCAHRjxBv1CsIsFCsYHPHi4axVI4vdIzVr8eFjY=
istio.io/client-go v1.21.3-0.20240422111956-6caf45ef5297 h1:79TwlDwAC9BOIsmNJuoBj1DFeifnntHKovTU3C8a6PM=
istio.io/client-go v1.21.3-0.20240422111956-6caf45ef5297/go.mod h1:9LEzw82gl2VZrc9fNnWrkGMmhWSrYsgcgi650KY3LII=
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4=
k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A=
Expand Down
2 changes: 1 addition & 1 deletion pilot/docker/Dockerfile.proxyv2
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM ${ISTIO_BASE_REGISTRY}/base:${BASE_VERSION} as debug
# It is built on the base distroless image, with iptables binary and libraries added
# The source can be found at https://github.com/istio/distroless/tree/iptables
# This version is from commit 86c4972a9f5f245cfb382c8e1e95f176d968c882.
FROM ${ISTIO_BASE_REGISTRY}/iptables@sha256:863a23b9b2d6f3f282e651fb62a47d28a7bd19356839367654254f5677cea6fa as distroless
FROM ${ISTIO_BASE_REGISTRY}/iptables@sha256:ef4feb7af82634cebf76546f5047ecb10565bcd4808d643370a626073003434a as distroless

# This will build the final image based on either debug or distroless from above
# hadolint ignore=DL3006
Expand Down
2 changes: 1 addition & 1 deletion pilot/docker/Dockerfile.ztunnel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM ${ISTIO_BASE_REGISTRY}/base:${BASE_VERSION} as debug
# It is built on the base distroless image, with iptables binary and libraries added
# The source can be found at https://github.com/istio/distroless/tree/iptables
# This version is from commit 86c4972a9f5f245cfb382c8e1e95f176d968c882.
FROM ${ISTIO_BASE_REGISTRY}/iptables@sha256:863a23b9b2d6f3f282e651fb62a47d28a7bd19356839367654254f5677cea6fa as distroless
FROM ${ISTIO_BASE_REGISTRY}/iptables@sha256:ef4feb7af82634cebf76546f5047ecb10565bcd4808d643370a626073003434a as distroless

# This will build the final image based on either debug or distroless from above
# hadolint ignore=DL3006
Expand Down
2 changes: 1 addition & 1 deletion prow/release-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ docker run --rm --privileged "${DOCKER_HUB}/qemu-user-static" --reset -p yes
export ISTIO_DOCKER_QEMU=true

# Use a pinned version in case breaking changes are needed
BUILDER_SHA=7077025726f52330bbdfafb39118acc544aebada
BUILDER_SHA=e16ce2efdf9e37f82fd90f0db3e69609c455760d

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

0 comments on commit 694f18b

Please sign in to comment.