Skip to content

Commit 4c1569a

Browse files
committed
Automator: update common-files@master in istio/release-builder@master
1 parent 2cb0e86 commit 4c1569a

File tree

6 files changed

+13
-5
lines changed

6 files changed

+13
-5
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "istio build-tools",
3-
"image": "gcr.io/istio-testing/build-tools:master-5b65c620f39f8a750e68465dc49b6753926d0b0b",
3+
"image": "gcr.io/istio-testing/build-tools:master-6ac9cdb3d1ad09092398ab15574ce88cf2ac31ff",
44
"privileged": true,
55
"remoteEnv": {
66
"USE_GKE_GCLOUD_AUTH_PLUGIN": "True",

common/.commonfiles.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5fa2fe83dbbdc1314d350364be66b89773d3cf31
1+
be6513cc1433076ebdb636af99c9b171d9a36f27

common/config/license-lint.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,9 @@ allowlisted_modules:
143143

144144
# Simplified BSD License: https://github.com/gomarkdown/markdown/blob/master/LICENSE.txt
145145
- github.com/gomarkdown/markdown
146+
147+
# MPL-2.0
148+
# https://github.com/cyphar/filepath-securejoin/blob/main/LICENSE.MPL-2.0
149+
# BSD
150+
# https://github.com/cyphar/filepath-securejoin/blob/main/LICENSE.BSD
151+
- github.com/cyphar/filepath-securejoin

common/scripts/kind_provisioner.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set -x
3232
####################################################################
3333

3434
# DEFAULT_KIND_IMAGE is used to set the Kubernetes version for KinD unless overridden in params to setup_kind_cluster(s)
35-
DEFAULT_KIND_IMAGE="gcr.io/istio-testing/kind-node:v1.33.1"
35+
DEFAULT_KIND_IMAGE="gcr.io/istio-testing/kind-node:v1.34.0"
3636

3737
# the default kind cluster should be ipv4 if not otherwise specified
3838
KIND_IP_FAMILY="${KIND_IP_FAMILY:-ipv4}"

common/scripts/setup_env.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ elif [[ ${LOCAL_ARCH} == s390x ]]; then
4949
TARGET_ARCH=s390x
5050
elif [[ ${LOCAL_ARCH} == ppc64le ]]; then
5151
TARGET_ARCH=ppc64le
52+
elif [[ ${LOCAL_ARCH} == riscv64 ]]; then
53+
TARGET_ARCH=riscv64
5254
else
5355
echo "This system's architecture, ${LOCAL_ARCH}, isn't supported"
5456
exit 1
@@ -75,7 +77,7 @@ fi
7577
TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
7678
PROJECT_ID=${PROJECT_ID:-istio-testing}
7779
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
78-
IMAGE_VERSION=master-5b65c620f39f8a750e68465dc49b6753926d0b0b
80+
IMAGE_VERSION=master-6ac9cdb3d1ad09092398ab15574ce88cf2ac31ff
7981
fi
8082
if [[ "${IMAGE_NAME:-}" == "" ]]; then
8183
IMAGE_NAME=build-tools

pkg/publish/docker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,5 +292,5 @@ func getImageNameVariant(fname string) (name string, variant string, arch string
292292
imageName = strings.TrimSuffix(imageName, "-debug")
293293
}
294294
name = imageName
295-
return
295+
return name, variant, arch
296296
}

0 commit comments

Comments
 (0)