Skip to content

Commit f7f0ca3

Browse files
andyzhangxandyzhangx
authored
Merge pull request #199 from andyzhangx/rename-controller
chore: rename controller
2 parents b21e87d + 7017657 commit f7f0ca3

14 files changed

+52
-52
lines changed

‎charts/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ The following table lists the configurable parameters of the latest Azure Blob S
5757
| `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar |
5858
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | v1.2.0 |
5959
| `image.nodeDriverRegistrar.pullPolicy` | csi-node-driver-registrar image pull policy | IfNotPresent |
60-
| `serviceAccount.create` | whether create service account of csi-blobfuse-controller | true |
61-
| `rbac.create` | whether create rbac of csi-blobfuse-controller | true |
62-
| `controller.replicas` | the replicas of csi-blobfuse-controller | 2 |
60+
| `serviceAccount.create` | whether create service account of csi-blob-controller | true |
61+
| `rbac.create` | whether create rbac of csi-blob-controller | true |
62+
| `controller.replicas` | the replicas of csi-blob-controller | 2 |
6363
## Troubleshooting
6464

6565
If there are some errors when using helm to install, follow the steps to debug:

‎charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-controller.yaml renamed to ‎charts/latest/blobfuse-csi-driver/templates/csi-blob-controller.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
kind: Deployment
22
apiVersion: apps/v1
33
metadata:
4-
name: csi-blobfuse-controller
4+
name: csi-blob-controller
55
namespace: {{ .Release.Namespace }}
66
{{ include "blobfuse.labels" . | indent 2 }}
77
spec:
88
replicas: {{ .Values.controller.replicas }}
99
selector:
1010
matchLabels:
11-
app: csi-blobfuse-controller
11+
app: csi-blob-controller
1212
template:
1313
metadata:
1414
{{ include "blobfuse.labels" . | indent 6 }}
15-
app: csi-blobfuse-controller
15+
app: csi-blob-controller
1616
spec:
1717
hostNetwork: true
18-
serviceAccountName: csi-blobfuse-controller-sa
18+
serviceAccountName: csi-blob-controller-sa
1919
nodeSelector:
2020
kubernetes.io/os: linux
2121
priorityClassName: system-cluster-critical

‎charts/latest/blobfuse-csi-driver/templates/rbac-csi-blobfuse-controller.yaml renamed to ‎charts/latest/blobfuse-csi-driver/templates/rbac-csi-blob-controller.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ metadata:
3737
{{ include "blobfuse.labels" . | indent 2 }}
3838
subjects:
3939
- kind: ServiceAccount
40-
name: csi-blobfuse-controller-sa
40+
name: csi-blob-controller-sa
4141
namespace: {{ .Release.Namespace }}
4242
roleRef:
4343
kind: ClusterRole
@@ -78,7 +78,7 @@ metadata:
7878
{{ include "blobfuse.labels" . | indent 2 }}
7979
subjects:
8080
- kind: ServiceAccount
81-
name: csi-blobfuse-controller-sa
81+
name: csi-blob-controller-sa
8282
namespace: {{ .Release.Namespace }}
8383
roleRef:
8484
kind: ClusterRole
@@ -134,7 +134,7 @@ metadata:
134134
{{ include "blobfuse.labels" . | indent 2 }}
135135
subjects:
136136
- kind: ServiceAccount
137-
name: csi-blobfuse-controller-sa
137+
name: csi-blob-controller-sa
138138
namespace: {{ .Release.Namespace }}
139139
roleRef:
140140
kind: ClusterRole
@@ -146,7 +146,7 @@ kind: ClusterRole
146146
apiVersion: rbac.authorization.k8s.io/v1
147147
metadata:
148148
namespace: {{ .Release.Namespace }}
149-
name: csi-blobfuse-controller-secret-role
149+
name: csi-blob-controller-secret-role
150150
rules:
151151
- apiGroups: [""]
152152
resources: ["secrets"]
@@ -156,14 +156,14 @@ rules:
156156
kind: ClusterRoleBinding
157157
apiVersion: rbac.authorization.k8s.io/v1
158158
metadata:
159-
name: csi-blobfuse-controller-secret-binding
159+
name: csi-blob-controller-secret-binding
160160
namespace: {{ .Release.Namespace }}
161161
subjects:
162162
- kind: ServiceAccount
163-
name: csi-blobfuse-controller-sa
163+
name: csi-blob-controller-sa
164164
namespace: {{ .Release.Namespace }}
165165
roleRef:
166166
kind: ClusterRole
167-
name: csi-blobfuse-controller-secret-role
167+
name: csi-blob-controller-secret-role
168168
apiGroup: rbac.authorization.k8s.io
169169
{{ end }}

‎charts/latest/blobfuse-csi-driver/templates/serviceaccount-csi-blobfuse-controller.yaml renamed to ‎charts/latest/blobfuse-csi-driver/templates/serviceaccount-csi-blob-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: ServiceAccount
44
metadata:
5-
name: csi-blobfuse-controller-sa
5+
name: csi-blob-controller-sa
66
namespace: {{ .Release.Namespace }}
77
{{ include "blobfuse.labels" . | indent 2 }}
88
{{- end -}}

‎deploy/csi-blobfuse-controller.yaml renamed to ‎deploy/csi-blob-controller.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
kind: Deployment
33
apiVersion: apps/v1
44
metadata:
5-
name: csi-blobfuse-controller
5+
name: csi-blob-controller
66
namespace: kube-system
77
spec:
88
replicas: 2
99
selector:
1010
matchLabels:
11-
app: csi-blobfuse-controller
11+
app: csi-blob-controller
1212
template:
1313
metadata:
1414
labels:
15-
app: csi-blobfuse-controller
15+
app: csi-blob-controller
1616
spec:
1717
hostNetwork: true
18-
serviceAccountName: csi-blobfuse-controller-sa
18+
serviceAccountName: csi-blob-controller-sa
1919
nodeSelector:
2020
kubernetes.io/os: linux
2121
priorityClassName: system-cluster-critical

‎deploy/example/metrics/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Get Prometheus metrics from CSI driver
22

3-
1. Create `csi-blobfuse-controller` service with targetPort `29624`
3+
1. Create `csi-blob-controller` service with targetPort `29624`
44
```console
5-
kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/blobfuse-csi-driver/master/deploy/example/metrics/csi-blobfuse-controller-svc.yaml
5+
kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/blobfuse-csi-driver/master/deploy/example/metrics/csi-blob-controller-svc.yaml
66
```
77

8-
2. Get ClusterIP of service `csi-blobfuse-controller`
8+
2. Get ClusterIP of service `csi-blob-controller`
99
```console
10-
$ kubectl get svc csi-blobfuse-controller -n kube-system
10+
$ kubectl get svc csi-blob-controller -n kube-system
1111
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
12-
csi-blobfuse-controller ClusterIP 10.0.156.8 <none> 29624/TCP 32m
12+
csi-blob-controller ClusterIP 10.0.156.8 <none> 29624/TCP 32m
1313
```
1414

1515
3. Run following command to get cloudprovider_azure metrics

‎deploy/example/metrics/csi-blobfuse-controller-svc.yaml renamed to ‎deploy/example/metrics/csi-blob-controller-svc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: csi-blobfuse-controller
5+
name: csi-blob-controller
66
namespace: kube-system
77
spec:
88
selector:
9-
app: csi-blobfuse-controller
9+
app: csi-blob-controller
1010
ports:
1111
- port: 29624
1212
targetPort: 29624

‎deploy/install-driver.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ if [ $ver != "master" ]; then
3434
fi
3535

3636
echo "Installing Azure Blob Storage CSI driver, version: $ver ..."
37-
kubectl apply -f $repo/rbac-csi-blobfuse-controller.yaml
37+
kubectl apply -f $repo/rbac-csi-blob-controller.yaml
3838
kubectl apply -f $repo/rbac-csi-blobfuse-node.yaml
3939
kubectl apply -f $repo/csi-blobfuse-driver.yaml
40-
kubectl apply -f $repo/csi-blobfuse-controller.yaml
40+
kubectl apply -f $repo/csi-blob-controller.yaml
4141
kubectl apply -f $repo/csi-blobfuse-node.yaml
4242
echo 'Azure Blob Storage CSI driver installed successfully.'

‎deploy/rbac-csi-blobfuse-controller.yaml renamed to ‎deploy/rbac-csi-blob-controller.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: ServiceAccount
44
metadata:
5-
name: csi-blobfuse-controller-sa
5+
name: csi-blob-controller-sa
66
namespace: kube-system
77
---
88

@@ -40,7 +40,7 @@ metadata:
4040
name: blobfuse-csi-provisioner-binding
4141
subjects:
4242
- kind: ServiceAccount
43-
name: csi-blobfuse-controller-sa
43+
name: csi-blob-controller-sa
4444
namespace: kube-system
4545
roleRef:
4646
kind: ClusterRole
@@ -78,7 +78,7 @@ metadata:
7878
name: blobfuse-csi-attacher-binding
7979
subjects:
8080
- kind: ServiceAccount
81-
name: csi-blobfuse-controller-sa
81+
name: csi-blob-controller-sa
8282
namespace: kube-system
8383
roleRef:
8484
kind: ClusterRole
@@ -131,7 +131,7 @@ metadata:
131131
name: blobfuse-csi-snapshotter-binding
132132
subjects:
133133
- kind: ServiceAccount
134-
name: csi-blobfuse-controller-sa
134+
name: csi-blob-controller-sa
135135
namespace: kube-system
136136
roleRef:
137137
kind: ClusterRole
@@ -142,7 +142,7 @@ roleRef:
142142
kind: ClusterRole
143143
apiVersion: rbac.authorization.k8s.io/v1
144144
metadata:
145-
name: csi-blobfuse-controller-secret-role
145+
name: csi-blob-controller-secret-role
146146
namespace: kube-system
147147
rules:
148148
- apiGroups: [""]
@@ -153,13 +153,13 @@ rules:
153153
kind: ClusterRoleBinding
154154
apiVersion: rbac.authorization.k8s.io/v1
155155
metadata:
156-
name: csi-blobfuse-controller-secret-binding
156+
name: csi-blob-controller-secret-binding
157157
namespace: kube-system
158158
subjects:
159159
- kind: ServiceAccount
160-
name: csi-blobfuse-controller-sa
160+
name: csi-blob-controller-sa
161161
namespace: kube-system
162162
roleRef:
163163
kind: ClusterRole
164-
name: csi-blobfuse-controller-secret-role
164+
name: csi-blob-controller-secret-role
165165
apiGroup: rbac.authorization.k8s.io

‎deploy/uninstall-driver.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ if [ $ver != "master" ]; then
3434
fi
3535

3636
echo "Uninstalling Azure Blob Storage CSI driver, version: $ver ..."
37-
kubectl delete -f $repo/csi-blobfuse-controller.yaml --ignore-not-found
37+
kubectl delete -f $repo/csi-blob-controller.yaml --ignore-not-found
3838
kubectl delete -f $repo/csi-blobfuse-node.yaml --ignore-not-found
3939
kubectl delete -f $repo/csi-blobfuse-driver.yaml --ignore-not-found
40-
kubectl delete -f $repo/rbac-csi-blobfuse-controller.yaml --ignore-not-found
40+
kubectl delete -f $repo/rbac-csi-blob-controller.yaml --ignore-not-found
4141
kubectl delete -f $repo/rbac-csi-blobfuse-node.yaml --ignore-not-found
4242
echo 'Uninstalled Azure Blob Storage CSI driver successfully.'

0 commit comments

Comments
 (0)