Skip to content

Commit 1b47b06

Browse files
committed
Update docs links (#1095)
(cherry picked from commit 5d3a6b2)
1 parent 02367ec commit 1b47b06

File tree

30 files changed

+45
-44
lines changed

30 files changed

+45
-44
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ checklist:
77
- [ ] run `make test` and `make lint`
88
- [ ] test manually (i.e. build/push all images, restart operator, and re-deploy APIs)
99
- [ ] update examples
10-
- [ ] update docs and add any new files to `summary.md` (view in [gitbook](https://cortex.dev/v/master) after merging)
10+
- [ ] update docs and add any new files to `summary.md` (view in [gitbook](https://docs.cortex.dev/v/master) after merging)
1111
- [ ] cherry-pick into release branches if applicable
1212
- [ ] alert the dev team if the dev environment changed

cli/cmd/lib_aws_creds.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func promptIfNotAdmin(awsClient *aws.Client, disallowPrompt bool) {
5858
}
5959

6060
if !awsClient.IsAdmin() {
61-
warningStr := fmt.Sprintf("warning: your IAM user%s does not have administrator access. This will likely prevent Cortex from installing correctly, so it is recommended to attach the AdministratorAccess policy to your IAM user (or to a group that your IAM user belongs to) via the AWS IAM console. If you'd like, you may provide separate credentials for your cluster to use after it's running (see https://cortex.dev/cluster-management/security for instructions).\n\n", accessKeyMsg)
61+
warningStr := fmt.Sprintf("warning: your IAM user%s does not have administrator access. This will likely prevent Cortex from installing correctly, so it is recommended to attach the AdministratorAccess policy to your IAM user (or to a group that your IAM user belongs to) via the AWS IAM console. If you'd like, you may provide separate credentials for your cluster to use after it's running (see https://docs.cortex.dev/miscellaneous/security for instructions).\n\n", accessKeyMsg)
6262
if disallowPrompt {
6363
fmt.Print(warningStr)
6464
} else {

cli/cmd/lib_cluster_config.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func readCachedClusterConfigFile(clusterConfig *clusterconfig.Config, filePath s
7474
func readUserClusterConfigFile(clusterConfig *clusterconfig.Config) error {
7575
errs := cr.ParseYAMLFile(clusterConfig, clusterconfig.UserValidation, _flagClusterConfig)
7676
if errors.HasError(errs) {
77-
return errors.Append(errors.FirstError(errs...), fmt.Sprintf("\n\ncluster configuration schema can be found here: https://www.cortex.dev/v/%s/cluster-management/config", consts.CortexVersionMinor))
77+
return errors.Append(errors.FirstError(errs...), fmt.Sprintf("\n\ncluster configuration schema can be found here: https://docs.cortex.dev/v/%s/cluster-management/config", consts.CortexVersionMinor))
7878
}
7979

8080
return nil
@@ -89,7 +89,7 @@ func getClusterAccessConfig(disallowPrompt bool) (*clusterconfig.AccessConfig, e
8989
if _flagClusterConfig != "" {
9090
errs := cr.ParseYAMLFile(accessConfig, clusterconfig.AccessValidation, _flagClusterConfig)
9191
if errors.HasError(errs) {
92-
return nil, errors.Append(errors.FirstError(errs...), fmt.Sprintf("\n\ncluster configuration schema can be found here: https://www.cortex.dev/v/%s/cluster-management/config", consts.CortexVersionMinor))
92+
return nil, errors.Append(errors.FirstError(errs...), fmt.Sprintf("\n\ncluster configuration schema can be found here: https://docs.cortex.dev/v/%s/cluster-management/config", consts.CortexVersionMinor))
9393
}
9494
}
9595

@@ -458,22 +458,22 @@ func confirmInstallClusterConfig(clusterConfig *clusterconfig.Config, awsCreds A
458458
fmt.Printf("cortex will also create an s3 bucket (%s) and a cloudwatch log group (%s)%s\n\n", clusterConfig.Bucket, clusterConfig.LogGroup, privateSubnetMsg)
459459

460460
if clusterConfig.APILoadBalancerScheme == clusterconfig.InternalLoadBalancerScheme {
461-
fmt.Print("warning: you've configured the API load balancer to be internal; you must configure VPC Peering or an API Gateway VPC Link to connect to your APIs (see www.cortex.dev/guides/vpc-peering or www.cortex.dev/guides/api-gateway)\n\n")
461+
fmt.Print("warning: you've configured the API load balancer to be internal; you must configure VPC Peering or an API Gateway VPC Link to connect to your APIs (see https://docs.cortex.dev/guides/vpc-peering or https://docs.cortex.dev/guides/api-gateway)\n\n")
462462
}
463463
if clusterConfig.OperatorLoadBalancerScheme == clusterconfig.InternalLoadBalancerScheme {
464-
fmt.Print("warning: you've configured the operator load balancer to be internal; you must configure VPC Peering to connect your CLI to your cluster operator (see www.cortex.dev/guides/vpc-peering)\n\n")
464+
fmt.Print("warning: you've configured the operator load balancer to be internal; you must configure VPC Peering to connect your CLI to your cluster operator (see https://docs.cortex.dev/guides/vpc-peering)\n\n")
465465
}
466466

467467
if isSpot && clusterConfig.SpotConfig.OnDemandBackup != nil && !*clusterConfig.SpotConfig.OnDemandBackup {
468468
if *clusterConfig.SpotConfig.OnDemandBaseCapacity == 0 && *clusterConfig.SpotConfig.OnDemandPercentageAboveBaseCapacity == 0 {
469-
fmt.Printf("warning: you've disabled on-demand instances (%s=0 and %s=0); spot instances are not guaranteed to be available so please take that into account for production clusters; see https://cortex.dev/v/%s/cluster-management/spot-instances for more information\n\n", clusterconfig.OnDemandBaseCapacityKey, clusterconfig.OnDemandPercentageAboveBaseCapacityKey, consts.CortexVersionMinor)
469+
fmt.Printf("warning: you've disabled on-demand instances (%s=0 and %s=0); spot instances are not guaranteed to be available so please take that into account for production clusters; see https://docs.cortex.dev/v/%s/cluster-management/spot-instances for more information\n\n", clusterconfig.OnDemandBaseCapacityKey, clusterconfig.OnDemandPercentageAboveBaseCapacityKey, consts.CortexVersionMinor)
470470
} else {
471-
fmt.Printf("warning: you've enabled spot instances; spot instances are not guaranteed to be available so please take that into account for production clusters; see https://cortex.dev/v/%s/cluster-management/spot-instances for more information\n\n", consts.CortexVersionMinor)
471+
fmt.Printf("warning: you've enabled spot instances; spot instances are not guaranteed to be available so please take that into account for production clusters; see https://docs.cortex.dev/v/%s/cluster-management/spot-instances for more information\n\n", consts.CortexVersionMinor)
472472
}
473473
}
474474

475475
if !disallowPrompt {
476-
exitMessage := fmt.Sprintf("cluster configuration can be modified via the cluster config file; see https://cortex.dev/v/%s/cluster-management/config for more information", consts.CortexVersionMinor)
476+
exitMessage := fmt.Sprintf("cluster configuration can be modified via the cluster config file; see https://docs.cortex.dev/v/%s/cluster-management/config for more information", consts.CortexVersionMinor)
477477
prompt.YesOrExit("would you like to continue?", "", exitMessage)
478478
}
479479
}
@@ -482,7 +482,7 @@ func confirmConfigureClusterConfig(clusterConfig clusterconfig.Config, awsCreds
482482
fmt.Println(clusterConfigConfirmaionStr(clusterConfig, awsCreds, awsClient))
483483

484484
if !disallowPrompt {
485-
exitMessage := fmt.Sprintf("cluster configuration can be modified via the cluster config file; see https://cortex.dev/v/%s/cluster-management/config for more information", consts.CortexVersionMinor)
485+
exitMessage := fmt.Sprintf("cluster configuration can be modified via the cluster config file; see https://docs.cortex.dev/v/%s/cluster-management/config for more information", consts.CortexVersionMinor)
486486
prompt.YesOrExit(fmt.Sprintf("your cluster named \"%s\" in %s will be updated according to the configuration above, are you sure you want to continue?", clusterConfig.ClusterName, *clusterConfig.Region), "", exitMessage)
487487
}
488488
}

cli/local/validations.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ func ValidateLocalAPIs(apis []userconfig.API, projectFiles ProjectFiles, awsClie
118118
if len(apisRequiringGPU) > 0 {
119119
if _, ok := dockerClient.Info.Runtimes["nvidia"]; !ok {
120120
if !strings.HasPrefix(strings.ToLower(runtime.GOOS), "linux") {
121-
fmt.Printf("warning: %s will run without gpu access because the nvidia container runtime is not supported on your operating system; see https://cortex.dev/troubleshooting/nvidia-container-runtime-not-found for more information\n\n", s.StrsAnd(apisRequiringGPU.SliceSorted()))
121+
fmt.Printf("warning: %s will run without gpu access because the nvidia container runtime is not supported on your operating system; see https://docs.cortex.dev/troubleshooting/nvidia-container-runtime-not-found for more information\n\n", s.StrsAnd(apisRequiringGPU.SliceSorted()))
122122
} else {
123-
fmt.Printf("warning: %s will run without gpu access because your local machine doesn't have a gpu or the nvidia container runtime is not configured properly; see https://cortex.dev/troubleshooting/nvidia-container-runtime-not-found for more information\n\n", s.StrsAnd(apisRequiringGPU.SliceSorted()))
123+
fmt.Printf("warning: %s will run without gpu access because your local machine doesn't have a gpu or the nvidia container runtime is not configured properly; see https://docs.cortex.dev/troubleshooting/nvidia-container-runtime-not-found for more information\n\n", s.StrsAnd(apisRequiringGPU.SliceSorted()))
124124
}
125125

126126
for i := range apis {

docs/cluster-management/config.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ subnet_visibility: public # must be "public" or "private"
5454
nat_gateway: none # must be "none", "single", or "highly_available" (highly_available means one NAT gateway per availability zone)
5555

5656
# whether the API load balancer should be internet-facing or internal (default: "internet-facing")
57-
# note: if using "internal", you must configure VPC Peering or an API Gateway VPC Link to connect to your APIs (see www.cortex.dev/guides/vpc-peering or www.cortex.dev/guides/api-gateway)
57+
# note: if using "internal", you must configure VPC Peering or an API Gateway VPC Link to connect to your APIs (see https://docs.cortex.dev/guides/vpc-peering or https://docs.cortex.dev/guides/api-gateway)
5858
api_load_balancer_scheme: internet-facing # must be "internet-facing" or "internal"
5959

6060
# whether the operator load balancer should be internet-facing or internal (default: "internet-facing")
61-
# note: if using "internal", you must configure VPC Peering to connect your CLI to your cluster operator (see www.cortex.dev/guides/vpc-peering)
61+
# note: if using "internal", you must configure VPC Peering to connect your CLI to your cluster operator (see https://docs.cortex.dev/guides/vpc-peering)
6262
operator_load_balancer_scheme: internet-facing # must be "internet-facing" or "internal"
6363

6464
# CloudWatch log group for cortex (default: <cluster_name>)
@@ -68,10 +68,10 @@ log_group: cortex
6868
tags: # <string>: <string> map of key/value pairs
6969

7070
# whether to use spot instances in the cluster (default: false)
71-
# see https://cortex.dev/v/0.17/cluster-management/spot-instances for additional details on spot configuration
71+
# see https://docs.cortex.dev/v/0.17/cluster-management/spot-instances for additional details on spot configuration
7272
spot: false
7373

74-
# see https://cortex.dev/v/0.17/guides/subdomain-https-setup for instructions on how to set up HTTPS for APIs
74+
# see https://docs.cortex.dev/v/0.17/guides/subdomain-https-setup for instructions on how to set up HTTPS for APIs
7575
ssl_certificate_arn: # if empty, APIs will still be accessible via HTTPS (in addition to HTTP), but will not use a trusted certificate
7676
```
7777

docs/guides/batch-runner.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class PythonPredictor:
4040
# If you have changed these values, the number of replicas created will be equal to max_workers / target_replica_concurrency
4141
# (note that the default value of target_replica_concurrency is workers_per_replica * threads_per_worker).
4242
# If max_workers starts to get large, you will also want to set the inference API's max_replica_concurrency to avoid long and imbalanced queue lengths
43-
# Here are the autoscaling docs: https://www.cortex.dev/deployments/autoscaling
43+
# Here are the autoscaling docs: https://docs.cortex.dev/deployments/autoscaling
4444
with ThreadPoolExecutor(max_workers=5) as executor:
4545
results = executor.map(self.make_request, batches)
4646

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
22

33
Please refer [here](https://sshleifer.github.io/blog_v2/jupyter/2020/03/12/bart.html) to learn more about BART.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please refer to the [tutorial](https://cortex.dev/iris-classifier) to see how to deploy an example with Cortex.
1+
Please refer to the [tutorial](https://docs.cortex.dev/iris-classifier) to see how to deploy an example with Cortex.

manager/check_cortex_version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ set -e
1919
CORTEX_VERSION=0.17.0
2020

2121
if [ "$CORTEX_VERSION" != "$CORTEX_CLI_VERSION" ]; then
22-
echo "error: your CLI version ($CORTEX_CLI_VERSION) doesn't match your Cortex manager image version ($CORTEX_VERSION); please update your CLI by following the instructions at https://www.cortex.dev/install, or update your Cortex manager image by modifying the value for \`image_manager\` in your cluster configuration file (e.g. cluster.yaml) and running \`cortex cluster configure --config cluster.yaml\` (update other image paths in cluster.yaml as well if necessary)"
22+
echo "error: your CLI version ($CORTEX_CLI_VERSION) doesn't match your Cortex manager image version ($CORTEX_VERSION); please update your CLI by following the instructions at https://docs.cortex.dev/install, or update your Cortex manager image by modifying the value for \`image_manager\` in your cluster configuration file (e.g. cluster.yaml) and running \`cortex cluster configure --config cluster.yaml\` (update other image paths in cluster.yaml as well if necessary)"
2323
exit 1
2424
fi

pkg/lib/configreader/errors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,6 @@ func ErrorCortexResourceNotAllowed(resourceName string) error {
364364
func ErrorImageVersionMismatch(image, tag, cortexVersion string) error {
365365
return errors.WithStack(&errors.Error{
366366
Kind: ErrImageVersionMismatch,
367-
Message: fmt.Sprintf("the specified image (%s) has a tag (%s) which does not match your Cortex version (%s); please update the image tag, remove the image registry path from your configuration file (to use the default value), or update your CLI by following the instructions at https://www.cortex.dev/install", image, tag, cortexVersion),
367+
Message: fmt.Sprintf("the specified image (%s) has a tag (%s) which does not match your Cortex version (%s); please update the image tag, remove the image registry path from your configuration file (to use the default value), or update your CLI by following the instructions at https://docs.cortex.dev/install", image, tag, cortexVersion),
368368
})
369369
}

pkg/lib/k8s/errors.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package k8s
1919
import (
2020
"fmt"
2121

22+
"github.com/cortexlabs/cortex/pkg/consts"
2223
"github.com/cortexlabs/cortex/pkg/lib/errors"
2324
s "github.com/cortexlabs/cortex/pkg/lib/strings"
2425
)
@@ -69,8 +70,7 @@ func ErrorParseAnnotation(annotationName string, annotationVal string, desiredTy
6970

7071
func ErrorParseQuantity(qtyStr string) error {
7172
return errors.WithStack(&errors.Error{
72-
Kind: ErrParseQuantity,
73-
// CORTEX_VERSION_MINOR
74-
Message: qtyStr + ": invalid kubernetes quantity, some valid examples are 1, 200m, 500Mi, 2G (see here for more information: https://cortex.dev/v/0.17/deployments/compute)",
73+
Kind: ErrParseQuantity,
74+
Message: fmt.Sprintf("%s: invalid kubernetes quantity, some valid examples are 1, 200m, 500Mi, 2G (see here for more information: https://docs.cortex.dev/v/%s/deployments/compute)", qtyStr, consts.CortexVersionMinor),
7575
})
7676
}

pkg/operator/endpoints/errors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const (
4040
func ErrorAPIVersionMismatch(operatorVersion string, clientVersion string) error {
4141
return errors.WithStack(&errors.Error{
4242
Kind: ErrAPIVersionMismatch,
43-
Message: fmt.Sprintf("your CLI version (%s) doesn't match your Cortex operator version (%s); please update your cluster by following the instructions at https://www.cortex.dev/cluster-management/update, or update your CLI by following the instructions at https://www.cortex.dev/install", clientVersion, operatorVersion),
43+
Message: fmt.Sprintf("your CLI version (%s) doesn't match your Cortex operator version (%s); please update your cluster by following the instructions at https://docs.cortex.dev/cluster-management/update, or update your CLI by following the instructions at https://docs.cortex.dev/install", clientVersion, operatorVersion),
4444
})
4545
}
4646

0 commit comments

Comments
 (0)