Rename prog/plugin-v2 to prog/net-plugin

Consensus was to call the plugin-v2 as weaveworks/net-plugin.

.gitignore

@@ -70,4 +70,4 @@ test/coverage.*
 *qemu-*-static
 terraform.tfstate
 terraform.tfstate.backup
-prog/plugin-v2/rootfs/
+prog/net-plugin/rootfs/

Makefile

@@ -123,7 +123,7 @@ PLUGIN_IMAGE=$(DOCKERHUB_USER)/net-plugin
 
 IMAGES=$(WEAVER_IMAGE) $(WEAVEEXEC_IMAGE) $(WEAVEKUBE_IMAGE) $(WEAVENPC_IMAGE) $(WEAVEDB_IMAGE)
 
-PLUGIN_WORK_DIR="prog/plugin-v2/rootfs"
+PLUGIN_WORK_DIR="prog/net-plugin/rootfs"
 PLUGIN_BUILD_IMG="plugin-builder"
 
 PUBLISH=publish_weave publish_weaveexec publish_plugin publish_weave-kube publish_weave-npc
@@ -267,20 +267,20 @@ $(WEAVEEXEC_UPTODATE): prog/weaveexec/Dockerfile.$(DOCKERHUB_USER) prog/weaveexe
 	touch $@
 
 # Builds Docker plugin.
-$(PLUGIN_UPTODATE): prog/plugin-v2/launch.sh prog/plugin-v2/config.json $(WEAVER_UPTODATE)
+$(PLUGIN_UPTODATE): prog/net-plugin/launch.sh prog/net-plugin/config.json $(WEAVER_UPTODATE)
 	-$(SUDO) docker rm -f $(PLUGIN_BUILD_IMG) 2>/dev/null
 	$(SUDO) docker create --name=$(PLUGIN_BUILD_IMG) $(WEAVER_IMAGE) true
 	rm -rf $(PLUGIN_WORK_DIR)
 	mkdir $(PLUGIN_WORK_DIR)
 	docker export $(PLUGIN_BUILD_IMG) | tar -x -C $(PLUGIN_WORK_DIR)
 	docker rm -f $(PLUGIN_BUILD_IMG)
-	cp prog/plugin-v2/launch.sh $(PLUGIN_WORK_DIR)/home/weave/launch.sh
+	cp prog/net-plugin/launch.sh $(PLUGIN_WORK_DIR)/home/weave/launch.sh
 	-docker plugin disable $(PLUGIN_IMAGE):$(WEAVE_VERSION) 2>/dev/null
 	-docker plugin rm $(PLUGIN_IMAGE):$(WEAVE_VERSION) 2>/dev/null
-	docker plugin create $(PLUGIN_IMAGE):$(WEAVE_VERSION) prog/plugin-v2
+	docker plugin create $(PLUGIN_IMAGE):$(WEAVE_VERSION) prog/net-plugin
 	-docker plugin disable $(PLUGIN_IMAGE):latest 2>/dev/null
 	-docker plugin rm $(PLUGIN_IMAGE):latest 2>/dev/null
-	docker plugin create $(PLUGIN_IMAGE):latest prog/plugin-v2
+	docker plugin create $(PLUGIN_IMAGE):latest prog/net-plugin
 	touch $@
 
 $(WEAVEKUBE_UPTODATE): prog/weave-kube/Dockerfile.$(DOCKERHUB_USER) prog/weave-kube/launch.sh $(KUBEPEERS_EXE) $(WEAVER_UPTODATE)

test/850_plugin_v2_cross_hosts_2_test.sh

@@ -14,7 +14,7 @@ setup_master() {
     # Build plugin-v2 on $HOST1, because Circle "CI" runs only ancient
     # version of Docker which does not support v2 plugins.
     build_plugin_img="buildpluginv2-ci"
-    rsync -az -e "$SSH" "$(dirname $0)/../prog/plugin-v2" $HOST1:~/
+    rsync -az -e "$SSH" "$(dirname $0)/../prog/net-plugin" $HOST1:~/
     $SSH $HOST1<<EOF
         docker rmi $build_plugin_img 2>/dev/null
         docker plugin disable $PLUGIN_NAME >/dev/null
@@ -25,8 +25,8 @@ setup_master() {
 
         docker create --name=$build_plugin_img weaveworks/weave true
         docker export $build_plugin_img | tar -x -C \${WORK_DIR}/rootfs
-        cp \${HOME}/plugin-v2/launch.sh \${WORK_DIR}/rootfs/home/weave/launch.sh
-        cp \${HOME}/plugin-v2/config.json \${WORK_DIR}
+        cp \${HOME}/net-plugin/launch.sh \${WORK_DIR}/rootfs/home/weave/launch.sh
+        cp \${HOME}/net-plugin/config.json \${WORK_DIR}
         docker plugin create $PLUGIN_NAME \${WORK_DIR}
 
         echo "$HOST1_IP weave-ci-registry" | sudo tee -a /etc/hosts