update docker registry used

2 files changed, 12 insertions, 4 deletions

diff --git a/make-linux.mk b/make-linux.mk
index 90ec2aac..33f65b11 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -322,7 +322,7 @@ central-controller:	FORCE
 	make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpq" CXXFLAGS="-I/usr/pgsql-10/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one
 
 central-controller-docker:	central-controller
-	docker build -t gcr.io/zerotier-central/ztcentral-controller:${TIMESTAMP} -f docker/Dockerfile . 
+	docker build -t docker.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} -f docker/Dockerfile . 
 
 debug:	FORCE
 	make ZT_DEBUG=1 one
diff --git a/update_controllers.sh b/update_controllers.sh
index 2991ad34..ad3f95a3 100755
--- a/update_controllers.sh
+++ b/update_controllers.sh
@@ -2,17 +2,25 @@
 
 if [ -z "$1" ]
 then
-    echo "Must supply a docker tag"
+    echo "Usage: $0 <docker_tag> <k8s_namespace>"
+    echo "    k8s_namesapce is set to default if not specified"
     exit 1
 fi
 
+if [ -z "$2" ]
+then
+    NAMESPACE=default
+else
+    NAMESPACE=$2
+fi
+
 TAG=$1
 
-CONTROLLERS=`kubectl get pods -o=name | grep controller | sed "s/^.\{4\}//" | cut -d '-' -f 2`
+CONTROLLERS=`kubectl get pods -o=name --namespace=${NAMESPACE} | grep controller | sed "s/^.\{4\}//" | cut -d '-' -f 2`
 
 for c in ${CONTROLLERS[@]}
 do
-    kubectl set image deployment controller-${c} ztcentral-controller=gcr.io/zerotier-central/ztcentral-controller:${TAG}
+    kubectl set image deployment --namespace=${NAMESPACE} controller-${c} ztcentral-controller=docker.zerotier.com/zerotier-central/ztcentral-controller:${TAG}
     echo "Sleeping for 1 minute"
     sleep 60
 done