diff --git a/testing/cloud/variables.tf b/testing/cloud/variables.tf index fafb0c716c9..6ced0624820 100644 --- a/testing/cloud/variables.tf +++ b/testing/cloud/variables.tf @@ -7,7 +7,7 @@ variable "ess_region" { } variable "deployment_template" { - default = "gcp-compute-optimized-v3" + default = "gcp-cpu-optimized" description = "Optional deployment template. Defaults to the CPU optimized template for GCP" type = string } diff --git a/testing/infra/terraform/modules/ec_deployment/README.md b/testing/infra/terraform/modules/ec_deployment/README.md index 84e228d1682..fb2b8613cab 100644 --- a/testing/infra/terraform/modules/ec_deployment/README.md +++ b/testing/infra/terraform/modules/ec_deployment/README.md @@ -50,7 +50,7 @@ used to configure the module, please refer to the [EC Provider docs](https://reg | [apm\_server\_zone\_count](#input\_apm\_server\_zone\_count) | Optional apm server zone count | `number` | `1` | no | | [custom\_apm\_integration\_pkg\_path](#input\_custom\_apm\_integration\_pkg\_path) | Path to the zipped custom APM integration package, if empty custom apm integration pkg is not installed | `string` | `""` | no | | [deployment\_name\_prefix](#input\_deployment\_name\_prefix) | Optional ESS or ECE region. Defaults to GCP US West 2 (Los Angeles) | `string` | `"apmserver"` | no | -| [deployment\_template](#input\_deployment\_template) | Optional deployment template. Defaults to the CPU optimized template for GCP | `string` | `"gcp-compute-optimized-v3"` | no | +| [deployment\_template](#input\_deployment\_template) | Optional deployment template. Defaults to the CPU optimized template for GCP | `string` | `"gcp-cpu-optimized"` | no | | [docker\_image](#input\_docker\_image) | Optional docker image overrides. The full map needs to be specified | `map(string)` |
{| no | | [docker\_image\_tag\_override](#input\_docker\_image\_tag\_override) | Optional docker image tag overrides, The full map needs to be specified | `map(string)` |
"apm": "docker.elastic.co/cloud-release/elastic-agent-cloud",
"elasticsearch": "docker.elastic.co/cloud-release/elasticsearch-cloud-ess",
"kibana": "docker.elastic.co/cloud-release/kibana-cloud"
}
{| no | | [drop\_pipeline](#input\_drop\_pipeline) | Whether or not to install an Elasticsearch ingest pipeline to drop all incoming APM documents. Defaults to false | `bool` | `false` | no | diff --git a/testing/infra/terraform/modules/ec_deployment/variables.tf b/testing/infra/terraform/modules/ec_deployment/variables.tf index 1a0f67932e7..26d7ad04fb8 100644 --- a/testing/infra/terraform/modules/ec_deployment/variables.tf +++ b/testing/infra/terraform/modules/ec_deployment/variables.tf @@ -13,7 +13,7 @@ variable "region" { } variable "deployment_template" { - default = "gcp-compute-optimized-v3" + default = "gcp-cpu-optimized" description = "Optional deployment template. Defaults to the CPU optimized template for GCP" type = string } diff --git a/testing/rally-cloud/variables.tf b/testing/rally-cloud/variables.tf index 49517b124d2..d0f1ab3c1bd 100644 --- a/testing/rally-cloud/variables.tf +++ b/testing/rally-cloud/variables.tf @@ -7,7 +7,7 @@ variable "ess_region" { variable "deployment_template" { type = string description = "Optional deployment template. Defaults to the CPU optimized template for GCP" - default = "gcp-compute-optimized-v3" + default = "gcp-cpu-optimized" } variable "stack_version" { diff --git a/testing/smoke/main.tf b/testing/smoke/main.tf index d7586f03d59..092e323e685 100644 --- a/testing/smoke/main.tf +++ b/testing/smoke/main.tf @@ -14,7 +14,7 @@ module "ec_deployment" { source = "../../infra/terraform/modules/ec_deployment" region = var.region - deployment_template = "gcp-compute-optimized-v3" + deployment_template = "gcp-cpu-optimized" deployment_name_prefix = "smoke-upgrade" apm_server_size = "1g"
"apm": "",
"elasticsearch": "",
"kibana": ""
}