diff --git a/.travis.yml b/.travis.yml index 077f03b08..53eda458f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,8 @@ jobs: - curl -sf "https://install.goreleaser.com/github.com/golangci/golangci-lint.sh" | bash -s -- -b $GOPATH/bin "${GOLANGCI_VERSION}" + # install helm for helm lint + - curl -L https://git.io/get_helm.sh | bash script: - make static-check - make go-test diff --git a/deploy/cephfs/kubernetes/v1.13/helm/.helmignore b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/.helmignore similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/.helmignore rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/.helmignore diff --git a/deploy/cephfs/kubernetes/v1.13/helm/Chart.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/Chart.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/Chart.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/Chart.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/README.md b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/README.md similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/README.md rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/README.md diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/NOTES.txt b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/NOTES.txt similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/NOTES.txt rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/NOTES.txt diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/_helpers.tpl b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/_helpers.tpl similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/_helpers.tpl rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/_helpers.tpl diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/csidriver-crd.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/csidriver-crd.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/csidriver-crd.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/csidriver-crd.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/csiplugin-configmap.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/csiplugin-configmap.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-clusterrole.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/nodeplugin-clusterrole.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-clusterrole.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/nodeplugin-clusterrole.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/nodeplugin-clusterrolebinding.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/nodeplugin-clusterrolebinding.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-rules-clusterrole.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/nodeplugin-rules-clusterrole.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-rules-clusterrole.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/nodeplugin-rules-clusterrole.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-clusterrole.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-clusterrole.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-clusterrolebinding.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-clusterrolebinding.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-role.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-role.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-role.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-role.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-service.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-service.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-service.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-service.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-statefulset.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/templates/provisioner-statefulset.yaml diff --git a/deploy/cephfs/kubernetes/v1.13/helm/values.yaml b/deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/values.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.13/helm/values.yaml rename to deploy/cephfs/kubernetes/v1.13/helm/ceph-csi-cephfs/values.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/.helmignore b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/.helmignore similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/.helmignore rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/.helmignore diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/Chart.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/Chart.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/Chart.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/Chart.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/README.md b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/README.md similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/README.md rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/README.md diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/NOTES.txt b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/NOTES.txt similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/NOTES.txt rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/NOTES.txt diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/_helpers.tpl b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/_helpers.tpl similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/_helpers.tpl rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/_helpers.tpl diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/csidriver-crd.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/csidriver-crd.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/csiplugin-configmap.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/csiplugin-configmap.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrole.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-clusterrole.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrole.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-clusterrole.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-clusterrolebinding.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-clusterrolebinding.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-rules-clusterrole.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-rules-clusterrole.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-rules-clusterrole.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-rules-clusterrole.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-clusterrole.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-clusterrole.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-clusterrolebinding.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-clusterrolebinding.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-clusterrolebinding.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-deployment.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-deployment.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-role.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-role.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-role.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-role.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-rolebinding.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-rules-clusterrole.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml diff --git a/deploy/cephfs/kubernetes/v1.14+/helm/values.yaml b/deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/values.yaml similarity index 100% rename from deploy/cephfs/kubernetes/v1.14+/helm/values.yaml rename to deploy/cephfs/kubernetes/v1.14+/helm/ceph-csi-cephfs/values.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/.helmignore b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/.helmignore similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/.helmignore rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/.helmignore diff --git a/deploy/rbd/kubernetes/v1.13/helm/Chart.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/Chart.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/Chart.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/Chart.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/README.md b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/README.md similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/README.md rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/README.md diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/NOTES.txt b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/NOTES.txt similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/NOTES.txt rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/NOTES.txt diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/_helpers.tpl b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/_helpers.tpl similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/_helpers.tpl rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/_helpers.tpl diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/csidriver-crd.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/csidriver-crd.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/csidriver-crd.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/csidriver-crd.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/csiplugin-configmap.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/csiplugin-configmap.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/csiplugin-configmap.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-clusterrole.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/nodeplugin-clusterrole.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-clusterrole.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/nodeplugin-clusterrole.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/nodeplugin-clusterrolebinding.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-clusterrolebinding.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/nodeplugin-clusterrolebinding.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-daemonset.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-rules-clusterrole.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/nodeplugin-rules-clusterrole.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-rules-clusterrole.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/nodeplugin-rules-clusterrole.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/nodeplugin-serviceaccount.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-clusterrole.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-clusterrole.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-clusterrole.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-clusterrole.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-clusterrolebinding.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-clusterrolebinding.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-role.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-role.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-role.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-role.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-rolebinding.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rolebinding.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-rolebinding.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-rules-clusterrole.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-service.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-service.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-service.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-service.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-serviceaccount.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-statefulset.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/templates/provisioner-statefulset.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/templates/provisioner-statefulset.yaml diff --git a/deploy/rbd/kubernetes/v1.13/helm/values.yaml b/deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/values.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.13/helm/values.yaml rename to deploy/rbd/kubernetes/v1.13/helm/ceph-csi-rbd/values.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/.helmignore b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/.helmignore similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/.helmignore rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/.helmignore diff --git a/deploy/rbd/kubernetes/v1.14+/helm/Chart.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/Chart.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/Chart.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/Chart.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/README.md b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/README.md similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/README.md rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/README.md diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/NOTES.txt b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/NOTES.txt similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/NOTES.txt rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/NOTES.txt diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/_helpers.tpl b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/_helpers.tpl similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/_helpers.tpl rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/_helpers.tpl diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/csidriver-crd.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/csidriver-crd.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/csiplugin-configmap.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/csiplugin-configmap.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrole.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-clusterrole.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrole.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-clusterrole.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-clusterrolebinding.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-clusterrolebinding.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-rules-clusterrole.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-rules-clusterrole.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-rules-clusterrole.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-rules-clusterrole.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-clusterrole.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-clusterrole.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-clusterrole.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-clusterrole.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-clusterrolebinding.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-clusterrolebinding.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-clusterrolebinding.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-deployment.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-deployment.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-role.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-role.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-role.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-role.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-rolebinding.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-rolebinding.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-rules-clusterrole.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml diff --git a/deploy/rbd/kubernetes/v1.14+/helm/values.yaml b/deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/values.yaml similarity index 100% rename from deploy/rbd/kubernetes/v1.14+/helm/values.yaml rename to deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd/values.yaml diff --git a/docs/deploy-rbd.md b/docs/deploy-rbd.md index f73a0b2f7..ae35b606c 100644 --- a/docs/deploy-rbd.md +++ b/docs/deploy-rbd.md @@ -149,12 +149,12 @@ test the deployment further. The same requirements from the Kubernetes section apply here, i.e. Kubernetes version, privileged flag and shared mounts. -The Helm chart is located in `deploy/rbd/helm`. +The Helm chart is located in `deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd`. **Deploy Helm Chart:** ```bash -helm install ./deploy/rbd/helm +helm install deploy/rbd/kubernetes/v1.14+/helm/ceph-csi-rbd ``` The Helm chart deploys all of the required resources to use the CSI RBD driver. diff --git a/scripts/lint-text.sh b/scripts/lint-text.sh index 90862f251..81968983b 100755 --- a/scripts/lint-text.sh +++ b/scripts/lint-text.sh @@ -11,6 +11,7 @@ scriptdir="$(dirname "$(realpath "$0")")" cd "$scriptdir/.." # run_check [optional args to checker...] +# Pass empty regex when no regex is needed function run_check() { regex="$1" shift @@ -18,8 +19,12 @@ function run_check() { shift if [ -x "$(command -v "$exe")" ]; then - find . -path ./vendor -prune -o -regextype egrep -iregex "$regex" -print0 | - xargs -0rt -n1 "$exe" "$@" + if [ -z "$regex" ]; then + "$exe" "$@" + else + find . -path ./vendor -prune -o -regextype egrep -iregex "$regex" -print0 | + xargs -0rt -n1 "$exe" "$@" + fi elif [ "$all_required" -eq 0 ]; then echo "Warning: $exe not found... skipping some tests." else @@ -43,7 +48,10 @@ run_check '.*\.(ba)?sh' shellcheck run_check '.*\.(ba)?sh' bash -n # Install via: pip install yamllint -# disable yamlint chekck for helm chats -run_check '.*\.ya?ml' yamllint -s -d "{extends: default, rules: {line-length: {allow-non-breakable-inline-mappings: true}},ignore: deploy/*/kubernetes/*/helm/templates/*.yaml}" +# disable yamlint check for helm charts +run_check '.*\.ya?ml' yamllint -s -d "{extends: default, rules: {line-length: {allow-non-breakable-inline-mappings: true}},ignore: deploy/*/kubernetes/*/helm/*/templates/*.yaml}" + +# Install via: https://github.com/helm/helm/blob/master/docs/install.md +run_check '' helm lint --namespace=test deploy/*/kubernetes/*/helm/* echo "ALL OK."