Skip to content

Automator: update common-files@master in istio/release-builder@master #2150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −5
Open

Automator: update common-files@master in istio/release-builder@master #2150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "istio build-tools",
"image": "gcr.io/istio-testing/build-tools:master-5b65c620f39f8a750e68465dc49b6753926d0b0b",
"image": "gcr.io/istio-testing/build-tools:master-ea3f3780a0b6c4325196cfdda2c1c0e784fe685c",
"privileged": true,
"remoteEnv": {
"USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
Expand Down
2 changes: 1 addition & 1 deletion common/.commonfiles.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5fa2fe83dbbdc1314d350364be66b89773d3cf31
74a6d743a37244fd246a9ac776ce01cfa724d0ab
6 changes: 6 additions & 0 deletions common/config/license-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,9 @@ allowlisted_modules:

# Simplified BSD License: https://github.com/gomarkdown/markdown/blob/master/LICENSE.txt
- github.com/gomarkdown/markdown

# MPL-2.0
# https://github.com/cyphar/filepath-securejoin/blob/main/LICENSE.MPL-2.0
# BSD
# https://github.com/cyphar/filepath-securejoin/blob/main/LICENSE.BSD
- github.com/cyphar/filepath-securejoin
2 changes: 1 addition & 1 deletion common/scripts/kind_provisioner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ set -x
####################################################################

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

# the default kind cluster should be ipv4 if not otherwise specified
KIND_IP_FAMILY="${KIND_IP_FAMILY:-ipv4}"
Expand Down
4 changes: 3 additions & 1 deletion common/scripts/setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ elif [[ ${LOCAL_ARCH} == s390x ]]; then
TARGET_ARCH=s390x
elif [[ ${LOCAL_ARCH} == ppc64le ]]; then
TARGET_ARCH=ppc64le
elif [[ ${LOCAL_ARCH} == riscv64 ]]; then
TARGET_ARCH=riscv64
else
echo "This system's architecture, ${LOCAL_ARCH}, isn't supported"
exit 1
Expand All @@ -75,7 +77,7 @@ fi
TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
PROJECT_ID=${PROJECT_ID:-istio-testing}
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
IMAGE_VERSION=master-5b65c620f39f8a750e68465dc49b6753926d0b0b
IMAGE_VERSION=master-ea3f3780a0b6c4325196cfdda2c1c0e784fe685c
fi
if [[ "${IMAGE_NAME:-}" == "" ]]; then
IMAGE_NAME=build-tools
Expand Down
2 changes: 1 addition & 1 deletion pkg/publish/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,5 +292,5 @@ func getImageNameVariant(fname string) (name string, variant string, arch string
imageName = strings.TrimSuffix(imageName, "-debug")
}
name = imageName
return
return name, variant, arch
}