Skip to content

Commit

Permalink
Merge pull request #830 from andyzhangx/fix-mount-failed-on-ubuntu-22…
Browse files Browse the repository at this point in the history
….04-1.19

[release-1.19] fix: mount failed on ubuntu 22.04(aks 1.25.2)
  • Loading branch information
andyzhangx committed Feb 24, 2023
2 parents ed228d0 + 2bb696b commit b574a47
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ container: blob
.PHONY: container-linux
container-linux:
docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \
--provenance=false --sbom=false \
-t $(IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) -f ./pkg/blobplugin/Dockerfile .

.PHONY: blob-container
Expand Down
4 changes: 2 additions & 2 deletions hack/boilerplate/boilerplate.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

# Copyright 2019 The Kubernetes Authors.
#
Expand Down Expand Up @@ -207,4 +207,4 @@ def main():
return 0

if __name__ == "__main__":
sys.exit(main())
sys.exit(main())
6 changes: 6 additions & 0 deletions pkg/blobfuse-proxy/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ func (server *MountServer) MountAzureBlob(ctx context.Context,
if protocol == blob.Fuse2 || server.blobfuseVersion == BlobfuseV2 {
klog.V(2).Infof("using blobfuse V2 to mount")
args = "mount " + args
// add this arg for blobfuse2 to solve the issue:
// https://github.com/Azure/azure-storage-fuse/issues/1015
if !strings.Contains(args, "--ignore-open-flags") {
klog.V(2).Infof("append --ignore-open-flags=true to mount args")
args = args + " " + "--ignore-open-flags=true"
}
cmd = exec.Command("blobfuse2", strings.Split(args, " ")...)
} else {
klog.V(2).Infof("using blobfuse V1 to mount")
Expand Down
3 changes: 1 addition & 2 deletions test/external-e2e/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ PROJECT_ROOT=$(git rev-parse --show-toplevel)
DRIVER="test"

install_ginkgo () {
apt update -y
apt install -y golang-ginkgo-dev
go install github.com/onsi/ginkgo/[email protected]
}

setup_e2e_binaries() {
Expand Down

0 comments on commit b574a47

Please sign in to comment.