Skip to content

Commit b574a47

Browse files
authored
Merge pull request #830 from andyzhangx/fix-mount-failed-on-ubuntu-22.04-1.19
[release-1.19] fix: mount failed on ubuntu 22.04(aks 1.25.2)
2 parents ed228d0 + 2bb696b commit b574a47

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ container: blob
119119
.PHONY: container-linux
120120
container-linux:
121121
docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \
122+
--provenance=false --sbom=false \
122123
-t $(IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) -f ./pkg/blobplugin/Dockerfile .
123124

124125
.PHONY: blob-container

hack/boilerplate/boilerplate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22

33
# Copyright 2019 The Kubernetes Authors.
44
#
@@ -207,4 +207,4 @@ def main():
207207
return 0
208208

209209
if __name__ == "__main__":
210-
sys.exit(main())
210+
sys.exit(main())

pkg/blobfuse-proxy/server/server.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ func (server *MountServer) MountAzureBlob(ctx context.Context,
7171
if protocol == blob.Fuse2 || server.blobfuseVersion == BlobfuseV2 {
7272
klog.V(2).Infof("using blobfuse V2 to mount")
7373
args = "mount " + args
74+
// add this arg for blobfuse2 to solve the issue:
75+
// https://github.com/Azure/azure-storage-fuse/issues/1015
76+
if !strings.Contains(args, "--ignore-open-flags") {
77+
klog.V(2).Infof("append --ignore-open-flags=true to mount args")
78+
args = args + " " + "--ignore-open-flags=true"
79+
}
7480
cmd = exec.Command("blobfuse2", strings.Split(args, " ")...)
7581
} else {
7682
klog.V(2).Infof("using blobfuse V1 to mount")

test/external-e2e/run.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ PROJECT_ROOT=$(git rev-parse --show-toplevel)
2020
DRIVER="test"
2121

2222
install_ginkgo () {
23-
apt update -y
24-
apt install -y golang-ginkgo-dev
23+
go install github.com/onsi/ginkgo/[email protected]
2524
}
2625

2726
setup_e2e_binaries() {

0 commit comments

Comments
 (0)