comments, revert a var rename for smaller diff

Author: chrisplo

Makefile

@@ -19,7 +19,7 @@ TAR_EXT := tar.bz2
 export NETPLUGIN_CONTAINER_TAG := $(shell ./scripts/getGitVersion.sh)
 TAR_FILENAME := $(NAME)-$(VERSION).$(TAR_EXT)
 TAR_LOC := .
-export NETPLUGIN_TAR_FILE := $(TAR_LOC)/$(TAR_FILENAME)
+export TAR_FILE := $(TAR_LOC)/$(TAR_FILENAME)
 export V2PLUGIN_TAR_FILENAME := v2plugin-$(VERSION).tar.gz
 GO_MIN_VERSION := 1.7
 GO_MAX_VERSION := 1.8
@@ -302,19 +302,24 @@ host-plugin-create:
 	docker plugin create ${CONTIV_V2PLUGIN_NAME} install/v2plugin
 	docker plugin enable ${CONTIV_V2PLUGIN_NAME}
 
-# re-deploy the v2plugin in docker with latest versioned binaries
+# Note: only updates a single host
+# shortcut for an existing v2plugin cluster to update the netplugin
+# binaries, recommended uses:
+# 'make node1-make-targets=host-plugin-update tar make-on-node1-dep'
+# on the VM: 'make compile archive host-plugin-update'
 host-plugin-update: host-plugin-remove unarchive host-plugin-create
 	rm -rf install/v2plugin/rootfs
 
 # cleanup all containers, recreate and start the v2plugin on all hosts
-# uses the latest compile binaries
+# uses the latest compiled binaries
 host-plugin-restart: unarchive
 	@echo dev: restarting services...
 	cd $(GOPATH)/src/github.com/contiv/netplugin/scripts/python \
 		&& PYTHONIOENCODING=utf-8 ./startPlugin.py -nodes ${CLUSTER_NODE_IPS} \
 			-plugintype "v2plugin"
 
 # unpack v2plugin archive created by host-pluginfs-create
+# Note: do not unpack locally to share with VM, unpack on the target machine
 host-pluginfs-unpack:
 	# clear out old plugin completely
 	sudo rm -rf install/v2plugin/rootfs
@@ -361,14 +366,9 @@ host-plugin-release: tar host-pluginfs-create host-pluginfs-unpack host-plugin-c
 	docker plugin push ${CONTIV_V2PLUGIN_NAME}
 
 # unarchive versioned binaries to bin, usually as a helper for other targets
-# uses the version stored in file 'netplugin-version' which is produced anytime
-# binaries are compiled (and that version can be set with env var
-# 'BUILD_VERSION'
 unarchive:
-	@# $(NETPLUGIN_TAR_FILE) depends on local file netplugin-version (exists in image),
-	@# but it is evaluated after we have extracted that file to local disk
 	@echo Updating bin/ with binaries versioned $(VERSION)
-	tar -xf $(NETPLUGIN_TAR_FILE) -C bin
+	tar -xf $(TAR_FILE) -C bin
 
 # pulls netplugin binaries from build container
 binaries-from-container:
@@ -386,7 +386,7 @@ binaries-from-container:
 archive:
 	$(TAR) --version | grep -q GNU \
 		|| (echo Please use GNU tar as \'gtar\' or \'tar\'; exit 1)
-	$(TAR) --owner=0 --group=0 -jcf $(NETPLUGIN_TAR_FILE) \
+	$(TAR) --owner=0 --group=0 -jcf $(TAR_FILE) \
 		-C bin netplugin netmaster netctl contivk8s netcontiv \
 		-C ../scripts contrib/completion/bash/netctl get-contiv-diags
 
@@ -399,7 +399,7 @@ clean-tar:
 
 # do not run directly, use "release" target
 release-built-version: tar
-	TAR_FILENAME=$(TAR_FILENAME) TAR_FILE=$(NETPLUGIN_TAR_FILE) OLD_VERSION=${OLD_VERSION} \
+	TAR_FILENAME=$(TAR_FILENAME) TAR_FILE=$(TAR_FILE) OLD_VERSION=${OLD_VERSION} \
 	NIGHTLY_RELEASE=${NIGHTLY_RELEASE} scripts/release.sh
 	@make clean-tar
 

scripts/v2plugin_rootfs.sh

@@ -2,10 +2,12 @@
 
 # Script to create the docker v2 plugin
 # run this script from contiv/netplugin directory
+
 # requires NETPLUGIN_CONTAINER_TAG for contivrootfs image
-# requires CONTIV_NETPLUGIN_NAME, the Network Driver name for requests to
+# requires CONTIV_V2PLUGIN_NAME, the Network Driver name for requests to
 #   dockerd, should look like contiv/v2plugin:$NETPLUGIN_CONTAINER_TAG
-# requires NETPLUGIN_TAR_FILE to point to the netplugin binaries
+# requires TAR_FILE to point to the netplugin binaries
+# requires V2PLUGIN_TAR_FILENAME to point to the v2plugin archive
 
 set -euxo pipefail
 
@@ -18,13 +20,13 @@ sed '/##/d;s/__CONTIV_V2PLUGIN_NAME__/${CONTIV_V2PLUGIN_NAME}/' \
     install/v2plugin/config.template > install/v2plugin/config.json
 
 # copy over binaries
-cp ${NETPLUGIN_TAR_FILE} install/v2plugin/
+cp ${TAR_FILE} install/v2plugin/
 
 DOCKER_IMAGE=contivrootfs:${NETPLUGIN_CONTAINER_TAG}
 docker build -t ${DOCKER_IMAGE} \
-    --build-arg TAR_FILE=$(basename "${NETPLUGIN_TAR_FILE}") install/v2plugin
+    --build-arg TAR_FILE=$(basename "${TAR_FILE}") install/v2plugin
 
-rm install/v2plugin/${NETPLUGIN_TAR_FILE}
+rm install/v2plugin/${TAR_FILE}
 
 # creates a ready to run container but doesn't run it
 id=$(docker create $DOCKER_IMAGE true)