From 96e80aacc4c76b34802aaa8726e95b22283d730d Mon Sep 17 00:00:00 2001 From: istio-testing Date: Wed, 25 Mar 2026 23:19:58 +0000 Subject: [PATCH] Automator: update common-files@master in istio/bots@master --- .devcontainer/devcontainer.json | 2 +- common/.commonfiles.sha | 2 +- common/config/.hadolint.yml | 1 + common/config/license-lint.yml | 5 +++++ common/scripts/kind_provisioner.sh | 2 +- common/scripts/metallb-native.yaml | 6 +++--- common/scripts/report_build_info.sh | 2 +- common/scripts/setup_env.sh | 6 +++--- 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 852e9c9b..38632bea 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "istio build-tools", - "image": "gcr.io/istio-testing/build-tools:master-4951619bfdb0252ff587946a4540955b1ae06199", + "image": "registry.istio.io/testing/build-tools:master-b7201a4e3411e85dff202449182d26efd7491b89", "privileged": true, "remoteEnv": { "USE_GKE_GCLOUD_AUTH_PLUGIN": "True", diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha index 081b8888..be30dc2e 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -9cd1e7131baaace3d78746ccdf75477d1d89aa53 +de36763d9ee5de8aaaea29ec16812bf82ccab59a diff --git a/common/config/.hadolint.yml b/common/config/.hadolint.yml index 599f4625..f900b9a1 100644 --- a/common/config/.hadolint.yml +++ b/common/config/.hadolint.yml @@ -13,5 +13,6 @@ trustedRegistries: - gcr.io - docker.io - quay.io + - registry.istio.io - "*.pkg.dev" - "cgr.dev" diff --git a/common/config/license-lint.yml b/common/config/license-lint.yml index e9750b02..7eeec6a3 100644 --- a/common/config/license-lint.yml +++ b/common/config/license-lint.yml @@ -149,3 +149,8 @@ allowlisted_modules: # BSD # https://github.com/cyphar/filepath-securejoin/blob/main/LICENSE.BSD - github.com/cyphar/filepath-securejoin + +# The code is MIT: https://github.com/quic-go/quic-go/blob/master/LICENSE +# However, the logo is not https://github.com/quic-go/quic-go/blob/master/assets/LICENSE.md. +# However, we do not consume the logo. +- github.com/quic-go/quic-go \ No newline at end of file diff --git a/common/scripts/kind_provisioner.sh b/common/scripts/kind_provisioner.sh index ac7e6759..3a414d7d 100644 --- a/common/scripts/kind_provisioner.sh +++ b/common/scripts/kind_provisioner.sh @@ -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.35.0" +DEFAULT_KIND_IMAGE="registry.istio.io/testing/kind-node:v1.35.0" # the default kind cluster should be ipv4 if not otherwise specified KIND_IP_FAMILY="${KIND_IP_FAMILY:-ipv4}" diff --git a/common/scripts/metallb-native.yaml b/common/scripts/metallb-native.yaml index d874bac7..9daa3c45 100644 --- a/common/scripts/metallb-native.yaml +++ b/common/scripts/metallb-native.yaml @@ -1,5 +1,5 @@ # Downloaded from https://github.com/metallb/metallb/raw/v0.13.12/config/manifests/metallb-native.yaml -# With quay.io hub replaced with gcr.io/istio-testing +# With quay.io hub replaced with registry.istio.io/testing # And probes tuned to startup faster apiVersion: v1 kind: Namespace @@ -1533,7 +1533,7 @@ spec: value: memberlist - name: METALLB_DEPLOYMENT value: controller - image: gcr.io/istio-testing/metallb/controller:v0.14.3 + image: registry.istio.io/testing/metallb/controller:v0.14.3 livenessProbe: failureThreshold: 3 httpGet: @@ -1634,7 +1634,7 @@ spec: value: app=metallb,component=speaker - name: METALLB_ML_SECRET_KEY_PATH value: /etc/ml_secret_key - image: gcr.io/istio-testing/metallb/speaker:v0.14.3 + image: registry.istio.io/testing/metallb/speaker:v0.14.3 livenessProbe: failureThreshold: 3 httpGet: diff --git a/common/scripts/report_build_info.sh b/common/scripts/report_build_info.sh index f21e370f..80f4aa12 100755 --- a/common/scripts/report_build_info.sh +++ b/common/scripts/report_build_info.sh @@ -36,7 +36,7 @@ if [[ -z "${IGNORE_DIRTY_TREE}" ]] && ! git diff-index --quiet HEAD --; then fi GIT_DESCRIBE_TAG=$(git describe --tags --always) -HUB=${HUB:-"docker.io/istio"} +HUB=${HUB:-"registry.istio.io/release"} # used by common/scripts/gobuild.sh echo "istio.io/istio/pkg/version.buildVersion=${VERSION:-$BUILD_GIT_REVISION}" diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh index cad86e57..924fc8f7 100755 --- a/common/scripts/setup_env.sh +++ b/common/scripts/setup_env.sh @@ -74,10 +74,10 @@ else fi # Build image to use -TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io} -PROJECT_ID=${PROJECT_ID:-istio-testing} +TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-registry.istio.io} +PROJECT_ID=${PROJECT_ID:-testing} if [[ "${IMAGE_VERSION:-}" == "" ]]; then - IMAGE_VERSION=master-4951619bfdb0252ff587946a4540955b1ae06199 + IMAGE_VERSION=master-b7201a4e3411e85dff202449182d26efd7491b89 fi if [[ "${IMAGE_NAME:-}" == "" ]]; then IMAGE_NAME=build-tools