cleanup: Move common files to deploy folder

docs/deploy-cephfs.md

@@ -148,7 +148,7 @@ for more information.
 **Deploy Ceph configuration ConfigMap for CSI pods:**
 
 ```bash
-kubectl create -f ../../../examples/ceph-conf.yaml
+kubectl create -f ../../ceph-conf.yaml
 ```
 
 **Deploy CSI sidecar containers:**

docs/deploy-rbd.md

@@ -134,7 +134,7 @@ for more information.
 **Deploy Ceph configuration ConfigMap for CSI pods:**
 
 ```bash
-kubectl create -f ../example/ceph-config.yaml
+kubectl create -f ../../ceph-conf.yaml
 ```
 
 **Deploy CSI sidecar containers:**

docs/metrics.md

@@ -23,7 +23,7 @@ csi_liveness 1
 ```
 
 Promethues can be deployed through the promethues operator described [here](https://coreos.com/operators/prometheus/docs/latest/user-guides/getting-started.html).
-The [service-monitor](../examples/service-monitor.yaml) will tell promethues how
+The [service-monitor](../deploy/service-monitor.yaml) will tell promethues how
 to pull metrics out of CSI.
 
 Each CSI pod has a service to expose the endpoint to prometheus. By default, rbd

e2e/cephfs.go

@@ -67,14 +67,15 @@ func deleteCephfsPlugin() {
 }
 
 func createORDeleteCephfsResources(action kubectlAction) {
+	cephConfigFile := getConfigFile(cephConfconfigMap, deployPath, examplePath)
 	resources := []ResourceDeployer{
 		// shared resources
 		&yamlResource{
 			filename:     cephFSDirPath + csiDriverObject,
 			allowMissing: true,
 		},
 		&yamlResource{
-			filename:     examplePath + cephConfconfigMap,
+			filename:     cephConfigFile,
 			allowMissing: true,
 		},
 		// dependencies for provisioner

e2e/nfs.go

@@ -79,14 +79,15 @@ func deleteNFSPlugin() {
 }
 
 func createORDeleteNFSResources(f *framework.Framework, action kubectlAction) {
+	cephConfigFile := getConfigFile(cephConfconfigMap, deployPath, examplePath)
 	resources := []ResourceDeployer{
 		// shared resources
 		&yamlResource{
 			filename:     nfsDirPath + csiDriverObject,
 			allowMissing: true,
 		},
 		&yamlResource{
-			filename:     examplePath + cephConfconfigMap,
+			filename:     cephConfigFile,
 			allowMissing: true,
 		},
 		// dependencies for provisioner

e2e/rbd.go

@@ -44,7 +44,8 @@ var (
 	configMap          = "csi-config-map.yaml"
 	cephConfconfigMap  = "ceph-conf.yaml"
 	csiDriverObject    = "csidriver.yaml"
-	rbdDirPath         = "../deploy/rbd/kubernetes/"
+	deployPath         = "../deploy/"
+	rbdDirPath         = deployPath + "/rbd/kubernetes/"
 	examplePath        = "../examples/"
 	rbdExamplePath     = examplePath + "/rbd/"
 	e2eTemplatesPath   = "../e2e/templates/"
@@ -129,14 +130,15 @@ func deleteRBDPlugin() {
 }
 
 func createORDeleteRbdResources(action kubectlAction) {
+	cephConfigFile := getConfigFile(cephConfconfigMap, deployPath, examplePath)
 	resources := []ResourceDeployer{
 		// shared resources
 		&yamlResource{
 			filename:     rbdDirPath + csiDriverObject,
 			allowMissing: true,
 		},
 		&yamlResource{
-			filename:     examplePath + cephConfconfigMap,
+			filename:     cephConfigFile,
 			allowMissing: true,
 		},
 		// dependencies for provisioner

e2e/utils.go

@@ -1732,3 +1732,14 @@ func rwopMayFail(err error) bool {
 
 	return !rwopSupported
 }
+
+// getConfigFile returns the config file path at the preferred location if it
+// exists there. Returns the fallback location otherwise.
+func getConfigFile(filename, preferred, fallback string) string {
+	configFile := preferred + filename
+	if _, err := os.Stat(configFile); os.IsNotExist(err) {
+		configFile = fallback + filename
+	}
+
+	return configFile
+}

examples/README.md

@@ -2,17 +2,17 @@
 
 ## Deploying Ceph-CSI services
 
-Create [ceph-config](./ceph-conf.yaml) configmap using the following command.
+Create [ceph-config](../deploy/ceph-conf.yaml) configmap using the following command.
 
 ```bash
-kubectl apply -f ./ceph-conf.yaml
+kubectl apply -f ../deploy/ceph-conf.yaml
 ```
 
 Both `rbd` and `cephfs` directories contain `plugin-deploy.sh` and
 `plugin-teardown.sh` helper scripts.  You can use those to help you
 deploy/teardown RBACs, sidecar containers and the plugin in one go.
 By default, they look for the YAML manifests in
-`../../deploy/{rbd,cephfs}/kubernetes`.
+`../deploy/{rbd,cephfs}/kubernetes`.
 You can override this path by running
 
 ```bash
@@ -25,7 +25,7 @@ The CSI plugin requires configuration information regarding the Ceph cluster(s),
 that would host the dynamically or statically provisioned volumes. This
 is provided by adding a per-cluster identifier (referred to as clusterID), and
 the required monitor details for the same, as in the provided [sample config
- map](./csi-config-map-sample.yaml).
+ map](../deploy/csi-config-map-sample.yaml).
 
 Gather the following information from the Ceph cluster(s) of choice,
 
@@ -38,13 +38,13 @@ Gather the following information from the Ceph cluster(s) of choice,
    * Alternatively, choose a `<cluster-id>` value that is distinct per Ceph
     cluster in use by this kubernetes cluster
 
-Update the [sample configmap](./csi-config-map-sample.yaml) with values
+Update the [sample configmap](../deploy/csi-config-map-sample.yaml) with values
 from a Ceph cluster and replace `<cluster-id>` with the chosen clusterID, to
 create the manifest for the configmap which can be updated in the cluster
 using the following command,
 
 ```bash
-kubectl replace -f ./csi-config-map-sample.yaml
+kubectl replace -f ../deploy/csi-config-map-sample.yaml
 ```
 
 Storage class and snapshot class, using `<cluster-id>` as the value for the