Skip to content

Commit 64a2419

Browse files
authored
Merge branch 'knative:main' into issue-2835
2 parents 04b6924 + 0ce5759 commit 64a2419

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ jobs:
242242
- name: Build and push
243243
run: |
244244
for a in amd64 arm64 ppc64le s390x; do
245-
CGO_ENABLED=0 go build -o "func-util-$a" -trimpath -ldflags '-w -s' ./cmd/func-util
245+
CGO_ENABLED=0 GOARCH="$a" go build -o "func-util-$a" -trimpath -ldflags '-w -s' ./cmd/func-util
246246
done
247247
docker buildx create --name multiarch --driver docker-container --use
248248
docker buildx build . -f Dockerfile.utils \

pkg/docker/pusher.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,9 @@ func (n *Pusher) pushImage(ctx context.Context, f fn.Function, credentials Crede
202202
return digest, nil
203203
}
204204
errStr := err.Error()
205-
if strings.Contains(errStr, "no such host") || strings.Contains(errStr, "failure in name resolution") {
205+
if strings.Contains(errStr, "no such host") ||
206+
strings.Contains(errStr, "failure in name resolution") ||
207+
regexp.MustCompile(`lookup .*: server misbehaving`).MatchString(errStr) {
206208
// push with custom transport to be able to push into cluster private registries
207209
return n.push(ctx, f, credentials, output)
208210
}

0 commit comments

Comments
 (0)