Skip to content

Commit da10c43

Browse files
release_minor: v7.2.0
{"version":"v7.2.0","inputs":"server=7.2.0","type":"minor"} Amp-Thread-ID: https://ampcode.com/threads/T-019dbdc1-2492-72dd-97a8-9b18c9c7e231 Co-authored-by: Amp <amp@ampcode.com>
1 parent 3f4b1c4 commit da10c43

11 files changed

Lines changed: 23 additions & 23 deletions

File tree

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ 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/google/6.12.0/submodules/executors) provisions compute resources for executors.
10-
2. The [docker-mirror module](https://registry.terraform.io/modules/sourcegraph/executors/google/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/google/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/google/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/google/7.2.0/submodules/executors) provisions compute resources for executors.
10+
2. The [docker-mirror module](https://registry.terraform.io/modules/sourcegraph/executors/google/7.2.0/submodules/docker-mirror) provisions a Docker registry pull-through cache.
11+
3. The [networking module](https://registry.terraform.io/modules/sourcegraph/executors/google/7.2.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/google/7.2.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-google-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-google-executors/blob/v7.2.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
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
1616
2. Provisioning resources for multiple Sourcegraph instances (e.g., test, prod)
1717

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

20-
The [single-executor example](https://github.com/sourcegraph/terraform-google-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.
20+
The [single-executor example](https://github.com/sourcegraph/terraform-google-executors/blob/v7.2.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.
2121

2222
## Requirements
2323

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/google/6.12.0/submodules/networking), [docker-mirror](https://registry.terraform.io/modules/sourcegraph/executors/google/6.12.0/submodules/docker-mirror), and [executors](https://registry.terraform.io/modules/sourcegraph/executors/google/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/google/7.2.0/submodules/networking), [docker-mirror](https://registry.terraform.io/modules/sourcegraph/executors/google/7.2.0/submodules/docker-mirror), and [executors](https://registry.terraform.io/modules/sourcegraph/executors/google/7.2.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 network and subnetwork 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-google-executors/blob/v6.12.0/modules/networking/variables.tf), [modules/docker-mirror/variables.tf](https://github.com/sourcegraph/terraform-google-executors/blob/v6.12.0/modules/docker-mirror/variables.tf), and [modules/executors/variables.tf](https://github.com/sourcegraph/terraform-google-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-google-executors/blob/v7.2.0/modules/networking/variables.tf), [modules/docker-mirror/variables.tf](https://github.com/sourcegraph/terraform-google-executors/blob/v7.2.0/modules/docker-mirror/variables.tf), and [modules/executors/variables.tf](https://github.com/sourcegraph/terraform-google-executors/blob/v7.2.0/modules/executors/variables.tf).

examples/multiple-executors/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module "networking" {
22
source = "sourcegraph/executors/google//modules/networking"
3-
version = "6.12.0" # LATEST
3+
version = "7.2.0" # LATEST
44

55
region = local.region
66
}
77

88
module "docker-mirror" {
99
source = "sourcegraph/executors/google//modules/docker-mirror"
10-
version = "6.12.0" # LATEST
10+
version = "7.2.0" # LATEST
1111

1212
zone = local.zone
1313
network_id = module.networking.network_id
@@ -17,7 +17,7 @@ module "docker-mirror" {
1717

1818
module "executors-codeintel" {
1919
source = "sourcegraph/executors/google//modules/executors"
20-
version = "6.12.0" # LATEST
20+
version = "7.2.0" # LATEST
2121

2222
zone = local.zone
2323
network_id = module.networking.network_id
@@ -35,7 +35,7 @@ module "executors-codeintel" {
3535

3636
module "executors-batches" {
3737
source = "sourcegraph/executors/google//modules/executors"
38-
version = "6.12.0" # LATEST
38+
version = "7.2.0" # LATEST
3939

4040
zone = local.zone
4141
network_id = module.networking.network_id

examples/private-single-executor/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "executors" {
22
source = "sourcegraph/executors/google"
3-
version = "6.12.0" # LATEST
3+
version = "7.2.0" # LATEST
44

55
region = local.region
66
zone = local.zone

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/google/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/google/7.2.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#google).
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#google-1).
1414

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

examples/single-executor/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "executors" {
22
source = "sourcegraph/executors/google"
3-
version = "6.12.0" # LATEST
3+
version = "7.2.0" # LATEST
44

55
region = local.region
66
zone = local.zone

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/google/6.12.0/submodules/executors), the `network_id` and `subnet_id` values must match and the executor module `docker_registry_mirror` value should match `"http://${ip_address}:5000"` (where `ip_address` is this module's output).
5+
When using the sibling [executors module](https://registry.terraform.io/modules/sourcegraph/executors/google/7.2.0/submodules/executors), the `network_id` and `subnet_id` values must match and the executor module `docker_registry_mirror` value should match `"http://${ip_address}:5000"` (where `ip_address` is this module's output).

modules/docker-mirror/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ resource "google_compute_disk" "registry-data" {
4848
data "google_compute_image" "mirror_image" {
4949
count = var.machine_image != "" ? 0 : 1
5050
project = "sourcegraph-ci"
51-
family = "sourcegraph-executors-docker-mirror-6-12"
51+
family = "sourcegraph-executors-docker-mirror-7-2"
5252
}
5353

5454
resource "random_id" "compute_instance_default" {

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 Google Cloud. For a high-level overview of the resources deployed by this module, see the [root module](https://registry.terraform.io/modules/sourcegraph/executors/google/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 Google Cloud. For a high-level overview of the resources deployed by this module, see the [root module](https://registry.terraform.io/modules/sourcegraph/executors/google/7.2.0). This module includes the following resources:
44

55
- Google compute instance template
66
- Google compute group manager, and auto-scaler
@@ -9,4 +9,4 @@ This module provides the resources to provision [Sourcegraph executor](https://d
99

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

12-
This module is often used with the sibling modules that create [networking](https://registry.terraform.io/modules/sourcegraph/executors/google/6.12.0/submodules/networking) and [Docker mirror](https://registry.terraform.io/modules/sourcegraph/executors/google/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).
12+
This module is often used with the sibling modules that create [networking](https://registry.terraform.io/modules/sourcegraph/executors/google/7.2.0/submodules/networking) and [Docker mirror](https://registry.terraform.io/modules/sourcegraph/executors/google/7.2.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
@@ -67,7 +67,7 @@ resource "google_project_iam_member" "service_account_iam_metric_writer" {
6767
data "google_compute_image" "executor_image" {
6868
count = var.machine_image != "" ? 0 : 1
6969
project = "sourcegraph-ci"
70-
family = "sourcegraph-executors-6-12"
70+
family = "sourcegraph-executors-7-2"
7171
}
7272

7373
resource "random_id" "compute_instance_network_tag" {

0 commit comments

Comments
 (0)