Skip to content

Commit 08ce6e1

Browse files
[release-1.9] Update 1.9 base image and run UPDATE_BRANCH=release-1.9 ./bin/update_deps.sh; make gen (istio#35463)
* Update 1.9 base image * run UPDATE_BRANCH=release-1.9 ./bin/update_deps.sh; make gen * Fix istio.io/pkg dependency
1 parent 4b85a49 commit 08ce6e1

File tree

6 files changed

+11
-13
lines changed

6 files changed

+11
-13
lines changed

Makefile.core.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SHELL := /bin/bash -o pipefail
2222
export VERSION ?= 1.9-dev
2323

2424
# Base version of Istio image to use
25-
BASE_VERSION ?= 1.9-dev.13
25+
BASE_VERSION ?= 1.9-dev.16
2626

2727
export GO111MODULE ?= on
2828
export GOPROXY ?= https://proxy.golang.org

docker/Dockerfile.distroless

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# prepare a distroless source context to copy files from
2-
FROM gcr.io/distroless/static-debian10@sha256:60a7d0c45932b6152b2f7ba561db2f91f58ab14aa90b895c58f72062c768fd77 as distroless_source
2+
FROM gcr.io/distroless/static-debian10@sha256:70bbadf9d86f4f2fbd1287cd88c01cea46e37ac00e67c15632e72ca73266e4aa as distroless_source
33

44
# prepare a base dev to modify file contents
55
FROM ubuntu:bionic as ubuntu_source
@@ -14,7 +14,7 @@ RUN echo isito-proxy:x:1337:1337:istio-proxy:/nonexistent:/sbin/nologin >> /home
1414
# - password file
1515
# - groups file
1616
# - /home/nonroot directory
17-
FROM gcr.io/distroless/static-debian10@sha256:60a7d0c45932b6152b2f7ba561db2f91f58ab14aa90b895c58f72062c768fd77
17+
FROM gcr.io/distroless/static-debian10@sha256:70bbadf9d86f4f2fbd1287cd88c01cea46e37ac00e67c15632e72ca73266e4aa
1818
COPY --from=ubuntu_source /home/etc/passwd /etc/passwd
1919
COPY --from=ubuntu_source /home/etc/group /etc/group
2020
COPY --from=ubuntu_source /home/nonroot /home/nonroot

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ require (
101101
helm.sh/helm/v3 v3.4.2
102102
honnef.co/go/tools v0.0.1-2020.1.5 // indirect
103103
istio.io/api v0.0.0-20210913072118-82994a85619d
104-
istio.io/client-go v1.9.5-0.20210607162355-6a6709ba5473
105-
istio.io/gogo-genproto v0.0.0-20210607161305-c0bb66452590
104+
istio.io/client-go v1.9.8-0.20210913073319-ea90aa00229b
105+
istio.io/gogo-genproto v0.0.0-20210913072519-c32f2e74f5c4
106106
istio.io/pkg v0.0.0-20201230223204-2d0a1c8bd9e5
107107
k8s.io/api v0.20.1
108108
k8s.io/apiextensions-apiserver v0.20.1

go.sum

+4-6
Original file line numberDiff line numberDiff line change
@@ -1330,15 +1330,13 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
13301330
honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k=
13311331
honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
13321332
istio.io/api v0.0.0-20190515205759-982e5c3888c6/go.mod h1:hhLFQmpHia8zgaM37vb2ml9iS5NfNfqZGRt1pS9aVEo=
1333-
istio.io/api v0.0.0-20210607161139-ab961225b5e9 h1:iwvNNwuT4BQ+mHjXAA+y7Xn96Qt4u/3eRsLBexvTIqg=
1334-
istio.io/api v0.0.0-20210607161139-ab961225b5e9/go.mod h1:88HN3o1fSD1jo+Z1WTLlJfMm9biopur6Ct9BFKjiB64=
13351333
istio.io/api v0.0.0-20210913072118-82994a85619d h1:P7sDyoMB8m9uFwrVqxbhbmQnKQBU+u/FgFCACjIDe4I=
13361334
istio.io/api v0.0.0-20210913072118-82994a85619d/go.mod h1:88HN3o1fSD1jo+Z1WTLlJfMm9biopur6Ct9BFKjiB64=
1337-
istio.io/client-go v1.9.5-0.20210607162355-6a6709ba5473 h1:TVyS6Uk/L8ISZ272/46ojY+KO91oc37wiHwYVoge+0U=
1338-
istio.io/client-go v1.9.5-0.20210607162355-6a6709ba5473/go.mod h1:cHf2zx2FSO24AxQxbbGR2s1OBbZAOKk9uwo6wLKxHfo=
1335+
istio.io/client-go v1.9.8-0.20210913073319-ea90aa00229b h1:rHAWpoU4GJoOkqd1isK5F5b40f6PGK0e4MP287W+7+Y=
1336+
istio.io/client-go v1.9.8-0.20210913073319-ea90aa00229b/go.mod h1:wLPaMTh5FagvtXssvmz5t2+S7fbvdLK7RNQCxYlLSG8=
13391337
istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs=
1340-
istio.io/gogo-genproto v0.0.0-20210607161305-c0bb66452590 h1:Dr0WzIvEU3lVT63xXbWy8CwS11sdnfgFoijQiZd38Us=
1341-
istio.io/gogo-genproto v0.0.0-20210607161305-c0bb66452590/go.mod h1:6BwTZRNbWS570wHX/uR1Wqk5e0157TofTAUMzT7N4+s=
1338+
istio.io/gogo-genproto v0.0.0-20210913072519-c32f2e74f5c4 h1:38BHvC2a1CaCuM7HgnINu6uPw4wT+8VxEyn6MuGTOPg=
1339+
istio.io/gogo-genproto v0.0.0-20210913072519-c32f2e74f5c4/go.mod h1:6BwTZRNbWS570wHX/uR1Wqk5e0157TofTAUMzT7N4+s=
13421340
istio.io/pkg v0.0.0-20201230223204-2d0a1c8bd9e5 h1:gDra2gTI4upKwsw0QFuCHJY45PoH5BuwINuHXeplKek=
13431341
istio.io/pkg v0.0.0-20201230223204-2d0a1c8bd9e5/go.mod h1:3mQXIbIrZzBPBUbmlIGo1GfAAH7yJLnqX2T8de13rgU=
13441342
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=

pilot/docker/Dockerfile.proxyv2

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FROM gcr.io/istio-release/base:${BASE_VERSION} as default
1111
# This image is a custom built debian9 distroless image with multiarchitecture support.
1212
# It is built on the base distroless image, with iptables binary and libraries added
1313
# The source can be found at https://github.com/istio/distroless/tree/iptables
14-
FROM gcr.io/istio-release/iptables@sha256:e8f940d0d0163ec4563ee070188c1d97308ac08f4a711152ff55f3a81e525140 as distroless
14+
FROM gcr.io/istio-release/iptables@sha256:875a2ec94a816dcb3da35fb559ac63cfe0345018a82b396491eb0e0dbbc15f18 as distroless
1515

1616
# This will build the final image based on either default or distroless from above
1717
# hadolint ignore=DL3006

prow/release-commit.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ DOCKER_HUB=${DOCKER_HUB:-gcr.io/istio-testing}
3232
GCS_BUCKET=${GCS_BUCKET:-istio-build/dev}
3333

3434
# Use a pinned version in case breaking changes are needed
35-
BUILDER_SHA=78710040a7fb1ccfc7a51f977a1f511da25a5447
35+
BUILDER_SHA=81948dc4b06ff734f353f12260a05ff5cbc67661
3636

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

0 commit comments

Comments
 (0)