Remove support for local provider (#1755)

Author: RobertLucian

CONTRIBUTING.md

@@ -274,19 +274,12 @@ If you want to switch back to the in-cluster operator:
 1. `<ctrl+c>` to stop your local operator
 2. `make operator-start-aws` to restart the operator in your cluster
 
-If you only want to test Cortex's local environment, here is the common workflow:
-
-1. `make cli-watch` (builds the CLI and re-builds it when files are changed)
-2. Make your changes
-3. `make images-dev-local` (only necessary if API images or the manager are modified)
-4. Test your changes e.g. via `cortex deploy` (and repeat steps 2 and 3 as necessary)
-
 ### Dev workflow optimizations
 
 If you are only modifying the CLI, `make cli-watch` will build the CLI and re-build it when files are changed. When doing this, you can leave the operator running in the cluster instead of running it locally.
 
 If you are only modifying the operator, `make operator-local-aws` will build and start the operator locally, and build/restart it when files are changed.
 
-If you are modifying code in the API images (i.e. any of the Python serving code), `make images-dev-aws` may build more images than you need during testing. For example, if you are only testing using the `python-predictor-cpu` image, you can run `./dev/registry.sh update-single python-predictor-cpu --provider aws` (or use `--provider local` if testing locally).
+If you are modifying code in the API images (i.e. any of the Python serving code), `make images-dev-aws` may build more images than you need during testing. For example, if you are only testing using the `python-predictor-cpu` image, you can run `./dev/registry.sh update-single python-predictor-cpu --provider aws`.
 
 See `Makefile` for additional dev commands.

Makefile

@@ -91,33 +91,33 @@ cluster-up-gcp-y:
 	@$(MAKE) kubectl-gcp
 
 cluster-down-aws:
-	@$(MAKE) images-manager-local
+	@$(MAKE) images-manager-skip-push
 	@$(MAKE) cli
 	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
 	@./bin/cortex cluster down --config=./dev/config/cluster-aws.yaml --aws-key="$$AWS_ACCESS_KEY_ID" --aws-secret=$$AWS_SECRET_ACCESS_KEY
 cluster-down-gcp:
-	@$(MAKE) images-manager-local
+	@$(MAKE) images-manager-skip-push
 	@$(MAKE) cli
 	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
 	@./bin/cortex cluster-gcp down --config=./dev/config/cluster-gcp.yaml
 
 cluster-down-aws-y:
-	@$(MAKE) images-manager-local
+	@$(MAKE) images-manager-skip-push
 	@$(MAKE) cli
 	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
 	@./bin/cortex cluster down --config=./dev/config/cluster-aws.yaml --aws-key="$$AWS_ACCESS_KEY_ID" --aws-secret="$$AWS_SECRET_ACCESS_KEY" --yes
 cluster-down-gcp-y:
-	@$(MAKE) images-manager-local
+	@$(MAKE) images-manager-skip-push
 	@$(MAKE) cli
 	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
 	@./bin/cortex cluster-gcp down --config=./dev/config/cluster-gcp.yaml --yes
 
 cluster-info-aws:
-	@$(MAKE) images-manager-local
+	@$(MAKE) images-manager-skip-push
 	@$(MAKE) cli
 	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster-aws.yaml) && ./bin/cortex cluster info --config=./dev/config/cluster-aws.yaml --configure-env="$$CORTEX_CLUSTER_NAME-aws" --aws-key="$$AWS_ACCESS_KEY_ID" --aws-secret="$$AWS_SECRET_ACCESS_KEY" --yes
 cluster-info-gcp:
-	@$(MAKE) images-manager-local
+	@$(MAKE) images-manager-skip-push
 	@$(MAKE) cli
 	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster-gcp.yaml) && ./bin/cortex cluster-gcp info --config=./dev/config/cluster-gcp.yaml --configure-env="$$CORTEX_CLUSTER_NAME-gcp" --yes
 
@@ -181,49 +181,47 @@ operator-update-gcp:
 
 # Docker images
 
+images-all-skip-push:
+	@./dev/registry.sh update all
 images-all-aws:
 	@./dev/registry.sh update all -p aws
 images-all-gcp:
 	@./dev/registry.sh update all -p gcp
-images-all-local:
-	@./dev/registry.sh update all -p local
+images-all-slim-skip-push:
+	@./dev/registry.sh update all --include-slim
 images-all-slim-aws:
 	@./dev/registry.sh update all -p aws --include-slim
 images-all-slim-gcp:
 	@./dev/registry.sh update all -p gcp --include-slim
-images-all-slim-local:
-	@./dev/registry.sh update all -p local --include-slim
 
+images-dev-skip-push:
+	@./dev/registry.sh update dev
 images-dev-aws:
 	@./dev/registry.sh update dev -p aws
 images-dev-gcp:
 	@./dev/registry.sh update dev -p gcp
-images-dev-local:
-	@./dev/registry.sh update dev -p local
+images-dev-slim-skip-push:
+	@./dev/registry.sh update dev --include-slim
 images-dev-slim-aws:
 	@./dev/registry.sh update dev -p aws --include-slim
 images-dev-slim-gcp:
 	@./dev/registry.sh update dev -p gcp --include-slim
-images-dev-slim-local:
-	@./dev/registry.sh update dev -p local --include-slim
 
+images-api-skip-push:
+	@./dev/registry.sh update api
 images-api-aws:
 	@./dev/registry.sh update api -p aws
 images-api-gcp:
 	@./dev/registry.sh update api -p gcp
-images-api-local:
-	@./dev/registry.sh update api -p local
+images-api-slim-skip-push:
+	@./dev/registry.sh update api --include-slim
 images-api-slim-aws:
 	@./dev/registry.sh update api -p aws --include-slim
 images-api-slim-gcp:
 	@./dev/registry.sh update api -p gcp --include-slim
-images-api-slim-local:
-	@./dev/registry.sh update api -p local --include-slim
 
-images-manager-local:
-	@./dev/registry.sh update-single manager -p local
-images-iris-local:
-	@./dev/registry.sh update-single python-predictor-cpu -p local
+images-manager-skip-push:
+	@./dev/registry.sh update-single manager
 images-iris-aws:
 	@./dev/registry.sh update-single python-predictor-cpu -p aws
 images-iris-gcp:
@@ -234,8 +232,6 @@ registry-create-aws:
 
 registry-clean-aws:
 	@./dev/registry.sh clean -p aws
-registry-clean-local:
-	@./dev/registry.sh clean -p local
 
 # Misc
 

build/images.sh

@@ -19,69 +19,57 @@
 
 set -euo pipefail
 
-api_images_local=(
+api_images_cluster=(
   "python-predictor-cpu"
   "python-predictor-gpu"
   "tensorflow-predictor"
   "onnx-predictor-cpu"
   "onnx-predictor-gpu"
 )
-api_images_cluster=(
-  # includes api_images_local
-)
 api_images_aws=(
-  # includes api_images_local and api_images_cluster
+  # includes api_images_cluster
   "python-predictor-inf"
 )
 api_images_gcp=(
-  # includes api_images_local and api_images_cluster
+  # includes api_images_cluster
 )
 
-api_slim_images_local=(
+api_slim_images_cluster=(
   "python-predictor-cpu-slim"
   "python-predictor-gpu-slim"
   "tensorflow-predictor-slim"
   "onnx-predictor-cpu-slim"
   "onnx-predictor-gpu-slim"
 )
-api_slim_images_cluster=(
-  # includes api_slim_images_local
-)
 api_slim_images_aws=(
-  # includes api_slim_images_local and api_slim_images_cluster
+  # includes api_slim_images_cluster
   "python-predictor-inf-slim"
 )
 api_slim_images_gcp=(
-  # includes api_slim_images_local and api_slim_images_cluster
+  # includes api_slim_images_cluster
 )
 
-dev_images_local=(
-  "downloader"
-)
 dev_images_cluster=(
-  # includes dev_images_local
+  "downloader"
   "manager"
 )
 dev_images_aws=(
-  # includes dev_images_local and dev_images_cluster
+  # includes dev_images_cluster
   "request-monitor"
 )
 dev_images_gcp=(
-  # includes dev_images_local and dev_images_cluster
+  # includes dev_images_cluster
 )
 
-non_dev_images_local=(
+non_dev_images_cluster=(
   "tensorflow-serving-cpu"
   "tensorflow-serving-gpu"
-)
-non_dev_images_cluster=(
-  # includes non_dev_images_local
   "operator"
   "istio-proxy"
   "istio-pilot"
 )
 non_dev_images_aws=(
-  # includes non_dev_images_local and non_dev_images_cluster
+  # includes non_dev_images_cluster
   "tensorflow-serving-inf"
   "cluster-autoscaler"
   "metrics-server"
@@ -92,55 +80,43 @@ non_dev_images_aws=(
   "statsd"
 )
 non_dev_images_gcp=(
-  # includes non_dev_images_local and non_dev_images_cluster
+  # includes non_dev_images_cluster
   "google-pause"
 )
 
 all_images=(
-  "${api_images_local[@]}"
   "${api_images_cluster[@]}"
   "${api_images_aws[@]}"
   "${api_images_gcp[@]}"
-  "${api_slim_images_local[@]}"
   "${api_slim_images_cluster[@]}"
   "${api_slim_images_aws[@]}"
   "${api_slim_images_gcp[@]}"
-  "${dev_images_local[@]}"
   "${dev_images_cluster[@]}"
   "${dev_images_aws[@]}"
   "${dev_images_gcp[@]}"
-  "${non_dev_images_local[@]}"
   "${non_dev_images_cluster[@]}"
   "${non_dev_images_aws[@]}"
   "${non_dev_images_gcp[@]}"
 )
 
 aws_images=(
-  "${api_images_local[@]}"
   "${api_images_cluster[@]}"
   "${api_images_aws[@]}"
-  "${api_slim_images_local[@]}"
   "${api_slim_images_cluster[@]}"
   "${api_slim_images_aws[@]}"
-  "${dev_images_local[@]}"
   "${dev_images_cluster[@]}"
   "${dev_images_aws[@]}"
-  "${non_dev_images_local[@]}"
   "${non_dev_images_cluster[@]}"
   "${non_dev_images_aws[@]}"
 )
 
 gcp_images=(
-  "${api_images_local[@]}"
   "${api_images_cluster[@]}"
   "${api_images_gcp[@]}"
-  "${api_slim_images_local[@]}"
   "${api_slim_images_cluster[@]}"
   "${api_slim_images_gcp[@]}"
-  "${dev_images_local[@]}"
   "${dev_images_cluster[@]}"
   "${dev_images_gcp[@]}"
-  "${non_dev_images_local[@]}"
   "${non_dev_images_cluster[@]}"
   "${non_dev_images_gcp[@]}"
 )

cli/cmd/cluster.go

@@ -70,8 +70,7 @@ func clusterInit() {
 	addClusterConfigFlag(_clusterUpCmd)
 	addAWSCredentialsFlags(_clusterUpCmd)
 	addClusterAWSCredentialsFlags(_clusterUpCmd)
-	defaultEnv := getDefaultEnv(_clusterCommandType)
-	_clusterUpCmd.Flags().StringVarP(&_flagClusterUpEnv, "configure-env", "e", defaultEnv, "name of environment to configure")
+	_clusterUpCmd.Flags().StringVarP(&_flagClusterUpEnv, "configure-env", "e", "aws", "name of environment to configure")
 	_clusterUpCmd.Flags().BoolVarP(&_flagClusterDisallowPrompt, "yes", "y", false, "skip prompts")
 	_clusterCmd.AddCommand(_clusterUpCmd)
 
@@ -144,10 +143,6 @@ var _clusterUpCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		telemetry.EventNotify("cli.cluster.up", map[string]interface{}{"provider": types.AWSProviderType})
 
-		if _flagClusterUpEnv == "local" {
-			exit.Error(ErrorLocalEnvironmentCantUseClusterProvider(types.AWSProviderType))
-		}
-
 		envExists, err := isEnvConfigured(_flagClusterUpEnv)
 		if err != nil {
 			exit.Error(err)
@@ -322,10 +317,6 @@ var _clusterConfigureCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		telemetry.Event("cli.cluster.configure", map[string]interface{}{"provider": types.AWSProviderType})
 
-		if _flagClusterConfigureEnv == "local" {
-			exit.Error(ErrorLocalEnvironmentCantUseClusterProvider(types.AWSProviderType))
-		}
-
 		if _, err := docker.GetDockerClient(); err != nil {
 			exit.Error(err)
 		}
@@ -403,10 +394,6 @@ var _clusterInfoCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		telemetry.Event("cli.cluster.info", map[string]interface{}{"provider": types.AWSProviderType})
 
-		if _flagClusterInfoEnv == "local" {
-			exit.Error(ErrorLocalEnvironmentCantUseClusterProvider(types.AWSProviderType))
-		}
-
 		if _, err := docker.GetDockerClient(); err != nil {
 			exit.Error(err)
 		}
@@ -532,11 +519,20 @@ var _clusterDownCmd = &cobra.Command{
 			envNames, isDefaultEnv, _ := getEnvNamesByOperatorEndpoint(*loadBalancer.DNSName)
 			if len(envNames) > 0 {
 				for _, envName := range envNames {
-					removeEnvFromCLIConfig(envName)
+					err := removeEnvFromCLIConfig(envName)
+					if err != nil {
+						exit.Error(err)
+					}
 				}
 				fmt.Printf("✓ deleted the %s environment configuration%s\n", s.StrsAnd(envNames), s.SIfPlural(len(envNames)))
 				if isDefaultEnv {
-					fmt.Println("✓ set the default environment to local")
+					newDefaultEnv, err := getDefaultEnv()
+					if err != nil {
+						exit.Error(err)
+					}
+					if newDefaultEnv != nil {
+						fmt.Println(fmt.Sprintf("✓ set the default environment to %s", *newDefaultEnv))
+					}
 				}
 			}
 		}