Merge pull request #201 from andyzhangx/rename-node

andyzhangx · web-flow · commit 948ca5a3aec2 · 2020-08-07T09:33:29.000+08:00
chore: rename node
diff --git a/charts/latest/blobfuse-csi-driver/templates/csi-blob-driver.yaml b/charts/latest/blobfuse-csi-driver/templates/csi-blob-driver.yaml
diff --git a/charts/latest/blobfuse-csi-driver/templates/csi-blob-node.yaml b/charts/latest/blobfuse-csi-driver/templates/csi-blob-node.yaml
@@ -1,20 +1,20 @@
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
-  name: csi-blobfuse-node
+  name: csi-blob-node
   namespace: {{ .Release.Namespace }}
 {{ include "blobfuse.labels" . | indent 2 }}
 spec:
   selector:
     matchLabels:
-      app: csi-blobfuse-node
+      app: csi-blob-node
   template:
     metadata:
 {{ include "blobfuse.labels" . | indent 6 }}
-        app: csi-blobfuse-node
+        app: csi-blob-node
     spec:
       hostNetwork: true
-      serviceAccountName: csi-blobfuse-node-sa
+      serviceAccountName: csi-blob-node-sa
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: system-node-critical
diff --git a/charts/latest/blobfuse-csi-driver/templates/rbac-csi-blob-node.yaml b/charts/latest/blobfuse-csi-driver/templates/rbac-csi-blob-node.yaml
@@ -4,7 +4,7 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: {{ .Release.Namespace }}
-  name: csi-blobfuse-node-secret-role
+  name: csi-blob-node-secret-role
 rules:
   - apiGroups: [""]
     resources: ["secrets"]
@@ -14,14 +14,14 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-blobfuse-node-secret-binding
+  name: csi-blob-node-secret-binding
   namespace: {{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
-    name: csi-blobfuse-node-sa
+    name: csi-blob-node-sa
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: csi-blobfuse-node-secret-role
+  name: csi-blob-node-secret-role
   apiGroup: rbac.authorization.k8s.io
 {{ end }}
diff --git a/charts/latest/blobfuse-csi-driver/templates/serviceaccount-csi-blob-node.yaml b/charts/latest/blobfuse-csi-driver/templates/serviceaccount-csi-blob-node.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: csi-blobfuse-node-sa
+  name: csi-blob-node-sa
   namespace: {{ .Release.Namespace }}
 {{ include "blobfuse.labels" . | indent 2 }}
 {{- end -}}
diff --git a/deploy/csi-blob-driver.yaml b/deploy/csi-blob-driver.yaml
diff --git a/deploy/csi-blob-node.yaml b/deploy/csi-blob-node.yaml
@@ -2,19 +2,19 @@
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
-  name: csi-blobfuse-node
+  name: csi-blob-node
   namespace: kube-system
 spec:
   selector:
     matchLabels:
-      app: csi-blobfuse-node
+      app: csi-blob-node
   template:
     metadata:
       labels:
-        app: csi-blobfuse-node
+        app: csi-blob-node
     spec:
       hostNetwork: true
-      serviceAccountName: csi-blobfuse-node-sa
+      serviceAccountName: csi-blob-node-sa
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: system-node-critical
diff --git a/deploy/install-driver.sh b/deploy/install-driver.sh
@@ -35,8 +35,8 @@ fi
 
 echo "Installing Azure Blob Storage CSI driver, version: $ver ..."
 kubectl apply -f $repo/rbac-csi-blob-controller.yaml
-kubectl apply -f $repo/rbac-csi-blobfuse-node.yaml
-kubectl apply -f $repo/csi-blobfuse-driver.yaml
+kubectl apply -f $repo/rbac-csi-blob-node.yaml
+kubectl apply -f $repo/csi-blob-driver.yaml
 kubectl apply -f $repo/csi-blob-controller.yaml
-kubectl apply -f $repo/csi-blobfuse-node.yaml
+kubectl apply -f $repo/csi-blob-node.yaml
 echo 'Azure Blob Storage CSI driver installed successfully.'
diff --git a/deploy/rbac-csi-blob-node.yaml b/deploy/rbac-csi-blob-node.yaml
@@ -2,14 +2,14 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: csi-blobfuse-node-sa
+  name: csi-blob-node-sa
   namespace: kube-system
 
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-blobfuse-node-secret-role
+  name: csi-blob-node-secret-role
   namespace: kube-system
 rules:
   - apiGroups: [""]
@@ -20,13 +20,13 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-blobfuse-node-secret-binding
+  name: csi-blob-node-secret-binding
   namespace: kube-system
 subjects:
   - kind: ServiceAccount
-    name: csi-blobfuse-node-sa
+    name: csi-blob-node-sa
     namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: csi-blobfuse-node-secret-role
+  name: csi-blob-node-secret-role
   apiGroup: rbac.authorization.k8s.io
diff --git a/deploy/uninstall-driver.sh b/deploy/uninstall-driver.sh
@@ -35,8 +35,8 @@ fi
 
 echo "Uninstalling Azure Blob Storage CSI driver, version: $ver ..."
 kubectl delete -f $repo/csi-blob-controller.yaml --ignore-not-found
-kubectl delete -f $repo/csi-blobfuse-node.yaml --ignore-not-found
-kubectl delete -f $repo/csi-blobfuse-driver.yaml --ignore-not-found
+kubectl delete -f $repo/csi-blob-node.yaml --ignore-not-found
+kubectl delete -f $repo/csi-blob-driver.yaml --ignore-not-found
 kubectl delete -f $repo/rbac-csi-blob-controller.yaml --ignore-not-found
-kubectl delete -f $repo/rbac-csi-blobfuse-node.yaml --ignore-not-found
+kubectl delete -f $repo/rbac-csi-blob-node.yaml --ignore-not-found
 echo 'Uninstalled Azure Blob Storage CSI driver successfully.'
diff --git a/docs/csi-debug.md b/docs/csi-debug.md
@@ -16,13 +16,13 @@ $ kubectl logs csi-blob-controller-56bfddd689-dh5tk -c blob -n kube-system > csi
 ### Case#2: volume mount/unmount failed
  - locate csi driver pod and make sure which pod do tha actual volume mount/unmount
 ```console
-$ kubectl get po -o wide -n kube-system | grep csi-blobfuse-node
+$ kubectl get po -o wide -n kube-system | grep csi-blob-node
 NAME                                           READY   STATUS    RESTARTS   AGE     IP             NODE
-csi-blobfuse-node-cvgbs                        3/3     Running   0          7m4s    10.240.0.35    k8s-agentpool-22533604-1
-csi-blobfuse-node-dr4s4                        3/3     Running   0          7m4s    10.240.0.4     k8s-agentpool-22533604-0
+csi-blob-node-cvgbs                        3/3     Running   0          7m4s    10.240.0.35    k8s-agentpool-22533604-1
+csi-blob-node-dr4s4                        3/3     Running   0          7m4s    10.240.0.4     k8s-agentpool-22533604-0
 ```
 
  - get csi driver logs
 ```console
-$ kubectl logs csi-blobfuse-node-cvgbs -c blob -n kube-system > csi-blobfuse-node.log
+$ kubectl logs csi-blob-node-cvgbs -c blob -n kube-system > csi-blob-node.log
 ```
diff --git a/docs/install-csi-driver-master.md b/docs/install-csi-driver-master.md
@@ -18,7 +18,7 @@ cd blobfuse-csi-driver
 - check pods status:
 ```console
 kubectl -n kube-system get pod -o wide -l app=csi-blob-controller
-kubectl -n kube-system get pod -o wide -l app=csi-blobfuse-node
+kubectl -n kube-system get pod -o wide -l app=csi-blob-node
 ```
 
 example output:
@@ -27,8 +27,8 @@ example output:
 NAME                                           READY   STATUS    RESTARTS   AGE     IP             NODE
 csi-blob-controller-56bfddd689-dh5tk       6/6     Running   0          35s     10.240.0.19    k8s-agentpool-22533604-0
 csi-blob-controller-56bfddd689-8pgr4       6/6     Running   0          35s     10.240.0.35    k8s-agentpool-22533604-1
-csi-blobfuse-node-cvgbs                        3/3     Running   0          35s     10.240.0.35    k8s-agentpool-22533604-1
-csi-blobfuse-node-dr4s4                        3/3     Running   0          35s     10.240.0.4     k8s-agentpool-22533604-0
+csi-blob-node-cvgbs                        3/3     Running   0          35s     10.240.0.35    k8s-agentpool-22533604-1
+csi-blob-node-dr4s4                        3/3     Running   0          35s     10.240.0.4     k8s-agentpool-22533604-0
 ```
 
 - clean up Azure Blob Storage CSI driver
diff --git a/hack/verify-helm-chart.sh b/hack/verify-helm-chart.sh
@@ -58,10 +58,10 @@ validate_image "${expected_liveness_probe_image}" "${liveness_probe_image}"
 blobfuse_image="$(get_image_from_helm_chart "blobfuse")"
 validate_image "${expected_blobfuse_image}" "${blobfuse_image}"
 
-# Extract images from csi-blobfuse-node.yaml
-expected_liveness_probe_image="$(cat ${PKG_ROOT}/deploy/csi-blobfuse-node.yaml | yq -r .spec.template.spec.containers[0].image | head -n 1)"
-expected_node_driver_registrar="$(cat ${PKG_ROOT}/deploy/csi-blobfuse-node.yaml | yq -r .spec.template.spec.containers[1].image | head -n 1)"
-expected_blobfuse_image="$(cat ${PKG_ROOT}/deploy/csi-blobfuse-node.yaml | yq -r .spec.template.spec.containers[2].image | head -n 1)"
+# Extract images from csi-blob-node.yaml
+expected_liveness_probe_image="$(cat ${PKG_ROOT}/deploy/csi-blob-node.yaml | yq -r .spec.template.spec.containers[0].image | head -n 1)"
+expected_node_driver_registrar="$(cat ${PKG_ROOT}/deploy/csi-blob-node.yaml | yq -r .spec.template.spec.containers[1].image | head -n 1)"
+expected_blobfuse_image="$(cat ${PKG_ROOT}/deploy/csi-blob-node.yaml | yq -r .spec.template.spec.containers[2].image | head -n 1)"
 
 validate_image "${expected_liveness_probe_image}" "${liveness_probe_image}"
 
diff --git a/pkg/blob/blob.go b/pkg/blob/blob.go
diff --git a/pkg/blob/blob_test.go b/pkg/blob/blob_test.go
diff --git a/test/utils/blob_log.sh b/test/utils/blob_log.sh
@@ -30,9 +30,9 @@ kubectl get pods -n${NS} -l${LABEL} \
     | awk 'NR>1 {print $1}' \
     | xargs -I {} kubectl logs {} --prefix -c${CONTAINER} -n${NS}
 
-echo "print out csi-blobfuse-node logs ..."
+echo "print out csi-blob-node logs ..."
 echo "======================================================================================"
-LABEL='app=csi-blobfuse-node'
+LABEL='app=csi-blob-node'
 kubectl get pods -n${NS} -l${LABEL} \
     | awk 'NR>1 {print $1}' \
     | xargs -I {} kubectl logs {} --prefix -c${CONTAINER} -n${NS}
