Skip to content

Fix dry run #2173

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

Merged
merged 5 commits into from
Oct 14, 2025
Merged

Fix dry run #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c1569a
Automator: update common-files@master in istio/release-builder@master
istio-testing Sep 30, 2025
3331c1a
Bump fake gcs server
keithmattix Oct 10, 2025
aaa8bf0
Additional logging
keithmattix Oct 10, 2025
f887848
More logging
keithmattix Oct 10, 2025
90912e4
use errors.Is
keithmattix Oct 13, 2025
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-6ac9cdb3d1ad09092398ab15574ce88cf2ac31ff",
"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
be6513cc1433076ebdb636af99c9b171d9a36f27
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-6ac9cdb3d1ad09092398ab15574ce88cf2ac31ff
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
}
4 changes: 2 additions & 2 deletions pkg/publish/gcs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@ func mutateObjectInner(outDir string, bkt *storage.BucketHandle, objectPrefix st
obj := bkt.Object(objName)
attr, err := obj.Attrs(context.Background())
if err != nil {
if err == storage.ErrObjectNotExist {
if errors.Is(err, storage.ErrObjectNotExist) {
// Missing is fine
log.Warnf("existing file %v does not exist", filename)
} else {
return fmt.Errorf("failed to fetch attributes: %v", err)
return fmt.Errorf("failed to fetch attributes for object %s: %v", objName, err)
}
}
generation := int64(0)
Expand Down
2 changes: 2 additions & 0 deletions pkg/publish/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ func publishHelmIndex(manifest model.Manifest, bucket string) error {
if len(splitbucket) > 1 {
objectPrefix = splitbucket[1]
}
log.Infof("Using bucket %s and prefix %s", bucketName, objectPrefix)
bkt := client.Bucket(bucketName)
log.Infof("Using bucket %v", bkt)

helmPublishRoot := filepath.Join(manifest.Directory, "helm")

Expand Down
2 changes: 1 addition & 1 deletion test/publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ docker run -d --rm \
docker run -d --rm \
-p "7481:7481" --label istio-release-builder \
--name "release-builder-gcs" \
gcr.io/istio-testing/fake-gcs-server:1.45.2 \
gcr.io/istio-testing/fake-gcs-server:1.52.3 \
-scheme http -port 7481

# Setup our bucket. Add retry since the registry may not be ready yet
Expand Down