Update versions (#2304)

Author: deliahu

.circleci/config.yml

@@ -10,8 +10,8 @@ commands:
           name: Install Go
           command: |
             sudo rm -rf /usr/local/go
-            wget https://dl.google.com/go/go1.15.12.linux-amd64.tar.gz
-            sudo tar -C /usr/local -xzf go1.15.12.linux-amd64.tar.gz
+            wget https://dl.google.com/go/go1.16.5.linux-amd64.tar.gz
+            sudo tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz
             rm -rf go*.tar.gz
             echo 'export PATH=$PATH:/usr/local/go/bin' >> $BASH_ENV
             echo 'export PATH=$PATH:~/go/bin' >> $BASH_ENV

CONTRIBUTING.md

@@ -22,10 +22,10 @@ To install Go on linux, run:
 
 ```bash
 mkdir -p ~/bin && \
-wget https://dl.google.com/go/go1.14.7.linux-amd64.tar.gz && \
-sudo tar -xvf go1.14.7.linux-amd64.tar.gz && \
+wget https://dl.google.com/go/go1.16.5.linux-amd64.tar.gz && \
+sudo tar -xvf go1.16.5.linux-amd64.tar.gz && \
 sudo mv go /usr/local && \
-rm go1.14.7.linux-amd64.tar.gz && \
+rm go1.16.5.linux-amd64.tar.gz && \
 echo 'export PATH="/usr/local/go/bin:$HOME/go/bin:$PATH"' >> $HOME/.bashrc
 ```
 
@@ -135,10 +135,6 @@ export AWS_REGION="***"  # you can use any AWS region you'd like, e.g. "us-west-
 export AWS_ACCESS_KEY_ID="***"  # alternatively, you can remove this to use the default credentials chain on your machine
 export AWS_SECRET_ACCESS_KEY="***"  # alternatively, you can remove this to use the default credentials chain on your machine
 export DEFAULT_USER_ARN="arn:aws:iam::<ACCOUNT_ID>:<AWS IAM ENTITY>" # (e.g. arn:aws-us-gov:iam::123456789:user/foo)
-
-# If you are working on govcloud, you will need to set credentials from a public (non govcloud) account to access inferentia ECR
-# export NORMAL_REGION_AWS_ACCESS_KEY_ID="***"
-# export NORMAL_REGION_AWS_SECRET_ACCESS_KEY="***"
 ```
 
 Create the ECR registries:

Makefile

@@ -51,14 +51,13 @@ operator-local-dbg:
 
 # configure kubectl to point to the cluster specified in dev/config/cluster.yaml
 kubectl:
-	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster.yaml) && eval $$(python3 ./dev/create_user.py $$CORTEX_CLUSTER_NAME $$AWS_ACCOUNT_ID $$CORTEX_REGION) && eksctl utils write-kubeconfig --cluster="$$CORTEX_CLUSTER_NAME" --region="$$CORTEX_REGION" | (grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true); eksctl create iamidentitymapping --region $$CORTEX_REGION --cluster $$CORTEX_CLUSTER_NAME --arn $$DEFAULT_USER_ARN --group system:masters --username $$DEFAULT_USER_ARN
+	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster.yaml) && eval $$(python3 ./dev/create_user.py $$CORTEX_CLUSTER_NAME $$AWS_ACCOUNT_ID $$CORTEX_REGION) && eksctl utils write-kubeconfig --cluster="$$CORTEX_CLUSTER_NAME" --region="$$CORTEX_REGION" --verbose=0 | (grep -v "saved kubeconfig as" || true); eksctl create iamidentitymapping --region $$CORTEX_REGION --cluster $$CORTEX_CLUSTER_NAME --arn $$DEFAULT_USER_ARN --group system:masters --username $$DEFAULT_USER_ARN
 
 cluster-up:
 	@$(MAKE) images-all
 	@$(MAKE) cli
 	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
 	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster.yaml) && eval $$(python3 ./dev/create_user.py $$CORTEX_CLUSTER_NAME $$AWS_ACCOUNT_ID $$CORTEX_REGION) && sleep 10 && ./bin/cortex cluster up ./dev/config/cluster.yaml --configure-env="$$CORTEX_CLUSTER_NAME"; eksctl create iamidentitymapping --region $$CORTEX_REGION --cluster $$CORTEX_CLUSTER_NAME --arn $$DEFAULT_USER_ARN --group system:masters --username $$DEFAULT_USER_ARN
-
 	@$(MAKE) kubectl
 
 cluster-up-y:
@@ -68,6 +67,20 @@ cluster-up-y:
 	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster.yaml) && eval $$(python3 ./dev/create_user.py $$CORTEX_CLUSTER_NAME $$AWS_ACCOUNT_ID $$CORTEX_REGION) && sleep 10 && ./bin/cortex cluster up ./dev/config/cluster.yaml --configure-env="$$CORTEX_CLUSTER_NAME" --yes; eksctl create iamidentitymapping --region $$CORTEX_REGION --cluster $$CORTEX_CLUSTER_NAME --arn $$DEFAULT_USER_ARN --group system:masters --username $$DEFAULT_USER_ARN
 	@$(MAKE) kubectl
 
+cluster-configure:
+	@$(MAKE) images-manager-skip-push
+	@$(MAKE) cli
+	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
+	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster.yaml) && eval $$(python3 ./dev/create_user.py $$CORTEX_CLUSTER_NAME $$AWS_ACCOUNT_ID $$CORTEX_REGION) && sleep 10 && ./bin/cortex cluster configure ./dev/config/cluster.yaml; eksctl create iamidentitymapping --region $$CORTEX_REGION --cluster $$CORTEX_CLUSTER_NAME --arn $$DEFAULT_USER_ARN --group system:masters --username $$DEFAULT_USER_ARN
+	@$(MAKE) kubectl
+
+cluster-configure-y:
+	@$(MAKE) images-manager-skip-push
+	@$(MAKE) cli
+	@kill $(shell pgrep -f rerun) >/dev/null 2>&1 || true
+	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster.yaml) && eval $$(python3 ./dev/create_user.py $$CORTEX_CLUSTER_NAME $$AWS_ACCOUNT_ID $$CORTEX_REGION) && sleep 10 && ./bin/cortex cluster configure ./dev/config/cluster.yaml --yes; eksctl create iamidentitymapping --region $$CORTEX_REGION --cluster $$CORTEX_CLUSTER_NAME --arn $$DEFAULT_USER_ARN --group system:masters --username $$DEFAULT_USER_ARN
+	@$(MAKE) kubectl
+
 cluster-down:
 	@$(MAKE) images-manager-skip-push
 	@$(MAKE) cli

build/build-image.sh

@@ -27,10 +27,6 @@ image=$3
 is_multi_arch=$4
 arch=$5
 
-if [ "$image" == "inferentia" ]; then
-  aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 790709498068.dkr.ecr.us-west-2.amazonaws.com
-fi
-
 if [ "$is_multi_arch" = "true" ]; then
   tag="manifest-${CORTEX_VERSION}-$arch"
 else

build/generate_ami_mapping.go

@@ -222,7 +222,7 @@ func main() {
 		json.Unmarshal(jsonBytes, &k8sVersionMap)
 	}
 
-	k8sVersion := "1.18"
+	k8sVersion := "1.20"
 
 	if k8sVersionMap[k8sVersion] == nil {
 		k8sVersionMap[k8sVersion] = map[string]map[string]string{}

build/images.sh

@@ -45,8 +45,9 @@ non_dev_images=(
   "grafana"
   "event-exporter"
   "metrics-server"
-  "inferentia"
-  "nvidia"
+  "nvidia-device-plugin"
+  "neuron-device-plugin"
+  "neuron-scheduler"
   "kubexit"
 )
 

dev/registry.sh

@@ -84,19 +84,6 @@ function registry_login() {
   if [ "$is_registry_logged_in" = "false" ]; then
     blue_echo "Logging in to ECR..."
     aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin $registry_push_url
-
-    blue_echo "Logging in to 790709498068.dkr.ecr.us-west-2.amazonaws.com for inferentia..."
-    set +e
-    echo "$AWS_REGION" | grep  "us-gov"
-    is_gov_cloud=$?
-    set -e
-    if [ "$is_gov_cloud" == "0" ]; then
-      # set NORMAL_REGION_AWS_ACCESS_KEY_ID and NORMAL_REGION_AWS_SECRET_ACCESS_KEY credentials from a regular AWS account (non govcloud) in your dev/config/env.sh
-      AWS_ACCESS_KEY_ID=$NORMAL_REGION_AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY=$NORMAL_REGION_AWS_SECRET_ACCESS_KEY aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 790709498068.dkr.ecr.us-west-2.amazonaws.com
-    else
-      aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 790709498068.dkr.ecr.us-west-2.amazonaws.com
-    fi
-
     is_registry_logged_in="true"
     green_echo "Success\n"
   fi
@@ -152,15 +139,15 @@ function build_and_push() {
   docker buildx build $ROOT -f $dir/Dockerfile -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/cortexlabs/$image:$tag --platform $platforms $push_or_not_flag
 
   if [ "$include_arm64_arch" = "true" ]; then
-    green_echo "$finished_operation $image:$tag (amd64 and arm64)..."
+    green_echo "$finished_operation $image:$tag (amd64 and arm64)"
   else
-    green_echo "$finished_operation $image:$tag (amd64)..."
+    green_echo "$finished_operation $image:$tag (amd64)"
   fi
 
   if [[ " $images_that_can_run_locally " =~ " $image " ]] && [[ "$include_arm64_arch" == "false" ]]; then
     blue_echo "Exporting $image:$tag to local docker..."
     docker buildx build $ROOT -f $dir/Dockerfile -t cortexlabs/$image:$tag -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/cortexlabs/$image:$tag --platform $platforms --load
-    green_echo "Exported $image:$tag to local docker..."
+    green_echo "Exported $image:$tag to local docker"
   fi
 }