From f0de149b896122fa69ed4666b5cccae1af660fb7 Mon Sep 17 00:00:00 2001 From: David Eliahu Date: Fri, 7 Jan 2022 16:52:22 -0800 Subject: [PATCH] Update version to 0.42.0 --- build/amend-image.sh | 2 +- build/build-image.sh | 2 +- build/cli.sh | 2 +- build/push-image.sh | 2 +- dev/export_images.sh | 2 +- dev/registry.sh | 2 +- docs/clients/install.md | 8 +-- docs/clients/python.md | 4 +- docs/clusters/advanced/self-hosted-images.md | 2 +- docs/clusters/management/create.md | 58 ++++++++++---------- docs/clusters/management/update.md | 10 ++-- docs/clusters/observability/alerting.md | 2 +- docs/start.md | 2 +- get-cli.sh | 2 +- manager/check_cortex_version.sh | 2 +- manager/debug.sh | 2 +- manager/install.sh | 4 +- manager/refresh.sh | 2 +- pkg/consts/consts.go | 4 +- python/client/cortex/__init__.py | 2 +- python/client/cortex/client.py | 4 +- python/client/cortex/consts.py | 2 +- python/client/setup.py | 2 +- test/e2e/setup.py | 2 +- 24 files changed, 63 insertions(+), 63 deletions(-) diff --git a/build/amend-image.sh b/build/amend-image.sh index abd87101cc..0f0d399ecb 100755 --- a/build/amend-image.sh +++ b/build/amend-image.sh @@ -17,7 +17,7 @@ set -euo pipefail -CORTEX_VERSION=master +CORTEX_VERSION=0.42.0 host_primary=$1 host_backup=$2 diff --git a/build/build-image.sh b/build/build-image.sh index 5e16f63caa..f0abd77ff3 100755 --- a/build/build-image.sh +++ b/build/build-image.sh @@ -19,7 +19,7 @@ set -euo pipefail ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)" -CORTEX_VERSION=master +CORTEX_VERSION=0.42.0 host_primary=$1 host_backup=$2 diff --git a/build/cli.sh b/build/cli.sh index 4473b6d9c4..e9b642c6fe 100755 --- a/build/cli.sh +++ b/build/cli.sh @@ -19,7 +19,7 @@ set -euo pipefail ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)" -CORTEX_VERSION=master +CORTEX_VERSION=0.42.0 arg1=${1:-""} upload="false" diff --git a/build/push-image.sh b/build/push-image.sh index 3427275b53..0db15a64b4 100755 --- a/build/push-image.sh +++ b/build/push-image.sh @@ -19,7 +19,7 @@ set -euo pipefail ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)" -CORTEX_VERSION=master +CORTEX_VERSION=0.42.0 host_primary=$1 host_backup=$2 diff --git a/dev/export_images.sh b/dev/export_images.sh index 0d040e777e..ea6c2d0cc1 100755 --- a/dev/export_images.sh +++ b/dev/export_images.sh @@ -20,7 +20,7 @@ set -euo pipefail ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)" # CORTEX_VERSION -cortex_version=master +cortex_version=0.42.0 # user set variables ecr_region=$1 diff --git a/dev/registry.sh b/dev/registry.sh index 775837ee40..2a8308e3fa 100755 --- a/dev/registry.sh +++ b/dev/registry.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CORTEX_VERSION=master +CORTEX_VERSION=0.42.0 set -eo pipefail diff --git a/docs/clients/install.md b/docs/clients/install.md index 4a6cdd0324..aa1d611e5a 100644 --- a/docs/clients/install.md +++ b/docs/clients/install.md @@ -4,8 +4,8 @@ ```bash -# download CLI version 0.41.0 (Note the "v"): -bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/v0.41.0/get-cli.sh)" +# download CLI version 0.42.0 (Note the "v"): +bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/v0.42.0/get-cli.sh)" ``` By default, the Cortex CLI is installed at `/usr/local/bin/cortex`. To install the executable elsewhere, export the `CORTEX_INSTALL_PATH` environment variable to your desired location before running the command above. @@ -19,10 +19,10 @@ pip install cortex ``` -To install or upgrade to a specific version (e.g. v0.41.0): +To install or upgrade to a specific version (e.g. v0.42.0): ```bash -pip install cortex==0.41.0 +pip install cortex==0.42.0 ``` To upgrade to the latest version: diff --git a/docs/clients/python.md b/docs/clients/python.md index 42840696f1..b125fb7eea 100644 --- a/docs/clients/python.md +++ b/docs/clients/python.md @@ -86,7 +86,7 @@ Deploy or update an API. **Arguments**: -- `api_spec` - A dictionary defining a single Cortex API. See https://docs.cortex.dev/v/master/ for schema. +- `api_spec` - A dictionary defining a single Cortex API. See https://docs.cortex.dev/v/0.42/ for schema. - `force` - Override any in-progress api updates. - `wait` - Block until the API is ready. @@ -107,7 +107,7 @@ Deploy or update APIs specified in a configuration file. **Arguments**: -- `config_file` - Local path to a yaml file defining Cortex API(s). See https://docs.cortex.dev/v/master/ for schema. +- `config_file` - Local path to a yaml file defining Cortex API(s). See https://docs.cortex.dev/v/0.42/ for schema. - `force` - Override any in-progress api updates. - `wait` - Block until the API is ready. diff --git a/docs/clusters/advanced/self-hosted-images.md b/docs/clusters/advanced/self-hosted-images.md index a260e06f83..80ebca0700 100644 --- a/docs/clusters/advanced/self-hosted-images.md +++ b/docs/clusters/advanced/self-hosted-images.md @@ -19,7 +19,7 @@ Clone the Cortex repo using the release tag corresponding to your version (which ```bash -export CORTEX_VERSION=0.41.0 +export CORTEX_VERSION=0.42.0 git clone --depth 1 --branch v$CORTEX_VERSION https://github.com/cortexlabs/cortex.git ``` diff --git a/docs/clusters/management/create.md b/docs/clusters/management/create.md index 069c947e46..62fd6a978d 100644 --- a/docs/clusters/management/create.md +++ b/docs/clusters/management/create.md @@ -12,7 +12,7 @@ ```bash # install the cortex CLI -bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/v0.41.0/get-cli.sh)" +bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/v0.42.0/get-cli.sh)" # create a cluster cortex cluster up cluster.yaml @@ -104,32 +104,32 @@ The docker images used by the cluster can also be overridden. They can be config ```yaml -image_manager: quay.io/cortexlabs/manager:master -image_operator: quay.io/cortexlabs/operator:master -image_controller_manager: quay.io/cortexlabs/controller-manager:master -image_autoscaler: quay.io/cortexlabs/autoscaler:master -image_proxy: quay.io/cortexlabs/proxy:master -image_async_gateway: quay.io/cortexlabs/async-gateway:master -image_activator: quay.io/cortexlabs/activator:master -image_enqueuer: quay.io/cortexlabs/enqueuer:master -image_dequeuer: quay.io/cortexlabs/dequeuer:master -image_cluster_autoscaler: quay.io/cortexlabs/cluster-autoscaler:master -image_metrics_server: quay.io/cortexlabs/metrics-server:master -image_nvidia_device_plugin: quay.io/cortexlabs/nvidia-device-plugin:master -image_neuron_device_plugin: quay.io/cortexlabs/neuron-device-plugin:master -image_neuron_scheduler: quay.io/cortexlabs/neuron-scheduler:master -image_fluent_bit: quay.io/cortexlabs/fluent-bit:master -image_istio_proxy: quay.io/cortexlabs/istio-proxy:master -image_istio_pilot: quay.io/cortexlabs/istio-pilot:master -image_prometheus: quay.io/cortexlabs/prometheus:master -image_prometheus_config_reloader: quay.io/cortexlabs/prometheus-config-reloader:master -image_prometheus_operator: quay.io/cortexlabs/prometheus-operator:master -image_prometheus_statsd_exporter: quay.io/cortexlabs/prometheus-statsd-exporter:master -image_prometheus_dcgm_exporter: quay.io/cortexlabs/prometheus-dcgm-exporter:master -image_prometheus_kube_state_metrics: quay.io/cortexlabs/prometheus-kube-state-metrics:master -image_prometheus_node_exporter: quay.io/cortexlabs/prometheus-node-exporter:master -image_kube_rbac_proxy: quay.io/cortexlabs/kube-rbac-proxy:master -image_grafana: quay.io/cortexlabs/grafana:master -image_event_exporter: quay.io/cortexlabs/event-exporter:master -image_kubexit: quay.io/cortexlabs/kubexit:master +image_manager: quay.io/cortexlabs/manager:0.42.0 +image_operator: quay.io/cortexlabs/operator:0.42.0 +image_controller_manager: quay.io/cortexlabs/controller-manager:0.42.0 +image_autoscaler: quay.io/cortexlabs/autoscaler:0.42.0 +image_proxy: quay.io/cortexlabs/proxy:0.42.0 +image_async_gateway: quay.io/cortexlabs/async-gateway:0.42.0 +image_activator: quay.io/cortexlabs/activator:0.42.0 +image_enqueuer: quay.io/cortexlabs/enqueuer:0.42.0 +image_dequeuer: quay.io/cortexlabs/dequeuer:0.42.0 +image_cluster_autoscaler: quay.io/cortexlabs/cluster-autoscaler:0.42.0 +image_metrics_server: quay.io/cortexlabs/metrics-server:0.42.0 +image_nvidia_device_plugin: quay.io/cortexlabs/nvidia-device-plugin:0.42.0 +image_neuron_device_plugin: quay.io/cortexlabs/neuron-device-plugin:0.42.0 +image_neuron_scheduler: quay.io/cortexlabs/neuron-scheduler:0.42.0 +image_fluent_bit: quay.io/cortexlabs/fluent-bit:0.42.0 +image_istio_proxy: quay.io/cortexlabs/istio-proxy:0.42.0 +image_istio_pilot: quay.io/cortexlabs/istio-pilot:0.42.0 +image_prometheus: quay.io/cortexlabs/prometheus:0.42.0 +image_prometheus_config_reloader: quay.io/cortexlabs/prometheus-config-reloader:0.42.0 +image_prometheus_operator: quay.io/cortexlabs/prometheus-operator:0.42.0 +image_prometheus_statsd_exporter: quay.io/cortexlabs/prometheus-statsd-exporter:0.42.0 +image_prometheus_dcgm_exporter: quay.io/cortexlabs/prometheus-dcgm-exporter:0.42.0 +image_prometheus_kube_state_metrics: quay.io/cortexlabs/prometheus-kube-state-metrics:0.42.0 +image_prometheus_node_exporter: quay.io/cortexlabs/prometheus-node-exporter:0.42.0 +image_kube_rbac_proxy: quay.io/cortexlabs/kube-rbac-proxy:0.42.0 +image_grafana: quay.io/cortexlabs/grafana:0.42.0 +image_event_exporter: quay.io/cortexlabs/event-exporter:0.42.0 +image_kubexit: quay.io/cortexlabs/kubexit:0.42.0 ``` diff --git a/docs/clusters/management/update.md b/docs/clusters/management/update.md index 7f7f75fcf2..8dd290417f 100644 --- a/docs/clusters/management/update.md +++ b/docs/clusters/management/update.md @@ -59,8 +59,8 @@ If you are spinning a up a new cluster with a different Cortex version, first in ```bash -# download the desired CLI version, replace 0.41.0 with the desired version (Note the "v"): -bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/v0.41.0/get-cli.sh)" +# download the desired CLI version, replace 0.42.0 with the desired version (Note the "v"): +bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/v0.42.0/get-cli.sh)" # confirm Cortex CLI version cortex version @@ -74,11 +74,11 @@ You can use different Cortex CLIs to interact with the different versioned clust ```bash -# download the desired CLI version, replace 0.41.0 with the desired version (Note the "v"): -CORTEX_INSTALL_PATH=$(pwd)/cortex0.41.0 bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/v0.41.0/get-cli.sh)" +# download the desired CLI version, replace 0.42.0 with the desired version (Note the "v"): +CORTEX_INSTALL_PATH=$(pwd)/cortex0.42.0 bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/v0.42.0/get-cli.sh)" # confirm cortex CLI version -./cortex0.41.0 version +./cortex0.42.0 version ``` ### Deploy the APIs to your new cluster diff --git a/docs/clusters/observability/alerting.md b/docs/clusters/observability/alerting.md index e8de67402a..56f2462be9 100644 --- a/docs/clusters/observability/alerting.md +++ b/docs/clusters/observability/alerting.md @@ -155,7 +155,7 @@ containers: envFrom: - secretRef: name: grafana-smtp - image: quay.io/cortexlabs/grafana:0.41.0 + image: quay.io/cortexlabs/grafana:0.42.0 imagePullPolicy: IfNotPresent name: grafana # ... diff --git a/docs/start.md b/docs/start.md index 31339ce8ed..2fae846f75 100644 --- a/docs/start.md +++ b/docs/start.md @@ -5,7 +5,7 @@ ```bash # install the CLI -bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/v0.41.0/get-cli.sh)" +bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/v0.42.0/get-cli.sh)" # create a cluster cortex cluster up cluster.yaml diff --git a/get-cli.sh b/get-cli.sh index e9be9627fa..e723fbeb32 100755 --- a/get-cli.sh +++ b/get-cli.sh @@ -16,7 +16,7 @@ set -e -CORTEX_VERSION_BRANCH_STABLE=master +CORTEX_VERSION_BRANCH_STABLE=0.42.0 CORTEX_INSTALL_PATH="${CORTEX_INSTALL_PATH:-/usr/local/bin/cortex}" # replace ~ with the home directory path diff --git a/manager/check_cortex_version.sh b/manager/check_cortex_version.sh index 690491f16f..2855ae713c 100755 --- a/manager/check_cortex_version.sh +++ b/manager/check_cortex_version.sh @@ -16,7 +16,7 @@ set -e -CORTEX_VERSION=master +CORTEX_VERSION=0.42.0 if [ "$CORTEX_VERSION" != "$CORTEX_CLI_VERSION" ]; then echo "error: your CLI version ($CORTEX_CLI_VERSION) doesn't match your Cortex manager image version ($CORTEX_VERSION); please update your CLI (pip install cortex==$CORTEX_VERSION) to match the version of your Cortex manager image" diff --git a/manager/debug.sh b/manager/debug.sh index 1e93736436..2cefff1f83 100755 --- a/manager/debug.sh +++ b/manager/debug.sh @@ -16,7 +16,7 @@ set +e -CORTEX_VERSION_MINOR=master +CORTEX_VERSION_MINOR=0.42 debug_out_path="$1" mkdir -p "$(dirname "$debug_out_path")" diff --git a/manager/install.sh b/manager/install.sh index 93557474fc..4112823d82 100755 --- a/manager/install.sh +++ b/manager/install.sh @@ -16,8 +16,8 @@ set -eo pipefail -export CORTEX_VERSION=master -export CORTEX_VERSION_MINOR=master +export CORTEX_VERSION=0.42.0 +export CORTEX_VERSION_MINOR=0.42 EKSCTL_CLUSTER_TIMEOUT=45m EKSCTL_NODEGROUP_TIMEOUT=30m mkdir /workspace diff --git a/manager/refresh.sh b/manager/refresh.sh index 6794f2783e..2fa4cd8119 100755 --- a/manager/refresh.sh +++ b/manager/refresh.sh @@ -16,7 +16,7 @@ set -e -CORTEX_VERSION_MINOR=master +CORTEX_VERSION_MINOR=0.42 cluster_config_out_path="$1" mkdir -p "$(dirname "$cluster_config_out_path")" diff --git a/pkg/consts/consts.go b/pkg/consts/consts.go index 7faa4fbf3b..1f1840f032 100644 --- a/pkg/consts/consts.go +++ b/pkg/consts/consts.go @@ -24,8 +24,8 @@ import ( ) var ( - CortexVersion = "master" // CORTEX_VERSION - CortexVersionMinor = "master" // CORTEX_VERSION_MINOR + CortexVersion = "0.42.0" // CORTEX_VERSION + CortexVersionMinor = "0.42" // CORTEX_VERSION_MINOR DefaultNamespace = "default" KubeSystemNamespace = "kube-system" diff --git a/python/client/cortex/__init__.py b/python/client/cortex/__init__.py index cafb4055b3..250861449d 100644 --- a/python/client/cortex/__init__.py +++ b/python/client/cortex/__init__.py @@ -21,7 +21,7 @@ from cortex.telemetry import sentry_wrapper -__version__ = "master" # CORTEX_VERSION +__version__ = "0.42.0" # CORTEX_VERSION @sentry_wrapper diff --git a/python/client/cortex/client.py b/python/client/cortex/client.py index 14905403e7..1dc886f8fa 100644 --- a/python/client/cortex/client.py +++ b/python/client/cortex/client.py @@ -51,7 +51,7 @@ def deploy( Deploy or update an API. Args: - api_spec: A dictionary defining a single Cortex API. See https://docs.cortex.dev/v/master/ for schema. + api_spec: A dictionary defining a single Cortex API. See https://docs.cortex.dev/v/0.42/ for schema. force: Override any in-progress api updates. wait: Block until the API is ready. @@ -82,7 +82,7 @@ def deploy_from_file( Deploy or update APIs specified in a configuration file. Args: - config_file: Local path to a yaml file defining Cortex API(s). See https://docs.cortex.dev/v/master/ for schema. + config_file: Local path to a yaml file defining Cortex API(s). See https://docs.cortex.dev/v/0.42/ for schema. force: Override any in-progress api updates. wait: Block until the API is ready. diff --git a/python/client/cortex/consts.py b/python/client/cortex/consts.py index 42c5ec9546..0c0f4626fa 100644 --- a/python/client/cortex/consts.py +++ b/python/client/cortex/consts.py @@ -13,6 +13,6 @@ # limitations under the License. -CORTEX_VERSION = "master" # CORTEX_VERSION +CORTEX_VERSION = "0.42.0" # CORTEX_VERSION CORTEX_TELEMETRY_SENTRY_DSN = "https://5cea3d2d67194d028f7191fcc6ebca14@sentry.io/1825326" CORTEX_TELEMETRY_SENTRY_ENVIRONMENT = "client" diff --git a/python/client/setup.py b/python/client/setup.py index 69ee0d5f7c..1b0ef546a2 100644 --- a/python/client/setup.py +++ b/python/client/setup.py @@ -79,7 +79,7 @@ def run(self): setup( name="cortex", - version="master", # CORTEX_VERSION + version="0.42.0", # CORTEX_VERSION description="Cost-effective serverless computing", author="cortex.dev", author_email="dev@cortex.dev", diff --git a/test/e2e/setup.py b/test/e2e/setup.py index 029d1eb438..70c2e1512f 100644 --- a/test/e2e/setup.py +++ b/test/e2e/setup.py @@ -24,7 +24,7 @@ setup( name="e2e", - version="master", # CORTEX_VERSION + version="0.42.0", # CORTEX_VERSION packages=find_packages(exclude=["tests"]), url="https://github.com/cortexlabs/cortex", license="Apache License 2.0",