Skip to content

Commit 5dfbe86

Browse files
committed
release_major: v7.0.0
{"version":"v7.0.0","inputs":"server=v7.0.0","type":"major"}
1 parent f79f4d1 commit 5dfbe86

11 files changed

Lines changed: 24 additions & 24 deletions

File tree

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ This repository provides a [Terraform module](https://learn.hashicorp.com/tutori
66

77
This repository provides four submodules:
88

9-
1. The [executors module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0/submodules/executors) provisions compute resources for executors.
10-
2. The [docker-mirror module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0/submodules/docker-mirror) provisions a Docker registry pull-through cache.
11-
3. The [networking module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0/submodules/networking) provisions a network to be shared by the executor and Docker registry resources.
12-
4. The [credentials module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0/submodules/credentials) provisions credentials required by the Sourcegraph instance to enable observability and auto-scaling of executors.
9+
1. The [executors module](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0/submodules/executors) provisions compute resources for executors.
10+
2. The [docker-mirror module](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0/submodules/docker-mirror) provisions a Docker registry pull-through cache.
11+
3. The [networking module](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0/submodules/networking) provisions a network to be shared by the executor and Docker registry resources.
12+
4. The [credentials module](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0/submodules/credentials) provisions credentials required by the Sourcegraph instance to enable observability and auto-scaling of executors.
1313

14-
The [multiple-executors example](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.12.0/examples/multiple-executors) uses the submodule directly to provision multiple executor resource groups performing different types of work. Follow this example if you are:
14+
The [multiple-executors example](https://github.com/sourcegraph/terraform-aws-executors/blob/v7.0.0/examples/multiple-executors) uses the submodule directly to provision multiple executor resource groups performing different types of work. Follow this example if you are:
1515

1616

1717
1. Provisioning executors for use with multiple features (e.g., both [auto-indexing](https://sourcegraph.com/docs/code_intelligence/explanations/auto_indexing) and [server-side batch changes](https://sourcegraph.com/docs/batch_changes/explanations/server_side)), or
1818
2. Provisioning resources for multiple Sourcegraph instances (e.g., test, prod)
1919

20-
This repository also provides a [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0) combining the executors, network, and docker-mirror resources into an easier to use package.
20+
This repository also provides a [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0) combining the executors, network, and docker-mirror resources into an easier to use package.
2121

22-
The [single-executor example](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.12.0/examples/single-executor) uses the root module to provision a single executor type. Follow this example if you are deploying to a single Sourcegraph instance and using a single executors-backed feature.
22+
The [single-executor example](https://github.com/sourcegraph/terraform-aws-executors/blob/v7.0.0/examples/single-executor) uses the root module to provision a single executor type. Follow this example if you are deploying to a single Sourcegraph instance and using a single executors-backed feature.
2323

2424
## Requirements
2525

@@ -28,7 +28,7 @@ The [single-executor example](https://github.com/sourcegraph/terraform-aws-execu
2828
- 4.2.0 and above: `>= 1.1.0, < 2.0.0`
2929
- [hashicorp/aws](https://registry.terraform.io/providers/hashicorp/aws)
3030
- 4.1.0 and below: `~> 3.0.0`
31-
- 4.2.0 and above: `>= 3.0, < 6.12.0`
31+
- 4.2.0 and above: `>= 3.0, < 7.0.0`
3232

3333
## Setup
3434

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Multiple executor example
22

3-
This example uses [networking](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0/submodules/networking), [docker-mirror](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0/submodules/docker-mirror), and [executors](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0/submodules/executors) submodules that provision a network, a Docker registry mirror, and sets of resources running one or more types of executors.
3+
This example uses [networking](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0/submodules/networking), [docker-mirror](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0/submodules/docker-mirror), and [executors](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0/submodules/executors) submodules that provision a network, a Docker registry mirror, and sets of resources running one or more types of executors.
44

55
The following variables must be supplied:
66

@@ -10,4 +10,4 @@ The following variables must be supplied:
1010

1111
If your deployment environment already has a Docker registry that can be used, only the `executor` submodule must be used (and references to the `networking` and `docker-mirror` modules can be dropped). The Docker registry mirror address can be supplied along with its containing VPC and subnet as pre-existing identifier literals.
1212

13-
All of these module's variables are defined in [modules/networking/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.12.0/modules/networking/variables.tf), [modules/docker-mirror/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.12.0/modules/docker-mirror/variables.tf), and [modules/executors/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.12.0/modules/executors/variables.tf).
13+
All of these module's variables are defined in [modules/networking/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v7.0.0/modules/networking/variables.tf), [modules/docker-mirror/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v7.0.0/modules/docker-mirror/variables.tf), and [modules/executors/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v7.0.0/modules/executors/variables.tf).

examples/multiple-executors/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ locals {
66

77
module "networking" {
88
source = "sourcegraph/executors/aws//modules/networking"
9-
version = "6.12.0" # LATEST
9+
version = "7.0.0" # LATEST
1010

1111
availability_zone = local.availability_zone
1212
randomize_resource_names = true
1313
}
1414

1515
module "docker-mirror" {
1616
source = "sourcegraph/executors/aws//modules/docker-mirror"
17-
version = "6.12.0" # LATEST
17+
version = "7.0.0" # LATEST
1818

1919
vpc_id = module.networking.vpc_id
2020
subnet_id = module.networking.subnet_id
@@ -25,7 +25,7 @@ module "docker-mirror" {
2525

2626
module "executors-codeintel" {
2727
source = "sourcegraph/executors/aws//modules/executors"
28-
version = "6.12.0" # LATEST
28+
version = "7.0.0" # LATEST
2929

3030
vpc_id = module.networking.vpc_id
3131
subnet_id = module.networking.subnet_id
@@ -43,7 +43,7 @@ module "executors-codeintel" {
4343

4444
module "executors-batches" {
4545
source = "sourcegraph/executors/aws//modules/executors"
46-
version = "6.12.0" # LATEST
46+
version = "7.0.0" # LATEST
4747

4848
vpc_id = module.networking.vpc_id
4949
subnet_id = module.networking.subnet_id

examples/private-single-executor/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ locals {
55

66
module "executors" {
77
source = "sourcegraph/executors/aws"
8-
version = "6.12.0" # LATEST
8+
version = "7.0.0" # LATEST
99

1010
availability_zone = local.availability_zone
1111
executor_instance_tag = "codeintel-prod"

examples/single-executor/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Single executor example
22

3-
This example uses the [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0) that provisions a network, a Docker registry mirror, and a set of resources to run _one_ type of executor. To provision more than one type of executor (multiple queues or multiple environments), see the following `multiple-executors` example.
3+
This example uses the [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0) that provisions a network, a Docker registry mirror, and a set of resources to run _one_ type of executor. To provision more than one type of executor (multiple queues or multiple environments), see the following `multiple-executors` example.
44

55
The following variables must be supplied:
66

@@ -12,4 +12,4 @@ The following variables must be supplied:
1212
- `executor_metrics_environment_label`: The name of the target environment (e.g., `staging`, `prod`). This value must be the same as the `EXECUTOR_METRIC_ENVIRONMENT_LABEL` environment variable as described in [Configuring auto scaling](https://docs.sourcegraph.com/admin/deploy_executors#aws).
1313
- `executor_instance_tag`: Compute instances are tagged by this value by the key `executor_tag`. We recommend this value take the form `{executor_queue_name}-{executor_metrics_environment_label}`. This value must be the same as `INSTANCE_TAG` as described in [Configuring observability](https://docs.sourcegraph.com/admin/deploy_executors#aws-1).
1414

15-
All of this module's variables are defined in [variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.12.0/variables.tf).
15+
All of this module's variables are defined in [variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v7.0.0/variables.tf).

examples/single-executor/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ locals {
55

66
module "executors" {
77
source = "sourcegraph/executors/aws"
8-
version = "6.12.0" # LATEST
8+
version = "7.0.0" # LATEST
99

1010
availability_zone = local.availability_zone
1111
executor_instance_tag = "codeintel-prod"

modules/docker-mirror/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
This module provides a hosted Docker registry pull-through cache to be used by [Sourcegraph executor](https://docs.sourcegraph.com/admin/executors). It is strongly recommended to deploy a Docker mirror as a cache to reduce rate limiting by the public [Docker Hub registry](https://hub.docker.com/). We have also seen deploying a Docker mirror in the same physical zone as the executors significantly decreased latencies during image pulls.
44

5-
When using the sibling [executors module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0/submodules/executors), the `vpc_id` and `subnet_id` values must match and the executor module `docker_registry_mirror` value should match `"http://${static_ip}:5000"`.
5+
When using the sibling [executors module](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0/submodules/executors), the `vpc_id` and `subnet_id` values must match and the executor module `docker_registry_mirror` value should match `"http://${static_ip}:5000"`.

modules/docker-mirror/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ data "aws_ami" "latest_ami" {
4848

4949
filter {
5050
name = "name"
51-
values = ["sourcegraph-executors-docker-mirror-6-12-*"]
51+
values = ["sourcegraph-executors-docker-mirror-7-0-*"]
5252
}
5353

5454
filter {

modules/executors/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Executors module
22

3-
This module provides the resources to provision [Sourcegraph executor](https://docs.sourcegraph.com/admin/executors) compute resources on AWS. For a high-level overview of the resources deployed by this module, see the [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0). This module includes the following resources:
3+
This module provides the resources to provision [Sourcegraph executor](https://docs.sourcegraph.com/admin/executors) compute resources on AWS. For a high-level overview of the resources deployed by this module, see the [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0). This module includes the following resources:
44

55
- AWS launch template
66
- AWS autoscaler and autoscaling policy
@@ -10,4 +10,4 @@ This module provides the resources to provision [Sourcegraph executor](https://d
1010

1111
This module does **not** automatically create networking or Docker mirror resources. The `vpc_id`, `subnet_id`, and `docker_registry_mirror` variables must be supplied explicitly with resources that have been previously created.
1212

13-
This module is often used with the sibling modules that create [networking](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0/submodules/networking) and [Docker mirror](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.12.0/submodules/docker-mirror) resources which can be shared by multiple instances of the executor module (listening to different queues or being deployed in a different environment).
13+
This module is often used with the sibling modules that create [networking](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0/submodules/networking) and [Docker mirror](https://registry.terraform.io/modules/sourcegraph/executors/aws/7.0.0/submodules/docker-mirror) resources which can be shared by multiple instances of the executor module (listening to different queues or being deployed in a different environment).

modules/executors/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ data "aws_ami" "latest_ami" {
153153

154154
filter {
155155
name = "name"
156-
values = ["sourcegraph-executors-6-12-*"]
156+
values = ["sourcegraph-executors-7-0-*"]
157157
}
158158

159159
filter {

0 commit comments

Comments
 (0)