Skip to content

Commit 7d07ff2

Browse files
committed
test: add blobfuse-proxy build & e2e test
fix failure fix Makefile
1 parent 3664a79 commit 7d07ff2

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/workflows/linux.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
export PATH=$PATH:$HOME/.local/bin
4343
make blobfuse-proxy
44-
sudo dpkg -i pkg/blobfuse-proxy/debpackage.deb
44+
sudo dpkg -i deploy/blobfuse-proxy/blobfuse-proxy.deb
4545
4646
- name: Get code coverage
4747
env:

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ blob-darwin:
104104
CGO_ENABLED=0 GOOS=darwin go build -a -ldflags ${LDFLAGS} -mod vendor -o _output/blobplugin ./pkg/blobplugin
105105

106106
.PHONY: container
107-
container: blob
107+
container: blob blobfuse-proxy
108108
docker build -t $(IMAGE_TAG) --output=type=docker -f ./pkg/blobplugin/Dockerfile .
109109

110110
.PHONY: container-linux
@@ -113,7 +113,7 @@ container-linux:
113113
-t $(IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) -f ./pkg/blobplugin/Dockerfile .
114114

115115
.PHONY: blob-container
116-
blob-container:
116+
blob-container: blobfuse-proxy
117117
docker buildx rm container-builder || true
118118
docker buildx create --use --name=container-builder
119119

@@ -169,7 +169,7 @@ delete-metrics-svc:
169169
blobfuse-proxy:
170170
mkdir -p ./pkg/blobfuse-proxy/debpackage/usr/bin/
171171
CGO_ENABLED=0 GOOS=linux go build -mod vendor -ldflags="-s -w" -o ./pkg/blobfuse-proxy/debpackage/usr/bin/blobfuse-proxy ./pkg/blobfuse-proxy
172-
dpkg-deb --build pkg/blobfuse-proxy/debpackage
172+
dpkg-deb --build pkg/blobfuse-proxy/debpackage deploy/blobfuse-proxy/blobfuse-proxy.deb
173173

174174
.PHONY: blobfuse-proxy-container
175175
blobfuse-proxy-container:
2 Bytes
Binary file not shown.

charts/latest/blob-csi-driver/templates/blobfuse-proxy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ spec:
6767
value: "noninteractive"
6868
resources:
6969
limits:
70-
cpu: 100m
71-
memory: 100Mi
70+
cpu: 200m
71+
memory: 200Mi
7272
requests:
7373
cpu: 10m
7474
memory: 1Mi

deploy/blobfuse-proxy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ spec:
6767
value: "noninteractive"
6868
resources:
6969
limits:
70-
cpu: 100m
71-
memory: 100Mi
70+
cpu: 200m
71+
memory: 200Mi
7272
requests:
7373
cpu: 10m
7474
memory: 1Mi

pkg/blobplugin/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN clean-install ca-certificates libfuse-dev libcurl4-gnutls-dev libgnutls28-de
1919
RUN mkdir /blobfuse-proxy/
2020
# for compatibility, remove this after v1.6.0 release (todo)
2121
COPY deploy/blobfuse-proxy/v0.1.0/blobfuse-proxy-v0.1.0.deb /blobfuse-proxy/
22-
COPY deploy/blobfuse-proxy/v0.1.1/blobfuse-proxy.deb /blobfuse-proxy/
22+
COPY deploy/blobfuse-proxy/blobfuse-proxy.deb /blobfuse-proxy/
2323
RUN wget -O /blobfuse-proxy/packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
2424
RUN dpkg -i /blobfuse-proxy/packages-microsoft-prod.deb && apt update && apt install blobfuse fuse -y
2525
# this is a workaround to install nfs-kernel-server and don't quit with error

0 commit comments

Comments
 (0)