diff --git a/docs/self-hosted/external-services/object-storage.mdx b/docs/self-hosted/external-services/object-storage.mdx index d78b4591a..0f8686f2c 100644 --- a/docs/self-hosted/external-services/object-storage.mdx +++ b/docs/self-hosted/external-services/object-storage.mdx @@ -4,115 +4,194 @@ By default, Sourcegraph will use a `sourcegraph/blobstore` server bundled with t You can alternatively configure your instance to instead store this data in an S3 or GCS bucket. Doing so may decrease your hosting costs as persistent volumes are often more expensive than the same storage space in an object store service. + + Starting in [Sourcegraph 7.2](https://sourcegraph.com/changelog/releases/7.2), new instances can configure only the + [`sourcegraph` bucket](#sourcegraph-bucket), and Sourcegraph will use that + single bucket for all features. If a separate bucket is needed for Code Graph + Indexes or Search Job Results, that can still be configured, but we recommend + using one bucket. + + + + +## `sourcegraph` bucket + + + Starting in [Sourcegraph 7.2](https://sourcegraph.com/changelog/releases/7.2), self-hosted Sourcegraph instances using S3 or + GCS object storage should now provision an additional bucket named + [`sourcegraph`](#sourcegraph-bucket). Sourcegraph currently reports a warning + when this bucket is not present, and it will become required for new features + in a future release. No action is required if you are using the default + `sourcegraph/blobstore`. + + +The `sourcegraph` bucket is intended to be the single bucket for new Sourcegraph features. Instead of creating one bucket per feature, new features store objects under namespaced key prefixes within this bucket. + +Existing buckets for code graph indexes and search jobs remain in use. This change ensures future features can be enabled without requiring a new bucket for each feature. + +### Using S3 for the `sourcegraph` bucket + +Set the following environment variables to target an S3 bucket for shared Sourcegraph uploads. + +- `SOURCEGRAPH_UPLOAD_BACKEND=S3` +- `SOURCEGRAPH_UPLOAD_BUCKET=sourcegraph` (default) +- `SOURCEGRAPH_UPLOAD_AWS_ENDPOINT=https://s3.us-east-1.amazonaws.com` +- `SOURCEGRAPH_UPLOAD_AWS_ACCESS_KEY_ID=` +- `SOURCEGRAPH_UPLOAD_AWS_SECRET_ACCESS_KEY=` +- `SOURCEGRAPH_UPLOAD_AWS_SESSION_TOKEN=` (optional) +- `SOURCEGRAPH_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS=true` (optional; set to use EC2 metadata API over static credentials) +- `SOURCEGRAPH_UPLOAD_AWS_USE_PATH_STYLE=false` (optional) +- `SOURCEGRAPH_UPLOAD_AWS_REGION=us-east-1` (default) + +### Using GCS for the `sourcegraph` bucket + +Set the following environment variables to target a GCS bucket for shared Sourcegraph uploads. + +- `SOURCEGRAPH_UPLOAD_BACKEND=GCS` +- `SOURCEGRAPH_UPLOAD_BUCKET=sourcegraph` (default) +- `SOURCEGRAPH_UPLOAD_GCP_PROJECT_ID=` +- `SOURCEGRAPH_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE=` +- `SOURCEGRAPH_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE_CONTENT=<{"my": "content"}>` + +### Automatically provision the `sourcegraph` bucket + +If you would like to allow your Sourcegraph instance to manage the target bucket configuration, set the following environment variable: + + + This requires additional bucket-management permissions from your configured + storage vendor (AWS or GCP). + + +- `SOURCEGRAPH_UPLOAD_MANAGE_BUCKET=true` + ## Code Graph Indexes To target a managed object storage service for storing [code graph index uploads](../../code-navigation/precise-code-navigation), you will need to set a handful of environment variables for configuration and authentication to the target service. -- If you are running a `sourcegraph/server` deployment, set the environment variables on the server container -- If you are running via Docker-compose or Kubernetes, set the environment variables on the `frontend`, `worker`, and `precise-code-intel-worker` containers + + Starting in [Sourcegraph 7.2](https://sourcegraph.com/changelog/releases/7.2), new instances can configure only the + [`sourcegraph` bucket](#sourcegraph-bucket), and Sourcegraph will use that + single bucket for all features. If a separate bucket is needed for Code Graph + Indexes, that can still be configured, but we recommend using one bucket. + + +- If you are running a `sourcegraph/server` deployment, set the environment variables on the server container +- If you are running via Docker-compose or Kubernetes, set the environment variables on the `frontend`, `worker`, and `precise-code-intel-worker` containers -### Using S3 +### Using S3 for the Code Graph Indexes bucket To target an S3 bucket you've already provisioned, set the following environment variables. Authentication can be done through [an access and secret key pair](https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys) (and optional session token), or via the EC2 metadata API. - {' '} - Never commit AWS access keys in Git. You should consider using a secret handling - service offered by your cloud provider.{' '} + Never commit AWS access keys in Git. You should consider using a secret + handling service offered by your cloud provider. -- `PRECISE_CODE_INTEL_UPLOAD_BACKEND=S3` -- `PRECISE_CODE_INTEL_UPLOAD_BUCKET=` -- `PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=https://s3.us-east-1.amazonaws.com` -- `PRECISE_CODE_INTEL_UPLOAD_AWS_ACCESS_KEY_ID=` -- `PRECISE_CODE_INTEL_UPLOAD_AWS_SECRET_ACCESS_KEY=` -- `PRECISE_CODE_INTEL_UPLOAD_AWS_SESSION_TOKEN=` (optional) -- `PRECISE_CODE_INTEL_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS=true` (optional; set to use EC2 metadata API over static credentials) -- `PRECISE_CODE_INTEL_UPLOAD_AWS_REGION=us-east-1` (default) +- `PRECISE_CODE_INTEL_UPLOAD_BACKEND=S3` +- `PRECISE_CODE_INTEL_UPLOAD_BUCKET=` +- `PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=https://s3.us-east-1.amazonaws.com` +- `PRECISE_CODE_INTEL_UPLOAD_AWS_ACCESS_KEY_ID=` +- `PRECISE_CODE_INTEL_UPLOAD_AWS_SECRET_ACCESS_KEY=` +- `PRECISE_CODE_INTEL_UPLOAD_AWS_SESSION_TOKEN=` (optional) +- `PRECISE_CODE_INTEL_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS=true` (optional; set to use EC2 metadata API over static credentials) +- `PRECISE_CODE_INTEL_UPLOAD_AWS_REGION=us-east-1` (default) - {' '} - If a non-default region is supplied, ensure that the subdomain of the endpoint - URL (_the `AWS_ENDPOINT` value_) matches the target region.{' '} + If a non-default region is supplied, ensure that the subdomain of the + endpoint URL (_the `AWS_ENDPOINT` value_) matches the target region. - {' '} - You don't need to set the `PRECISE_CODE_INTEL_UPLOAD_AWS_ACCESS_KEY_ID` environment - variable when using `PRECISE_CODE_INTEL_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS=true` - because role credentials will be automatically resolved. Attach the IAM role - to the EC2 instances hosting the `frontend`, `worker`, and `precise-code-intel-worker` - containers in a multi-node environment.{' '} + You don't need to set the `PRECISE_CODE_INTEL_UPLOAD_AWS_ACCESS_KEY_ID` + environment variable when using + `PRECISE_CODE_INTEL_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS=true` because role + credentials will be automatically resolved. Attach the IAM role to the EC2 + instances hosting the `frontend`, `worker`, and `precise-code-intel-worker` + containers in a multi-node environment. -### Using GCS +### Using GCS for the Code Graph Indexes bucket To target a GCS bucket you've already provisioned, set the following environment variables. Authentication is done through a service account key, supplied as either a path to a volume-mounted file, or the contents read in as an environment variable payload. -- `PRECISE_CODE_INTEL_UPLOAD_BACKEND=GCS` -- `PRECISE_CODE_INTEL_UPLOAD_BUCKET=` -- `PRECISE_CODE_INTEL_UPLOAD_GCP_PROJECT_ID=` -- `PRECISE_CODE_INTEL_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE=` -- `PRECISE_CODE_INTEL_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE_CONTENT=<{"my": "content"}>` +- `PRECISE_CODE_INTEL_UPLOAD_BACKEND=GCS` +- `PRECISE_CODE_INTEL_UPLOAD_BUCKET=` +- `PRECISE_CODE_INTEL_UPLOAD_GCP_PROJECT_ID=` +- `PRECISE_CODE_INTEL_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE=` +- `PRECISE_CODE_INTEL_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE_CONTENT=<{"my": "content"}>` -### Provisioning buckets +### Automatically provision the Code Graph Indexes bucket If you would like to allow your Sourcegraph instance to control the creation and lifecycle configuration management of the target buckets, set the following environment variables: -- `PRECISE_CODE_INTEL_UPLOAD_MANAGE_BUCKET=true` -- `PRECISE_CODE_INTEL_UPLOAD_TTL=168h` (default) + + This requires additional bucket-management permissions from your configured + storage vendor (AWS or GCP). + + +- `PRECISE_CODE_INTEL_UPLOAD_MANAGE_BUCKET=true` +- `PRECISE_CODE_INTEL_UPLOAD_TTL=168h` (default) ## Search Job Results To target a third party managed object storage service for storing [search job results](../../code-search/types/search-jobs), you must set a handful of environment variables for configuration and authentication to the target service. -- If you are running a `sourcegraph/server` deployment, set the environment variables on the server container -- If you are running via Docker-compose or Kubernetes, set the environment variables on the `frontend` and `worker` containers + + Starting in [Sourcegraph 7.2](https://sourcegraph.com/changelog/releases/7.2), new instances can configure only the + [`sourcegraph` bucket](#sourcegraph-bucket), and Sourcegraph will use that + single bucket for all features. If a separate bucket is needed for Search Job + Results, that can still be configured, but we recommend using one bucket. + + +- If you are running a `sourcegraph/server` deployment, set the environment variables on the server container +- If you are running via Docker-compose or Kubernetes, set the environment variables on the `frontend` and `worker` containers -### Using S3 +### Using S3 for the Search Job Results bucket Set the following environment variables to target an S3 bucket you've already provisioned. Authentication can be done through [an access and secret key pair](https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys) (and optionally through session token) or via the EC2 metadata API. - {' '} - Never commit AWS access keys in Git. You should consider using a secret handling - service offered by your cloud provider. + Never commit AWS access keys in Git. You should consider using a secret + handling service offered by your cloud provider. -- `SEARCH_JOBS_UPLOAD_BACKEND=S3` -- `SEARCH_JOBS_UPLOAD_BUCKET=` -- `SEARCH_JOBS_UPLOAD_AWS_ENDPOINT=https://s3.us-east-1.amazonaws.com` -- `SEARCH_JOBS_UPLOAD_AWS_ACCESS_KEY_ID=` -- `SEARCH_JOBS_UPLOAD_AWS_SECRET_ACCESS_KEY=` -- `SEARCH_JOBS_UPLOAD_AWS_SESSION_TOKEN=` (optional) -- `SEARCH_JOBS_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS=true` (optional; set to use EC2 metadata API over static credentials) -- `SEARCH_JOBS_UPLOAD_AWS_REGION=us-east-1` (default) +- `SEARCH_JOBS_UPLOAD_BACKEND=S3` +- `SEARCH_JOBS_UPLOAD_BUCKET=` +- `SEARCH_JOBS_UPLOAD_AWS_ENDPOINT=https://s3.us-east-1.amazonaws.com` +- `SEARCH_JOBS_UPLOAD_AWS_ACCESS_KEY_ID=` +- `SEARCH_JOBS_UPLOAD_AWS_SECRET_ACCESS_KEY=` +- `SEARCH_JOBS_UPLOAD_AWS_SESSION_TOKEN=` (optional) +- `SEARCH_JOBS_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS=true` (optional; set to use EC2 metadata API over static credentials) +- `SEARCH_JOBS_UPLOAD_AWS_REGION=us-east-1` (default) - {' '} - If a non-default region is supplied, ensure that the subdomain of the endpoint - URL (the `AWS_ENDPOINT` value) matches the target region. + If a non-default region is supplied, ensure that the subdomain of the + endpoint URL (the `AWS_ENDPOINT` value) matches the target region. - {' '} You don't need to set the `SEARCH_JOBS_UPLOAD_AWS_ACCESS_KEY_ID` environment - variable when using `SEARCH_JOBS_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS=true` because - role credentials will be automatically resolved. + variable when using `SEARCH_JOBS_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS=true` + because role credentials will be automatically resolved. -### Using GCS +### Using GCS for the Search Job Results bucket Set the following environment variables to target a GCS bucket you've already provisioned. Authentication is done through a service account key, either as a path to a volume-mounted file or the contents read in as an environment variable payload. -- `SEARCH_JOBS_UPLOAD_BACKEND=GCS` -- `SEARCH_JOBS_UPLOAD_BUCKET=` -- `SEARCH_JOBS_UPLOAD_GCP_PROJECT_ID=` -- `SEARCH_JOBS_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE=` -- `SEARCH_JOBS_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE_CONTENT=<{"my": "content"}>` +- `SEARCH_JOBS_UPLOAD_BACKEND=GCS` +- `SEARCH_JOBS_UPLOAD_BUCKET=` +- `SEARCH_JOBS_UPLOAD_GCP_PROJECT_ID=` +- `SEARCH_JOBS_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE=` +- `SEARCH_JOBS_UPLOAD_GOOGLE_APPLICATION_CREDENTIALS_FILE_CONTENT=<{"my": "content"}>` -### Provisioning buckets +### Automatically provision the Search Job Results bucket If you would like to allow your Sourcegraph instance to control the creation and lifecycle configuration management of the target buckets, set the following environment variables: -- `SEARCH_JOBS_UPLOAD_MANAGE_BUCKET=true` + + This requires additional bucket-management permissions from your configured + storage vendor (AWS or GCP). + + +- `SEARCH_JOBS_UPLOAD_MANAGE_BUCKET=true`