Merge branch 'master' into merge-container-logs-per-pod

Author: deliahu

Makefile

@@ -21,41 +21,58 @@ SHELL := /bin/bash
 # Cortex
 
 devstart:
+	@$(MAKE) operator-stop
 	@./dev/operator_local.sh || true
 
 kubectl:
-	@eksctl utils write-kubeconfig --name="cortex"
-	@kubectl config set-context --current --namespace="cortex"
+	@eksctl utils write-kubeconfig --name="cortex" >/dev/null
+	@kubectl config set-context --current --namespace="cortex" >/dev/null
 
 cortex-up:
 	@$(MAKE) registry-all
+	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
 	@./cortex.sh -c=./dev/config/cortex.sh install
-	$(MAKE) kubectl
+	@$(MAKE) kubectl
 
 cortex-up-dev:
-	$(MAKE) cortex-up
-	$(MAKE) operator-stop
+	@$(MAKE) cortex-up
+	@$(MAKE) operator-stop
 
 cortex-down:
+	@$(MAKE) manager-local
+	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
 	@./cortex.sh -c=./dev/config/cortex.sh uninstall
 
+cortex-install:
+	@$(MAKE) registry-all
+	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
+	@./cortex.sh -c=./dev/config/cortex.sh install cortex
+	@$(MAKE) kubectl
+
+cortex-uninstall:
+	@./dev/uninstall_cortex.sh
+
 cortex-info:
+	@$(MAKE) manager-local
 	@./cortex.sh -c=./dev/config/cortex.sh info
 
 cortex-update:
 	@$(MAKE) registry-all
+	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
 	@./cortex.sh -c=./dev/config/cortex.sh update
 
 operator-start:
 	@$(MAKE) registry-all
+	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
 	@./cortex.sh -c=./dev/config/cortex.sh update
 
 operator-update:
 	@$(MAKE) registry-all
+	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
 	@./cortex.sh -c=./dev/config/cortex.sh update
 
 operator-stop:
-	$(MAKE) kubectl
+	@$(MAKE) kubectl
 	@kubectl delete --namespace="cortex" --ignore-not-found=true deployment operator
 
 # Docker images
@@ -69,6 +86,9 @@ registry-dev:
 registry-create:
 	@./dev/registry.sh create
 
+manager-local:
+	@./dev/registry.sh update-manager-local
+
 # Misc
 
 .PHONY: cli
@@ -110,7 +130,7 @@ find-missing-version:
 	@./build/find-missing-version.sh
 
 test-examples:
-	$(MAKE) registry-all
+	@$(MAKE) registry-all
 	@./build/test-examples.sh
 
 ###############
@@ -133,12 +153,17 @@ ci-build-images:
 	@./build/build-image.sh images/onnx-serve-gpu onnx-serve-gpu
 	@./build/build-image.sh images/operator operator
 	@./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/python-packager python-packager
 	@./build/build-image.sh images/cluster-autoscaler cluster-autoscaler
 	@./build/build-image.sh images/nvidia nvidia
 	@./build/build-image.sh images/metrics-server metrics-server
+	@./build/build-image.sh images/istio-citadel istio-citadel
+	@./build/build-image.sh images/istio-galley istio-galley
+	@./build/build-image.sh images/istio-pilot istio-pilot
+	@./build/build-image.sh images/istio-sidecar istio-sidecar
+	@./build/build-image.sh images/istio-proxy istio-proxy
+	@./build/build-image.sh images/istio-proxy-init istio-proxy-init
+	@./build/build-image.sh images/istio-mixer istio-mixer
 
 ci-push-images:
 	@./build/push-image.sh manager
@@ -153,12 +178,17 @@ ci-push-images:
 	@./build/push-image.sh onnx-serve-gpu
 	@./build/push-image.sh operator
 	@./build/push-image.sh fluentd
-	@./build/push-image.sh nginx-controller
-	@./build/push-image.sh nginx-backend
 	@./build/push-image.sh python-packager
 	@./build/push-image.sh cluster-autoscaler
 	@./build/push-image.sh nvidia
 	@./build/push-image.sh metrics-server
+	@./build/push-image.sh istio-citadel
+	@./build/push-image.sh istio-galley
+	@./build/push-image.sh istio-pilot
+	@./build/push-image.sh istio-sidecar
+	@./build/push-image.sh istio-proxy
+	@./build/push-image.sh istio-proxy-init
+	@./build/push-image.sh istio-mixer
 
 
 ci-build-cli:

README.md

@@ -2,15 +2,15 @@
 
 <br>
 
-**Get started:** [Install](https://docs.cortex.dev/install) • [Tutorial](https://docs.cortex.dev/tutorial) • <!-- CORTEX_VERSION_MINOR_STABLE e.g. https://docs.cortex.dev/v/0.2/ -->[Docs](https://docs.cortex.dev/v/0.7) • <!-- CORTEX_VERSION_MINOR_STABLE -->[Examples](https://github.com/cortexlabs/cortex/tree/0.7/examples)
+**Get started:** [Install](https://docs.cortex.dev/install) • [Tutorial](https://docs.cortex.dev/tutorial) • <!-- CORTEX_VERSION_MINOR_STABLE e.g. https://docs.cortex.dev/v/0.2/ -->[Docs](https://docs.cortex.dev) • <!-- CORTEX_VERSION_MINOR_STABLE -->[Examples](https://github.com/cortexlabs/cortex/tree/0.7/examples)
 
-**Learn more:** [Website](https://cortex.dev) • [Blog](https://blog.cortex.dev) • [Subscribe](https://cortexlabs.us20.list-manage.com/subscribe?u=a1987373ab814f20961fd90b4&id=ae83491e1c) • [Contact](mailto:hello@cortex.dev)
+**Learn more:** [Website](https://cortex.dev) • [Blog](https://medium.com/cortex-labs) • [Subscribe](https://cortexlabs.us20.list-manage.com/subscribe?u=a1987373ab814f20961fd90b4&id=ae83491e1c) • [Contact](mailto:hello@cortex.dev)
 
 <br>
 
-Cortex is a machine learning model deployment platform that runs in your AWS account. You define deployments with simple declarative configuration and Cortex deploys your models as JSON APIs. It also handles autoscaling, rolling updates, log streaming, inference on CPUs or GPUs, and more.
+Cortex is a machine learning deployment platform that runs in your AWS account. It takes exported models from S3 and deploys them as web APIs. It also handles autoscaling, rolling updates, log streaming, inference on CPUs or GPUs, and more.
 
-Cortex is actively maintained by a venture-backed team of infrastructure engineers and [we're hiring](https://angel.co/cortex-labs-inc/jobs).
+Cortex is maintained by a venture-backed team of infrastructure engineers and [we're hiring](https://angel.co/cortex-labs-inc/jobs).
 
 <br>
 
@@ -40,7 +40,7 @@ def post_inference(prediction, metadata):
   # Python code
 ```
 
-**Deploy** to your cloud infrastructure:
+**Deploy** to AWS:
 
 ```bash
 $ cortex deploy
@@ -59,7 +59,7 @@ $ curl -d '{"a": 1, "b": 2, "c": 3}' https://amazonaws.com/my-api
 
 <br>
 
-## Spinning up a Cortex cluster on your AWS account
+## Hosting Cortex on AWS
 
 ```bash
 # Download the install script

cli/cmd/get.go

@@ -489,8 +489,8 @@ func describeAPI(name string, resourcesRes *schema.GetResourcesResponse, flagVer
 
 	apiEndpoint := urls.Join(resourcesRes.APIsBaseURL, anyAPIStatus.Path)
 
-	out := "\nURL:      " + apiEndpoint + "\n"
-	out += fmt.Sprintf("cURL:     curl -k -X POST -H \"Content-Type: application/json\" %s -d @samples.json\n", apiEndpoint)
+	out := "\nURL: " + apiEndpoint + "\n"
+	out += fmt.Sprintf("cURL: curl -k -X POST -H \"Content-Type: application/json\" %s -d @samples.json\n", apiEndpoint)
 	out += "\n"
 	out += fmt.Sprintf("Status:              %s\n", groupStatus.Message())
 	out += fmt.Sprintf("Available replicas:  %s\n", s.Int32(groupStatus.Available()))

cli/cmd/predict.go

@@ -70,9 +70,25 @@ var predictCmd = &cobra.Command{
 		}
 
 		apiGroupStatus := resourcesRes.APIGroupStatuses[apiName]
+
+		// Check for prefix match
 		if apiGroupStatus == nil {
-			errors.Exit(ErrorAPINotFound(apiName))
+			var matchedName string
+			for name := range resourcesRes.APIGroupStatuses {
+				if strings.HasPrefix(name, apiName) {
+					if matchedName != "" {
+						errors.Exit(ErrorAPINotFound(apiName)) // duplicates
+					}
+					matchedName = name
+				}
+			}
+			if matchedName == "" {
+				errors.Exit(ErrorAPINotFound(apiName))
+			}
+			apiName = matchedName
+			apiGroupStatus = resourcesRes.APIGroupStatuses[apiName]
 		}
+
 		if apiGroupStatus.ActiveStatus == nil {
 			errors.Exit(ErrorAPINotReady(apiName, apiGroupStatus.Message()))
 		}

cortex.sh

@@ -118,8 +118,6 @@ export CORTEX_NAMESPACE="${CORTEX_NAMESPACE:-cortex}"
 
 export CORTEX_IMAGE_MANAGER="${CORTEX_IMAGE_MANAGER:-cortexlabs/manager:$CORTEX_VERSION_STABLE}"
 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_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}"
@@ -134,6 +132,13 @@ export CORTEX_IMAGE_ONNX_SERVE_GPU="${CORTEX_IMAGE_ONNX_SERVE_GPU:-cortexlabs/on
 export CORTEX_IMAGE_CLUSTER_AUTOSCALER="${CORTEX_IMAGE_CLUSTER_AUTOSCALER:-cortexlabs/cluster-autoscaler:$CORTEX_VERSION_STABLE}"
 export CORTEX_IMAGE_NVIDIA="${CORTEX_IMAGE_NVIDIA:-cortexlabs/nvidia:$CORTEX_VERSION_STABLE}"
 export CORTEX_IMAGE_METRICS_SERVER="${CORTEX_IMAGE_METRICS_SERVER:-cortexlabs/metrics-server:$CORTEX_VERSION_STABLE}"
+export CORTEX_IMAGE_ISTIO_CITADEL="${CORTEX_IMAGE_ISTIO_CITADEL:-cortexlabs/istio-citadel:$CORTEX_VERSION_STABLE}"
+export CORTEX_IMAGE_ISTIO_GALLEY="${CORTEX_IMAGE_ISTIO_GALLEY:-cortexlabs/istio-galley:$CORTEX_VERSION_STABLE}"
+export CORTEX_IMAGE_ISTIO_PILOT="${CORTEX_IMAGE_ISTIO_PILOT:-cortexlabs/istio-pilot:$CORTEX_VERSION_STABLE}"
+export CORTEX_IMAGE_ISTIO_SIDECAR="${CORTEX_IMAGE_ISTIO_SIDECAR:-cortexlabs/istio-sidecar:$CORTEX_VERSION_STABLE}"
+export CORTEX_IMAGE_ISTIO_PROXY="${CORTEX_IMAGE_ISTIO_PROXY:-cortexlabs/istio-proxy:$CORTEX_VERSION_STABLE}"
+export CORTEX_IMAGE_ISTIO_PROXY_INIT="${CORTEX_IMAGE_ISTIO_PROXY_INIT:-cortexlabs/istio-proxy-init:$CORTEX_VERSION_STABLE}"
+export CORTEX_IMAGE_ISTIO_MIXER="${CORTEX_IMAGE_ISTIO_MIXER:-cortexlabs/istio-mixer:$CORTEX_VERSION_STABLE}"
 
 export CORTEX_ENABLE_TELEMETRY="${CORTEX_ENABLE_TELEMETRY:-""}"
 
@@ -176,8 +181,6 @@ function install_cortex() {
     -e CORTEX_LOG_GROUP=$CORTEX_LOG_GROUP \
     -e CORTEX_BUCKET=$CORTEX_BUCKET \
     -e CORTEX_IMAGE_FLUENTD=$CORTEX_IMAGE_FLUENTD \
-    -e CORTEX_IMAGE_NGINX_BACKEND=$CORTEX_IMAGE_NGINX_BACKEND \
-    -e CORTEX_IMAGE_NGINX_CONTROLLER=$CORTEX_IMAGE_NGINX_CONTROLLER \
     -e CORTEX_IMAGE_OPERATOR=$CORTEX_IMAGE_OPERATOR \
     -e CORTEX_IMAGE_SPARK=$CORTEX_IMAGE_SPARK \
     -e CORTEX_IMAGE_SPARK_OPERATOR=$CORTEX_IMAGE_SPARK_OPERATOR \
@@ -192,6 +195,13 @@ function install_cortex() {
     -e CORTEX_IMAGE_CLUSTER_AUTOSCALER=$CORTEX_IMAGE_CLUSTER_AUTOSCALER \
     -e CORTEX_IMAGE_NVIDIA=$CORTEX_IMAGE_NVIDIA \
     -e CORTEX_IMAGE_METRICS_SERVER=$CORTEX_IMAGE_METRICS_SERVER \
+    -e CORTEX_IMAGE_ISTIO_CITADEL=$CORTEX_IMAGE_ISTIO_CITADEL \
+    -e CORTEX_IMAGE_ISTIO_GALLEY=$CORTEX_IMAGE_ISTIO_GALLEY \
+    -e CORTEX_IMAGE_ISTIO_SIDECAR=$CORTEX_IMAGE_ISTIO_SIDECAR \
+    -e CORTEX_IMAGE_ISTIO_PILOT=$CORTEX_IMAGE_ISTIO_PILOT \
+    -e CORTEX_IMAGE_ISTIO_PROXY=$CORTEX_IMAGE_ISTIO_PROXY \
+    -e CORTEX_IMAGE_ISTIO_PROXY_INIT=$CORTEX_IMAGE_ISTIO_PROXY_INIT \
+    -e CORTEX_IMAGE_ISTIO_MIXER=$CORTEX_IMAGE_ISTIO_MIXER \
     -e CORTEX_ENABLE_TELEMETRY=$CORTEX_ENABLE_TELEMETRY \
     $CORTEX_IMAGE_MANAGER
 }
@@ -423,6 +433,8 @@ if [ "$arg1" = "install" ]; then
     prompt_for_telemetry && install_eks && install_cortex && info
   elif [ "$arg2" = "cli" ]; then
     install_cli
+  elif [ "$arg2" = "cortex" ]; then # Undocumented (just for dev)
+    install_cortex && info
   elif [ "$arg2" = "" ]; then
     echo -e "\nerror: missing subcommand for install"
     show_help

dev/registry.sh

@@ -37,8 +37,13 @@ function ecr_login() {
 function create_registry() {
   aws ecr create-repository --repository-name=cortexlabs/manager --region=$REGISTRY_REGION || true
   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/istio-citadel --region=$REGISTRY_REGION || true
+  aws ecr create-repository --repository-name=cortexlabs/istio-pilot --region=$REGISTRY_REGION || true
+  aws ecr create-repository --repository-name=cortexlabs/istio-galley --region=$REGISTRY_REGION || true
+  aws ecr create-repository --repository-name=cortexlabs/istio-sidecar --region=$REGISTRY_REGION || true
+  aws ecr create-repository --repository-name=cortexlabs/istio-proxy --region=$REGISTRY_REGION || true
+  aws ecr create-repository --repository-name=cortexlabs/istio-proxy-init --region=$REGISTRY_REGION || true
+  aws ecr create-repository --repository-name=cortexlabs/istio-mixer --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
@@ -116,6 +121,9 @@ env=${2:-""}
 if [ "$cmd" = "create" ]; then
   create_registry
 
+elif [ "$cmd" = "update-manager-local" ]; then
+  build $ROOT/images/manager manager latest
+
 elif [ "$cmd" = "update" ]; then
   if [ "$env" != "dev" ]; then
     build_and_push $ROOT/images/manager manager latest
@@ -133,8 +141,6 @@ elif [ "$cmd" = "update" ]; then
     build_and_push $ROOT/images/spark spark latest
     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/nginx-backend nginx-backend latest
     build_and_push $ROOT/images/fluentd fluentd latest
     build_and_push $ROOT/images/tf-serve tf-serve latest
     build_and_push $ROOT/images/tf-serve-gpu tf-serve-gpu latest
@@ -143,6 +149,13 @@ elif [ "$cmd" = "update" ]; then
     build_and_push $ROOT/images/cluster-autoscaler cluster-autoscaler latest
     build_and_push $ROOT/images/nvidia nvidia latest
     build_and_push $ROOT/images/metrics-server metrics-server latest
+    build_and_push $ROOT/images/istio-citadel istio-citadel latest
+    build_and_push $ROOT/images/istio-pilot istio-pilot latest
+    build_and_push $ROOT/images/istio-galley istio-galley latest
+    build_and_push $ROOT/images/istio-sidecar istio-sidecar latest
+    build_and_push $ROOT/images/istio-proxy istio-proxy latest
+    build_and_push $ROOT/images/istio-proxy-init istio-proxy-init latest
+    build_and_push $ROOT/images/istio-mixer istio-mixer latest
   fi
 
   build_and_push $ROOT/images/tf-api tf-api latest

dev/uninstall_cortex.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Copyright 2019 Cortex Labs, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)"
+
+source $ROOT/dev/config/cortex.sh
+
+eksctl utils write-kubeconfig --name=$CORTEX_CLUSTER --region=$CORTEX_REGION
+
+echo "Uninstalling Cortex ..."
+
+# Remove finalizers on sparkapplications (they sometimes create deadlocks)
+if kubectl get namespace $CORTEX_NAMESPACE >/dev/null 2>&1 && kubectl get customresourcedefinition sparkapplications.sparkoperator.k8s.io >/dev/null 2>&1; then
+  kubectl -n=$CORTEX_NAMESPACE get sparkapplications.sparkoperator.k8s.io -o name | xargs -L1 \
+    kubectl -n=$CORTEX_NAMESPACE patch -p '{"metadata":{"finalizers": []}}' --type=merge >/dev/null 2>&1
+fi
+
+kubectl delete --ignore-not-found=true customresourcedefinition scheduledsparkapplications.sparkoperator.k8s.io
+kubectl delete --ignore-not-found=true customresourcedefinition sparkapplications.sparkoperator.k8s.io
+kubectl delete --ignore-not-found=true namespace istio-system
+kubectl delete --ignore-not-found=true namespace $CORTEX_NAMESPACE
+
+echo "✓ Uninstalled Cortex"