Skip to content

Commit eeb77e7

Browse files
authored
Merge pull request #400 from boddumanohar/issues/392
tail blobfuse-proxy logs at the start of blobfuse-proxy daemonset
2 parents 90e4c5a + 397256f commit eeb77e7

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ OUTPUT_TYPE ?= registry
4646
ALL_ARCH.linux = amd64 #arm64
4747
ALL_OS_ARCH = $(foreach arch, ${ALL_ARCH.linux}, linux-$(arch))
4848

49-
all: blob
49+
all: blob blobfuse-proxy
5050

5151
.PHONY: verify
5252
verify: unit-test
@@ -69,10 +69,10 @@ e2e-test:
6969
go test -v -timeout=0 ./test/e2e ${GINKGO_FLAGS}
7070

7171
.PHONY: e2e-bootstrap
72-
e2e-bootstrap: install-helm install-blobfuse-proxy
72+
e2e-bootstrap: install-helm
7373
# Only build and push the image if it does not exist in the registry
7474
docker pull $(IMAGE_TAG) || make blob-container push
75-
if [[ -z "$(ENABLE_BLOBFUSE_PROXY)" ]]; then \
75+
if [ ! -z "$(ENABLE_BLOBFUSE_PROXY)" ]; then \
7676
make install-blobfuse-proxy;\
7777
fi
7878
helm install blob-csi-driver ./charts/latest/blob-csi-driver --namespace kube-system --wait --timeout=15m -v=5 --debug \

deploy/blobfuse-proxy/blobfuse-proxy.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ spec:
5454
systemctl start blobfuse-proxy
5555
echo "removing the file: /tmp/blobfuse-proxy-v0.1.0.deb"
5656
rm /tmp/blobfuse-proxy-v0.1.0.deb
57-
echo "sleeping for 19 years"
58-
sleep 600000000s
57+
echo "waiting for blobfuse-proxy service to start"
58+
sleep 3s
59+
# tail blobfuse proxy logs
60+
journalctl -u blobfuse-proxy -f
5961
image: alpine
6062
imagePullPolicy: IfNotPresent
6163
name: sysctl-install-blobfuse-proxy
Binary file not shown.

pkg/blobfuse-proxy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ make blobfuse-proxy
4242

4343
- Generate debian dpkg package
4444
```console
45-
cp _output/blobfuse-proxy ./pkg/blobfuse-proxy/usr/bin/blobfuse-proxy
45+
cp _output/blobfuse-proxy ./pkg/blobfuse-proxy/debpackage/usr/bin/blobfuse-proxy
4646
dpkg-deb --build pkg/blobfuse-proxy/debpackage
4747
```

0 commit comments

Comments
 (0)