Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,8 @@ spec:
- mountPath: /var/lib/waagent/ManagedIdentity-Settings
readOnly: true
name: msi
- mountPath: /usr/blob/
name: blobfuse-bin
- mountPath: /mnt
name: blobfuse-cache
- mountPath: /etc/fuse.conf
name: fuse-conf
volumes:
- hostPath:
path: /var/lib/kubelet/plugins/blobfuse.csi.azure.com
Expand All @@ -116,13 +112,6 @@ spec:
- hostPath:
path: /var/lib/waagent/ManagedIdentity-Settings
name: msi
- hostPath:
path: /usr/bin
name: blobfuse-bin
- hostPath:
path: /mnt
name: blobfuse-cache
- hostPath:
path: /etc/fuse.conf
type: FileOrCreate
name: fuse-conf
name: blobfuse-cache
13 changes: 1 addition & 12 deletions deploy/csi-blobfuse-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,8 @@ spec:
- mountPath: /var/lib/waagent/ManagedIdentity-Settings
readOnly: true
name: msi
- mountPath: /usr/blob/
name: blobfuse-bin
- mountPath: /mnt
name: blobfuse-cache
- mountPath: /etc/fuse.conf
name: fuse-conf
volumes:
- hostPath:
path: /var/lib/kubelet/plugins/blobfuse.csi.azure.com
Expand All @@ -115,13 +111,6 @@ spec:
- hostPath:
path: /var/lib/waagent/ManagedIdentity-Settings
name: msi
- hostPath:
path: /usr/bin
name: blobfuse-bin
- hostPath:
path: /mnt
name: blobfuse-cache
- hostPath:
path: /etc/fuse.conf
type: FileOrCreate
name: fuse-conf
name: blobfuse-cache
2 changes: 1 addition & 1 deletion pkg/blobfuse/nodeserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (d *Driver) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolu
for _, opt := range mountOptions {
args = args + " " + opt
}
cmd := exec.Command("/usr/blob/blobfuse", strings.Split(args, " ")...)
cmd := exec.Command("blobfuse", strings.Split(args, " ")...)
cmd.Env = append(os.Environ(), "AZURE_STORAGE_ACCOUNT="+accountName)

if accountSasToken != "" {
Expand Down
5 changes: 3 additions & 2 deletions pkg/blobfuseplugin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:16.04
RUN apt-get update && apt-get install -y ca-certificates pkg-config libfuse-dev cmake libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev
FROM mcr.microsoft.com/aks/fundamental/base-ubuntu:v0.0.5
RUN wget -O /tmp/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
RUN dpkg -i /tmp/packages-microsoft-prod.deb && apt-get update && apt-get install -y ca-certificates pkg-config libfuse-dev cmake libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev blobfuse
LABEL maintainers="andyzhangx"
LABEL description="Blobfuse CSI Driver"

Expand Down
3 changes: 1 addition & 2 deletions pkg/blobfuseplugin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ func main() {
os.Exit(0)
}
if *nodeID == "" {
klog.Error("--nodeid is a required parameter")
os.Exit(1)
klog.Warning("nodeid is empty")
}

exportMetrics()
Expand Down
2 changes: 1 addition & 1 deletion test/integration/run-tests-all-clouds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ readonly cloud="$2"

# copy blobfuse binary
mkdir -p /usr/blob
cp test/artifacts/blobfuse /usr/blob/blobfuse
cp test/artifacts/blobfuse /usr/bin/blobfuse

apt update && apt install libfuse2 -y
test/integration/run-test.sh "tcp://127.0.0.1:10000" "/tmp/testmount1" "$resource_group" "$cloud"
2 changes: 1 addition & 1 deletion test/sanity/run-tests-all-clouds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ trap cleanup EXIT

# copy blobfuse binary
mkdir -p /usr/blob
cp test/artifacts/blobfuse /usr/blob/blobfuse
cp test/artifacts/blobfuse /usr/bin/blobfuse

install_csi_sanity_bin
apt update && apt install libfuse2 -y
Expand Down