Revert "Replace AWS CNI with weave-net (#261)"

This reverts commit 9275f6d.

Author: deliahu

Makefile

@@ -135,8 +135,6 @@ ci-build-images:
 	@./build/build-image.sh images/fluentd fluentd
 	@./build/build-image.sh images/nginx-controller nginx-controller
 	@./build/build-image.sh images/nginx-backend nginx-backend
-	@./build/build-image.sh images/weave-kube weave-kube
-	@./build/build-image.sh images/weave-npc weave-npc
 	@./build/build-image.sh images/python-packager python-packager
 	@./build/build-image.sh images/cluster-autoscaler cluster-autoscaler
 	@./build/build-image.sh images/nvidia nvidia
@@ -157,8 +155,6 @@ ci-push-images:
 	@./build/push-image.sh fluentd
 	@./build/push-image.sh nginx-controller
 	@./build/push-image.sh nginx-backend
-	@./build/push-image.sh weave-kube
-	@./build/push-image.sh weave-npc
 	@./build/push-image.sh python-packager
 	@./build/push-image.sh cluster-autoscaler
 	@./build/push-image.sh nvidia

cortex.sh

@@ -120,8 +120,6 @@ export CORTEX_IMAGE_MANAGER="${CORTEX_IMAGE_MANAGER:-cortexlabs/manager:$CORTEX_
 export CORTEX_IMAGE_FLUENTD="${CORTEX_IMAGE_FLUENTD:-cortexlabs/fluentd:$CORTEX_VERSION_STABLE}"
 export CORTEX_IMAGE_NGINX_BACKEND="${CORTEX_IMAGE_NGINX_BACKEND:-cortexlabs/nginx-backend:$CORTEX_VERSION_STABLE}"
 export CORTEX_IMAGE_NGINX_CONTROLLER="${CORTEX_IMAGE_NGINX_CONTROLLER:-cortexlabs/nginx-controller:$CORTEX_VERSION_STABLE}"
-export CORTEX_IMAGE_WEAVE_KUBE="${CORTEX_IMAGE_WEAVE_KUBE:-cortexlabs/weave-kube:$CORTEX_VERSION_STABLE}"
-export CORTEX_IMAGE_WEAVE_NPC="${CORTEX_IMAGE_WEAVE_NPC:-cortexlabs/weave-npc:$CORTEX_VERSION_STABLE}"
 export CORTEX_IMAGE_OPERATOR="${CORTEX_IMAGE_OPERATOR:-cortexlabs/operator:$CORTEX_VERSION_STABLE}"
 export CORTEX_IMAGE_SPARK="${CORTEX_IMAGE_SPARK:-cortexlabs/spark:$CORTEX_VERSION_STABLE}"
 export CORTEX_IMAGE_SPARK_OPERATOR="${CORTEX_IMAGE_SPARK_OPERATOR:-cortexlabs/spark-operator:$CORTEX_VERSION_STABLE}"
@@ -153,8 +151,6 @@ function install_eks() {
     -e CORTEX_NODE_TYPE=$CORTEX_NODE_TYPE \
     -e CORTEX_NODES_MIN=$CORTEX_NODES_MIN \
     -e CORTEX_NODES_MAX=$CORTEX_NODES_MAX \
-    -e CORTEX_IMAGE_WEAVE_KUBE=$CORTEX_IMAGE_WEAVE_KUBE \
-    -e CORTEX_IMAGE_WEAVE_NPC=$CORTEX_IMAGE_WEAVE_NPC \
     $CORTEX_IMAGE_MANAGER
 }
 

dev/registry.sh

@@ -39,8 +39,6 @@ function create_registry() {
   aws ecr create-repository --repository-name=cortexlabs/fluentd --region=$REGISTRY_REGION || true
   aws ecr create-repository --repository-name=cortexlabs/nginx-backend --region=$REGISTRY_REGION || true
   aws ecr create-repository --repository-name=cortexlabs/nginx-controller --region=$REGISTRY_REGION || true
-  aws ecr create-repository --repository-name=cortexlabs/weave-kube --region=$REGISTRY_REGION || true
-  aws ecr create-repository --repository-name=cortexlabs/weave-npc --region=$REGISTRY_REGION || true
   aws ecr create-repository --repository-name=cortexlabs/operator --region=$REGISTRY_REGION || true
   aws ecr create-repository --repository-name=cortexlabs/spark --region=$REGISTRY_REGION || true
   aws ecr create-repository --repository-name=cortexlabs/spark-operator --region=$REGISTRY_REGION || true
@@ -136,8 +134,6 @@ elif [ "$cmd" = "update" ]; then
     build_and_push $ROOT/images/tf-train tf-train latest
     build_and_push $ROOT/images/tf-train-gpu tf-train-gpu latest
     build_and_push $ROOT/images/nginx-controller nginx-controller latest
-    build_and_push $ROOT/images/weave-kube weave-kube latest
-    build_and_push $ROOT/images/weave-npc weave-npc latest
     build_and_push $ROOT/images/nginx-backend nginx-backend latest
     build_and_push $ROOT/images/fluentd fluentd latest
     build_and_push $ROOT/images/tf-serve tf-serve latest

docs/cluster/config.md

@@ -43,8 +43,6 @@ export CORTEX_IMAGE_MANAGER="cortexlabs/manager:master"
 export CORTEX_IMAGE_FLUENTD="cortexlabs/fluentd:master"
 export CORTEX_IMAGE_NGINX_BACKEND="cortexlabs/nginx-backend:master"
 export CORTEX_IMAGE_NGINX_CONTROLLER="cortexlabs/nginx-controller:master"
-export CORTEX_IMAGE_WEAVE_KUBE="cortexlabs/weave-kube:master"
-export CORTEX_IMAGE_WEAVE_NPC="cortexlabs/weave-npc:master"
 export CORTEX_IMAGE_OPERATOR="cortexlabs/operator:master"
 export CORTEX_IMAGE_SPARK="cortexlabs/spark:master"
 export CORTEX_IMAGE_SPARK_OPERATOR="cortexlabs/spark-operator:master"

docs/cluster/development.md

@@ -59,8 +59,6 @@ export CORTEX_IMAGE_MANAGER="XXXXXXXX.dkr.ecr.us-west-2.amazonaws.com/cortexlabs
 export CORTEX_IMAGE_FLUENTD="XXXXXXXX.dkr.ecr.us-west-2.amazonaws.com/cortexlabs/fluentd:latest"
 export CORTEX_IMAGE_NGINX_BACKEND="XXXXXXXX.dkr.ecr.us-west-2.amazonaws.com/cortexlabs/nginx-backend:latest"
 export CORTEX_IMAGE_NGINX_CONTROLLER="XXXXXXXX.dkr.ecr.us-west-2.amazonaws.com/cortexlabs/nginx-controller:latest"
-export CORTEX_IMAGE_WEAVE_KUBE="XXXXXXXX.dkr.ecr.us-west-2.amazonaws.com/cortexlabs/weave-kube:latest"
-export CORTEX_IMAGE_WEAVE_NPC="XXXXXXXX.dkr.ecr.us-west-2.amazonaws.com/cortexlabs/weave-npc:latest"
 export CORTEX_IMAGE_ONNX_SERVE="XXXXXXXX.dkr.ecr.us-west-2.amazonaws.com/cortexlabs/onnx-serve:latest"
 export CORTEX_IMAGE_ONNX_SERVE_GPU="XXXXXXXX.dkr.ecr.us-west-2.amazonaws.com/cortexlabs/onnx-serve-gpu:latest"
 export CORTEX_IMAGE_OPERATOR="XXXXXXXX.dkr.ecr.us-west-2.amazonaws.com/cortexlabs/operator:latest"

images/weave-kube/Dockerfile

@@ -21,19 +21,11 @@ echo -e "\nSpinning up the cluster ... (this will take about 15 minutes)\n"
 eksctl create cluster --name=$CORTEX_CLUSTER \
                       --region=$CORTEX_REGION \
                       --zones=$CORTEX_ZONES \
-                      --without-nodegroup \
-                      --version=1.13
-
-# Replace AWS CNI with weave-net
-kubectl delete daemonset aws-node -n kube-system >/dev/null
-envsubst < manifests/weave-net.yaml | kubectl apply -f - >/dev/null
-
-eksctl create nodegroup --cluster=$CORTEX_CLUSTER \
-                        --node-type=$CORTEX_NODE_TYPE \
-                        --nodes-min=$CORTEX_NODES_MIN \
-                        --nodes-max=$CORTEX_NODES_MAX \
-                        --node-ami=auto \
-                        --max-pods-per-node=1000 \
-                        --asg-access
+                      --node-type=$CORTEX_NODE_TYPE \
+                      --nodes-min=$CORTEX_NODES_MIN \
+                      --nodes-max=$CORTEX_NODES_MAX \
+                      --node-ami=auto \
+                      --version=1.13 \
+                      --asg-access
 
 echo -e "\n✓ Spun up the cluster"