Skip to content

Commit 09f481f

Browse files
committed
chore: rename code path
rename fix e2e failure fix test failure
1 parent caec089 commit 09f481f

32 files changed

+35
-35
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,22 @@ e2e-teardown:
8080

8181
.PHONY: blobfuse
8282
blobfuse:
83-
CGO_ENABLED=0 GOOS=linux go build -a -ldflags ${LDFLAGS} -o _output/blobfuseplugin ./pkg/blobfuseplugin
83+
CGO_ENABLED=0 GOOS=linux go build -a -ldflags ${LDFLAGS} -o _output/blobplugin ./pkg/blobplugin
8484

8585
.PHONY: blobfuse-windows
8686
blobfuse-windows:
87-
CGO_ENABLED=0 GOOS=windows go build -a -ldflags ${LDFLAGS} -o _output/blobfuseplugin.exe ./pkg/blobfuseplugin
87+
CGO_ENABLED=0 GOOS=windows go build -a -ldflags ${LDFLAGS} -o _output/blobplugin.exe ./pkg/blobplugin
8888

8989
.PHONY: container
9090
container: blobfuse
91-
docker build --no-cache -t $(IMAGE_TAG) -f ./pkg/blobfuseplugin/dev.Dockerfile .
91+
docker build --no-cache -t $(IMAGE_TAG) -f ./pkg/blobplugin/dev.Dockerfile .
9292

9393
.PHONY: blobfuse-container
9494
blobfuse-container:
9595
docker buildx rm container-builder || true
9696
docker buildx create --use --name=container-builder
9797
ifdef CI
98-
docker buildx build --no-cache --build-arg LDFLAGS=${LDFLAGS} -t $(IMAGE_TAG) -f ./pkg/blobfuseplugin/Dockerfile --platform="linux/amd64" --push .
98+
docker buildx build --no-cache --build-arg LDFLAGS=${LDFLAGS} -t $(IMAGE_TAG) -f ./pkg/blobplugin/Dockerfile --platform="linux/amd64" --push .
9999

100100
docker manifest create $(IMAGE_TAG) $(IMAGE_TAG)
101101
docker manifest inspect $(IMAGE_TAG)

charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ spec:
8484
requests:
8585
cpu: 10m
8686
memory: 20Mi
87-
- name: blobfuse
87+
- name: blob
8888
image: "{{ .Values.image.blobfuse.repository }}:{{ .Values.image.blobfuse.tag }}"
8989
args:
9090
- "--v=5"

charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-node.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
requests:
6767
cpu: 10m
6868
memory: 20Mi
69-
- name: blobfuse
69+
- name: blob
7070
image: "{{ .Values.image.blobfuse.repository }}:{{ .Values.image.blobfuse.tag }}"
7171
args:
7272
- "--v=5"
@@ -117,7 +117,7 @@ spec:
117117
readOnly: true
118118
name: msi
119119
- mountPath: /mnt
120-
name: blobfuse-cache
120+
name: blob-cache
121121
resources:
122122
limits:
123123
cpu: 4
@@ -147,4 +147,4 @@ spec:
147147
name: msi
148148
- hostPath:
149149
path: /mnt
150-
name: blobfuse-cache
150+
name: blob-cache

deploy/csi-blobfuse-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ spec:
8181
requests:
8282
cpu: 10m
8383
memory: 20Mi
84-
- name: blobfuse
84+
- name: blob
8585
image: mcr.microsoft.com/k8s/csi/blobfuse-csi:latest
8686
imagePullPolicy: IfNotPresent
8787
args:

deploy/csi-blobfuse-node.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ spec:
6565
requests:
6666
cpu: 10m
6767
memory: 20Mi
68-
- name: blobfuse
68+
- name: blob
6969
image: mcr.microsoft.com/k8s/csi/blobfuse-csi:latest
7070
imagePullPolicy: IfNotPresent
7171
args:
@@ -116,7 +116,7 @@ spec:
116116
readOnly: true
117117
name: msi
118118
- mountPath: /mnt
119-
name: blobfuse-cache
119+
name: blob-cache
120120
resources:
121121
limits:
122122
cpu: 4
@@ -146,5 +146,5 @@ spec:
146146
name: msi
147147
- hostPath:
148148
path: /mnt
149-
name: blobfuse-cache
149+
name: blob-cache
150150
---

docs/csi-debug.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ csi-blobfuse-controller-56bfddd689-sl4ll 5/5 Running 0 35s
99
```
1010
- get csi driver logs
1111
```console
12-
$ kubectl logs csi-blobfuse-controller-56bfddd689-dh5tk -c blobfuse -n kube-system > csi-blobfuse-controller.log
12+
$ kubectl logs csi-blobfuse-controller-56bfddd689-dh5tk -c blob -n kube-system > csi-blobfuse-controller.log
1313
```
1414
> note: there could be multiple controller pods, if there are no helpful logs, try to get logs from other controller pods
1515
@@ -24,5 +24,5 @@ csi-blobfuse-node-dr4s4 3/3 Running 0 7m4s
2424

2525
- get csi driver logs
2626
```console
27-
$ kubectl logs csi-blobfuse-node-cvgbs -c blobfuse -n kube-system > csi-blobfuse-node.log
27+
$ kubectl logs csi-blobfuse-node-cvgbs -c blob -n kube-system > csi-blobfuse-node.log
2828
```

docs/csi-dev.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $ make build
3636
#### Start CSI driver locally
3737
```console
3838
$ cd $GOPATH/src/sigs.k8s.io/blobfuse-csi-driver
39-
$ ./_output/blobfuseplugin --endpoint tcp://127.0.0.1:10000 --nodeid CSINode -v=5 &
39+
$ ./_output/blobplugin --endpoint tcp://127.0.0.1:10000 --nodeid CSINode -v=5 &
4040
```
4141
> Before running CSI driver, create "/etc/kubernetes/azure.json" file under testing server(it's better copy `azure.json` file from a k8s cluster with service principle configured correctly) and set `AZURE_CREDENTIAL_FILE` as following:
4242
```
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)