Merge branch 'master' of https://github.com/dotmesh-io/dotmesh

* 'master' of https://github.com/dotmesh-io/dotmesh:
  263: Google still used the default FV dir up to 1.8
  263: Made a typo! That's why it wasn't working!
  263: Log flexvolume installation
  263: Make 1.7 versions of YAML, deprecate old `dotmesh.yaml`
  #263: Ability to pass the flexvolume driver path in via k8s yaml.
  NFC: Print out the actual URL base in the unstable build job, so it's easier to find it.
  263: Forgot the `dotmesh.io~dm` in the pathname!
  263: Temporarily kill kubernetes tests, as they won't pass in this GKE-only configuration.
  263: Use /home/kubernetes/flexvolume as the FV plugin dir, for GKE.

.gitlab-ci.yml

@@ -267,7 +267,7 @@ trigger_e2e_test:
     except:
         - /^release-.*$/
 
-deploy_master_build:
+deploy_unstable_build:
     stage: deploy
     dependencies:
         - build_client_linux
@@ -279,6 +279,7 @@ deploy_master_build:
     script:
         - "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no releases@get.dotmesh.io mkdir -p /pool/releases/unstable/$CI_COMMIT_REF_NAME"
         - "rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' -avz binaries/{Linux,Darwin} yaml releases@get.dotmesh.io:/pool/releases/unstable/$CI_COMMIT_REF_NAME"
+        - "echo \"Deployed to https://get.dotmesh.io/unstable/$CI_COMMIT_REF_NAME\""
     except:
         - /^release-.*$/
 

cmd/dotmesh-server/pkg/main/kubernetes.go

@@ -1,10 +1,11 @@
 package main
 
 import (
+	"log"
 	"os"
 )
 
-var FLEXVOLUME_DIR = "/system-usr/usr/libexec/kubernetes/kubelet-plugins/volume/exec/dotmesh.io~dm"
+var FLEXVOLUME_DIR = "/system-flexvolume/dotmesh.io~dm"
 var FLEXVOLUME_BIN = "dm"
 var FLEXVOLUME_SOURCE = "/usr/local/bin/flexvolume"
 
@@ -15,6 +16,7 @@ func installKubernetesPlugin() error {
 	if os.Getenv("DISABLE_FLEXVOLUME") != "" {
 		return nil
 	}
+	log.Printf("[flexvolume] Installing driver into %s...", FLEXVOLUME_DIR)
 
 	_, err := os.Stat(FLEXVOLUME_DIR)
 	if os.IsNotExist(err) {
@@ -39,5 +41,7 @@ func installKubernetesPlugin() error {
 		return err
 	}
 
+	log.Printf("[flexvolume] Installed into %s.", FLEXVOLUME_DIR)
+
 	return nil
 }

cmd/dotmesh-server/pkg/main/main.go

@@ -52,12 +52,6 @@ func main() {
 		FilesystemMetadataTimeout: FILESYSTEM_METADATA_TIMEOUT_INT,
 	}
 
-	err = installKubernetesPlugin()
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-
 	POOL = os.Getenv("POOL")
 	if POOL == "" {
 		POOL = "pool"
@@ -104,6 +98,12 @@ func main() {
 	}
 	setupLogging()
 
+	err = installKubernetesPlugin()
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
 	localPoolId, err := findLocalPoolId()
 	if err != nil {
 		out("Unable to determine pool ID. Make sure to run me as root.\n" +

cmd/dotmesh-server/require_zfs.sh

@@ -42,6 +42,7 @@ FILE=${DIR}/dotmesh_data
 POOL=${USE_POOL_NAME:-pool}
 POOL=$(echo $POOL |sed s/\#HOSTNAME\#/$(hostname)/)
 MOUNTPOINT=${MOUNTPOINT:-$DIR/mnt}
+FLEXVOLUME_DRIVER_DIR=${FLEXVOLUME_DRIVER_DIR:-/usr/libexec/kubernetes/kubelet-plugins/volume/exec}
 INHERIT_ENVIRONMENT_NAMES=( "FILESYSTEM_METADATA_TIMEOUT" "DOTMESH_UPGRADES_URL" "DOTMESH_UPGRADES_INTERVAL_SECONDS")
 
 echo "=== Using mountpoint $MOUNTPOINT"
@@ -202,7 +203,7 @@ docker run -i $rm_opt --privileged --name=dotmesh-server-inner \
     -v /run/docker/plugins:/run/docker/plugins \
     -v $MOUNTPOINT:$MOUNTPOINT:rshared \
     -v /var/dotmesh:/var/dotmesh \
-    -v /usr:/system-usr/usr \
+    -v $FLEXVOLUME_DRIVER_DIR:/system-flexvolume \
     -l traefik.port=6969 \
     -l traefik.frontend.rule=Host:cloud.dotmesh.io \
     $net \