chore: rename charts

andyzhangx · andyzhangx · commit 7e9b582449e5 · 2020-08-07T08:37:53.000Z
fix verification

fix chart installation
diff --git a/Makefile b/Makefile
@@ -61,10 +61,10 @@ e2e-test:
 e2e-bootstrap: install-helm
 	# Only build and push the image if it does not exist in the registry
 	docker pull $(IMAGE_TAG) || make blob-container push
-	helm install charts/latest/blobfuse-csi-driver -n blobfuse-csi-driver --namespace kube-system --wait \
-		--set image.blobfuse.pullPolicy=IfNotPresent \
-		--set image.blobfuse.repository=$(REGISTRY)/$(IMAGE_NAME) \
-		--set image.blobfuse.tag=$(IMAGE_VERSION)
+	helm install charts/latest/blob-csi-driver -n blob-csi-driver --namespace kube-system --wait \
+		--set image.blob.pullPolicy=IfNotPresent \
+		--set image.blob.repository=$(REGISTRY)/$(IMAGE_NAME) \
+		--set image.blob.tag=$(IMAGE_VERSION)
 
 .PHONY: install-helm
 install-helm:
@@ -76,7 +76,7 @@ install-helm:
 
 .PHONY: e2e-teardown
 e2e-teardown:
-	helm delete --purge blobfuse-csi-driver
+	helm delete --purge blob-csi-driver
 
 .PHONY: blob
 blob:
diff --git a/charts/README.md b/charts/README.md
@@ -9,16 +9,16 @@ Quick start instructions for the setup and configuration of Azure Blob Storage C
 ## Install latest CSI Driver via `helm install`
 
 ```console
-$ cd $GOPATH/src/sigs.k8s.io/blobfuse-csi-driver/charts/latest
-$ helm package blobfuse-csi-driver
-$ helm install blobfuse-csi-driver blobfuse-csi-driver-latest.tgz --namespace kube-system
+$ cd $GOPATH/src/sigs.k8s.io/blob-csi-driver/charts/latest
+$ helm package blob-csi-driver
+$ helm install blob-csi-driver blob-csi-driver-latest.tgz --namespace kube-system
 ```
   
 ## Install CSI Driver released version using Helm repository
 
 ```console
-$ helm repo add blobfuse-csi-driver https://raw.githubusercontent.com/kubernetes-sigs/blobfuse-csi-driver/master/charts
-$ helm install  blobfuse-csi-driver blobfuse-csi-driver/blobfuse-csi-driver --namespace kube-system
+$ helm repo add blob-csi-driver https://raw.githubusercontent.com/kubernetes-sigs/blobfuse-csi-driver/master/charts
+$ helm install blob-csi-driver blobfuse-csi-driver/blobfuse-csi-driver --namespace kube-system
 ```
   
 ### Search for different versions of charts available
@@ -28,23 +28,23 @@ $ helm search repo -l blobfuse-csi-driver/
 ### Install a specific version of Helm chart
 Specify the version of the chart to be installed using the `--version` parameter. 
 ```console
-helm install  blobfuse-csi-driver blobfuse-csi-driver/blobfuse-csi-driver --namespace kube-system --version v0.6.0
+helm install blob-csi-driver blobfuse-csi-driver/blob-csi-driver --namespace kube-system --version v0.6.0
 ```
 
 ## Uninstall
 
 ```console
-$ helm uninstall blobfuse-csi-driver -n kube-system
+$ helm uninstall blob-csi-driver -n kube-system
 ```  
 ## The Latest Helm Chart Configuration
 
 The following table lists the configurable parameters of the latest Azure Blob Storage CSI driver chart and their default values.
 
 | Parameter                                         | Description                                                | Default                                                           |
 |---------------------------------------------------|------------------------------------------------------------|-------------------------------------------------------------------|
-| `image.blobfuse.repository`                       | blobfuse-csi-driver docker image                           | mcr.microsoft.com/k8s/csi/blobfuse-csi                            |
-| `image.blobfuse.tag`                              | blobfuse-csi-driver docker image tag                       | latest                                                            |
-| `image.blobfuse.pullPolicy`                       | blobfuse-csi-driver image pull policy                      | IfNotPresent                                                      |
+| `image.blob.repository`                       | blob-csi-driver docker image                           | mcr.microsoft.com/k8s/csi/blob-csi                            |
+| `image.blob.tag`                              | blob-csi-driver docker image tag                       | latest                                                            |
+| `image.blob.pullPolicy`                       | blob-csi-driver image pull policy                      | IfNotPresent                                                      |
 | `image.csiProvisioner.repository`                 | csi-provisioner docker image                               | mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner              |
 | `image.csiProvisioner.tag`                        | csi-provisioner docker image tag                           | v1.4.0                                                            |
 | `image.csiProvisioner.pullPolicy`                 | csi-provisioner image pull policy                          | IfNotPresent                                                      |
diff --git a/charts/latest/blob-csi-driver/Chart.yaml b/charts/latest/blob-csi-driver/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: latest
 description: Azure Blob Storage CSI driver
-name: blobfuse-csi-driver
+name: blob-csi-driver
 version: latest
diff --git a/charts/latest/blob-csi-driver/templates/NOTES.txt b/charts/latest/blob-csi-driver/templates/NOTES.txt
diff --git a/charts/latest/blob-csi-driver/templates/_helpers.tpl b/charts/latest/blob-csi-driver/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/* vim: set filetype=mustache: */}}
 
 {{/* labels for helm resources */}}
-{{- define "blobfuse.labels" -}}
+{{- define "blob.labels" -}}
 labels:
   heritage: "{{ .Release.Service }}"
   release: "{{ .Release.Name }}"
diff --git a/charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml b/charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml
@@ -3,15 +3,15 @@ apiVersion: apps/v1
 metadata:
   name: csi-blob-controller
   namespace: {{ .Release.Namespace }}
-{{ include "blobfuse.labels" . | indent 2 }}
+{{ include "blob.labels" . | indent 2 }}
 spec:
   replicas: {{ .Values.controller.replicas }}
   selector:
     matchLabels:
       app: csi-blob-controller
   template:
     metadata:
-{{ include "blobfuse.labels" . | indent 6 }}
+{{ include "blob.labels" . | indent 6 }}
         app: csi-blob-controller
     spec:
       hostNetwork: true
@@ -85,7 +85,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: blob
-          image: "{{ .Values.image.blobfuse.repository }}:{{ .Values.image.blobfuse.tag }}"
+          image: "{{ .Values.image.blob.repository }}:{{ .Values.image.blob.tag }}"
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
@@ -113,7 +113,7 @@ spec:
                   optional: true
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
-          imagePullPolicy: {{ .Values.image.blobfuse.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.blob.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
diff --git a/charts/latest/blob-csi-driver/templates/csi-blob-driver.yaml b/charts/latest/blob-csi-driver/templates/csi-blob-driver.yaml
diff --git a/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml b/charts/latest/blob-csi-driver/templates/csi-blob-node.yaml
@@ -3,14 +3,14 @@ apiVersion: apps/v1
 metadata:
   name: csi-blob-node
   namespace: {{ .Release.Namespace }}
-{{ include "blobfuse.labels" . | indent 2 }}
+{{ include "blob.labels" . | indent 2 }}
 spec:
   selector:
     matchLabels:
       app: csi-blob-node
   template:
     metadata:
-{{ include "blobfuse.labels" . | indent 6 }}
+{{ include "blob.labels" . | indent 6 }}
         app: csi-blob-node
     spec:
       hostNetwork: true
@@ -67,7 +67,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: blob
-          image: "{{ .Values.image.blobfuse.repository }}:{{ .Values.image.blobfuse.tag }}"
+          image: "{{ .Values.image.blob.repository }}:{{ .Values.image.blob.tag }}"
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
diff --git a/charts/latest/blob-csi-driver/templates/rbac-csi-blob-controller.yaml b/charts/latest/blob-csi-driver/templates/rbac-csi-blob-controller.yaml
@@ -2,8 +2,8 @@
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-external-provisioner-role
-{{ include "blobfuse.labels" . | indent 2 }}
+  name: blob-external-provisioner-role
+{{ include "blob.labels" . | indent 2 }}
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -32,25 +32,25 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-csi-provisioner-binding
+  name: blob-csi-provisioner-binding
   namespace: {{ .Release.Namespace }}
-{{ include "blobfuse.labels" . | indent 2 }}
+{{ include "blob.labels" . | indent 2 }}
 subjects:
   - kind: ServiceAccount
     name: csi-blob-controller-sa
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: blobfuse-external-provisioner-role
+  name: blob-external-provisioner-role
   apiGroup: rbac.authorization.k8s.io
 
 ---
 
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-external-attacher-role
-{{ include "blobfuse.labels" . | indent 2 }}
+  name: blob-external-attacher-role
+{{ include "blob.labels" . | indent 2 }}
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -73,25 +73,25 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-csi-attacher-binding
+  name: blob-csi-attacher-binding
   namespace: {{ .Release.Namespace }}
-{{ include "blobfuse.labels" . | indent 2 }}
+{{ include "blob.labels" . | indent 2 }}
 subjects:
   - kind: ServiceAccount
     name: csi-blob-controller-sa
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: blobfuse-external-attacher-role
+  name: blob-external-attacher-role
   apiGroup: rbac.authorization.k8s.io
 
 ---
 
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-external-snapshotter-role
-{{ include "blobfuse.labels" . | indent 2 }}
+  name: blob-external-snapshotter-role
+{{ include "blob.labels" . | indent 2 }}
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -129,16 +129,16 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-csi-snapshotter-binding
+  name: blob-csi-snapshotter-binding
   namespace: {{ .Release.Namespace }}
-{{ include "blobfuse.labels" . | indent 2 }}
+{{ include "blob.labels" . | indent 2 }}
 subjects:
   - kind: ServiceAccount
     name: csi-blob-controller-sa
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: blobfuse-external-snapshotter-role
+  name: blob-external-snapshotter-role
   apiGroup: rbac.authorization.k8s.io
 
 ---
diff --git a/charts/latest/blob-csi-driver/templates/rbac-csi-blob-node.yaml b/charts/latest/blob-csi-driver/templates/rbac-csi-blob-node.yaml
diff --git a/charts/latest/blob-csi-driver/templates/serviceaccount-csi-blob-controller.yaml b/charts/latest/blob-csi-driver/templates/serviceaccount-csi-blob-controller.yaml
@@ -4,5 +4,5 @@ kind: ServiceAccount
 metadata:
   name: csi-blob-controller-sa
   namespace: {{ .Release.Namespace }}
-{{ include "blobfuse.labels" . | indent 2 }}
+{{ include "blob.labels" . | indent 2 }}
 {{- end -}}
diff --git a/charts/latest/blob-csi-driver/templates/serviceaccount-csi-blob-node.yaml b/charts/latest/blob-csi-driver/templates/serviceaccount-csi-blob-node.yaml
@@ -4,5 +4,5 @@ kind: ServiceAccount
 metadata:
   name: csi-blob-node-sa
   namespace: {{ .Release.Namespace }}
-{{ include "blobfuse.labels" . | indent 2 }}
+{{ include "blob.labels" . | indent 2 }}
 {{- end -}}
diff --git a/charts/latest/blob-csi-driver/values.yaml b/charts/latest/blob-csi-driver/values.yaml
@@ -1,5 +1,5 @@
 image:
-  blobfuse:
+  blob:
     repository: mcr.microsoft.com/k8s/csi/blob-csi
     tag: latest
     pullPolicy: IfNotPresent
diff --git a/deploy/example/e2e_usage.md b/deploy/example/e2e_usage.md
@@ -1,6 +1,6 @@
 ## CSI driver E2E usage example
 create a pod with blobfuse mount on linux
-### Dynamic Provisioning (create storage account and container by blobfuse driver)
+### Dynamic Provisioning (create storage account and container by Blob Storage CSI driver)
  - Create a blobfuse CSI storage class
 ```console
 kubectl create -f https://raw.githubusercontent.com/kubernetes-sigs/blobfuse-csi-driver/master/deploy/example/storageclass-blobfuse-csi.yaml
diff --git a/deploy/rbac-csi-blob-controller.yaml b/deploy/rbac-csi-blob-controller.yaml
@@ -9,7 +9,7 @@ metadata:
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-external-provisioner-role
+  name: blob-external-provisioner-role
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -37,22 +37,22 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-csi-provisioner-binding
+  name: blob-csi-provisioner-binding
 subjects:
   - kind: ServiceAccount
     name: csi-blob-controller-sa
     namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: blobfuse-external-provisioner-role
+  name: blob-external-provisioner-role
   apiGroup: rbac.authorization.k8s.io
 
 ---
 
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-external-attacher-role
+  name: blob-external-attacher-role
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -75,22 +75,22 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-csi-attacher-binding
+  name: blob-csi-attacher-binding
 subjects:
   - kind: ServiceAccount
     name: csi-blob-controller-sa
     namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: blobfuse-external-attacher-role
+  name: blob-external-attacher-role
   apiGroup: rbac.authorization.k8s.io
 
 ---
 
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-external-snapshotter-role
+  name: blob-external-snapshotter-role
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -128,14 +128,14 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blobfuse-csi-snapshotter-binding
+  name: blob-csi-snapshotter-binding
 subjects:
   - kind: ServiceAccount
     name: csi-blob-controller-sa
     namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: blobfuse-external-snapshotter-role
+  name: blob-external-snapshotter-role
   apiGroup: rbac.authorization.k8s.io
 
 ---
diff --git a/docs/csi-dev.md b/docs/csi-dev.md
@@ -6,10 +6,10 @@ $ mkdir -p $GOPATH/src/sigs.k8s.io
 $ git clone https://github.com/kubernetes-sigs/blobfuse-csi-driver $GOPATH/src/sigs.k8s.io
 ```
 
- - Build blobfuse driver
+ - Build Blob Storage CSI driver
 ```console
 $ cd $GOPATH/src/sigs.k8s.io/blobfuse-csi-driver
-$ make blobfuse
+$ make blob
 ```
 
  - Run verification before sending PR
diff --git a/hack/verify-helm-chart.sh b/hack/verify-helm-chart.sh
diff --git a/hack/verify-yamllint.sh b/hack/verify-yamllint.sh
