diff --git a/.github/workflows/reusable-ecs-acceptance.yml b/.github/workflows/reusable-ecs-acceptance.yml index 6fd06c06..fb4ce085 100644 --- a/.github/workflows/reusable-ecs-acceptance.yml +++ b/.github/workflows/reusable-ecs-acceptance.yml @@ -19,7 +19,7 @@ on: consul-version: required: false type: string - default: "1.17.0" + default: "1.17.1" enable-hcp: description: "Whether to create a HCP cluster for running acceptance tests" required: true diff --git a/.github/workflows/terraform-ci.yml b/.github/workflows/terraform-ci.yml index f58731cb..6fc21332 100644 --- a/.github/workflows/terraform-ci.yml +++ b/.github/workflows/terraform-ci.yml @@ -94,18 +94,18 @@ jobs: # HCP is always disabled for tests on PRs. matrix: name: - - acceptance-1.16-FARGATE-HCP + - acceptance-1.17-FARGATE-HCP - acceptance-1.17-FARGATE include: - - name: acceptance-1.16-FARGATE-HCP + - name: acceptance-1.17-FARGATE-HCP enable-hcp: true launch-type: FARGATE - consul-version: 1.16.2 + consul-version: 1.17.0 - name: acceptance-1.17-FARGATE enable-hcp: false launch-type: FARGATE - consul-version: 1.17.0 + consul-version: 1.17.1 fail-fast: false uses: ./.github/workflows/reusable-ecs-acceptance.yml with: @@ -125,18 +125,18 @@ jobs: # HCP is always disabled for tests on PRs. matrix: name: - - acceptance-1.16-EC2-HCP + - acceptance-1.17-EC2-HCP - acceptance-1.17-EC2 include: - - name: acceptance-1.16-EC2-HCP + - name: acceptance-1.17-EC2-HCP enable-hcp: true launch-type: EC2 - consul-version: 1.16.2 + consul-version: 1.17.0 - name: acceptance-1.17-EC2 enable-hcp: false launch-type: EC2 - consul-version: 1.17.0 + consul-version: 1.17.1 fail-fast: false uses: ./.github/workflows/reusable-ecs-acceptance.yml with: diff --git a/examples/admin-partitions/terraform/hcp_consul.tf b/examples/admin-partitions/terraform/hcp_consul.tf index 93fd520a..1d7d665e 100644 --- a/examples/admin-partitions/terraform/hcp_consul.tf +++ b/examples/admin-partitions/terraform/hcp_consul.tf @@ -67,7 +67,7 @@ resource "hcp_consul_cluster" "this" { hvn_id = hcp_hvn.server.hvn_id tier = "development" public_endpoint = true - min_consul_version = "1.16.2" + min_consul_version = "1.17.0" } // Configure Consul resources to allow cross-partition and cross-namespace communication. diff --git a/examples/admin-partitions/terraform/variables.tf b/examples/admin-partitions/terraform/variables.tf index b62a2b4d..aed8f113 100644 --- a/examples/admin-partitions/terraform/variables.tf +++ b/examples/admin-partitions/terraform/variables.tf @@ -20,7 +20,7 @@ variable "tags" { variable "consul_ecs_image" { description = "Consul ECS image to use." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.0-dev" } variable "consul_dataplane_image" { diff --git a/examples/cluster-peering/gateway/variables.tf b/examples/cluster-peering/gateway/variables.tf index aff71c14..5ca54d5e 100644 --- a/examples/cluster-peering/gateway/variables.tf +++ b/examples/cluster-peering/gateway/variables.tf @@ -77,5 +77,5 @@ variable "additional_task_role_policies" { variable "consul_ecs_image" { description = "Consul ECS image to use in all tasks." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } diff --git a/examples/cluster-peering/variables.tf b/examples/cluster-peering/variables.tf index f17c6a2f..69a6bff3 100644 --- a/examples/cluster-peering/variables.tf +++ b/examples/cluster-peering/variables.tf @@ -31,7 +31,7 @@ variable "lb_ingress_ip" { variable "consul_ecs_image" { description = "Consul ECS image to use in all tasks." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } variable "consul_server_startup_timeout" { diff --git a/examples/locality-aware-routing/variables.tf b/examples/locality-aware-routing/variables.tf index 0e667870..1d60467a 100644 --- a/examples/locality-aware-routing/variables.tf +++ b/examples/locality-aware-routing/variables.tf @@ -26,7 +26,7 @@ variable "lb_ingress_ip" { variable "consul_ecs_image" { description = "Consul ECS image to use in all tasks." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } variable "consul_server_startup_timeout" { @@ -38,5 +38,5 @@ variable "consul_server_startup_timeout" { variable "consul_image" { description = "Consul Docker image." type = string - default = "hashicorp/consul-enterprise:1.17.0-ent" + default = "hashicorp/consul-enterprise:1.17.1-ent" } \ No newline at end of file diff --git a/examples/mesh-gateways/gateway/variables.tf b/examples/mesh-gateways/gateway/variables.tf index 6fb4d4bf..cb071d0a 100644 --- a/examples/mesh-gateways/gateway/variables.tf +++ b/examples/mesh-gateways/gateway/variables.tf @@ -83,5 +83,5 @@ variable "additional_task_role_policies" { variable "consul_ecs_image" { description = "Consul ECS image to use in all tasks." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } diff --git a/examples/mesh-gateways/variables.tf b/examples/mesh-gateways/variables.tf index eedafcde..bfe94ed5 100644 --- a/examples/mesh-gateways/variables.tf +++ b/examples/mesh-gateways/variables.tf @@ -31,7 +31,7 @@ variable "lb_ingress_ip" { variable "consul_ecs_image" { description = "Consul ECS image to use in all tasks." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } variable "consul_server_startup_timeout" { diff --git a/examples/service-sameness/datacenter/variables.tf b/examples/service-sameness/datacenter/variables.tf index 83af8cc8..47c0ebf0 100644 --- a/examples/service-sameness/datacenter/variables.tf +++ b/examples/service-sameness/datacenter/variables.tf @@ -49,7 +49,7 @@ variable "consul_server_startup_timeout" { variable "consul_image" { description = "Consul Docker image." type = string - default = "public.ecr.aws/hashicorp/consul-enterprise:1.17.0-ent" + default = "public.ecr.aws/hashicorp/consul-enterprise:1.17.1-ent" } variable "consul_license" { diff --git a/examples/service-sameness/gateway/variables.tf b/examples/service-sameness/gateway/variables.tf index 6fe7144f..5b32e769 100644 --- a/examples/service-sameness/gateway/variables.tf +++ b/examples/service-sameness/gateway/variables.tf @@ -83,7 +83,7 @@ variable "additional_task_role_policies" { variable "consul_ecs_image" { description = "Consul ECS image to use in all tasks." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } variable "consul_server_lb_dns_name" { diff --git a/examples/service-sameness/variables.tf b/examples/service-sameness/variables.tf index e4315af3..c243766b 100644 --- a/examples/service-sameness/variables.tf +++ b/examples/service-sameness/variables.tf @@ -37,7 +37,7 @@ variable "lb_ingress_ip" { variable "consul_ecs_image" { description = "Consul ECS image to use in all tasks." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } variable "consul_server_startup_timeout" { diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf index 171bbb6a..e777b9a8 100644 --- a/modules/controller/variables.tf +++ b/modules/controller/variables.tf @@ -4,7 +4,7 @@ variable "consul_ecs_image" { description = "consul-ecs Docker image." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } variable "ecs_cluster_arn" { diff --git a/modules/dev-server/variables.tf b/modules/dev-server/variables.tf index fed2c467..a83835c4 100644 --- a/modules/dev-server/variables.tf +++ b/modules/dev-server/variables.tf @@ -61,7 +61,7 @@ variable "lb_ingress_rule_security_groups" { variable "consul_image" { description = "Consul Docker image." type = string - default = "hashicorp/consul:1.17.0" + default = "hashicorp/consul:1.17.1" } variable "consul_license" { diff --git a/modules/gateway-task/main.tf b/modules/gateway-task/main.tf index df20feab..a64f89bc 100644 --- a/modules/gateway-task/main.tf +++ b/modules/gateway-task/main.tf @@ -5,7 +5,7 @@ data "aws_region" "current" {} locals { // Must be updated for each release, and after each release to return to a "-dev" version. - version_string = "0.7.0" + version_string = "0.7.1-dev" consul_data_volume_name = "consul_data" consul_data_mount = { diff --git a/modules/gateway-task/variables.tf b/modules/gateway-task/variables.tf index 97616b3a..43011ebc 100644 --- a/modules/gateway-task/variables.tf +++ b/modules/gateway-task/variables.tf @@ -91,7 +91,7 @@ variable "additional_execution_role_policies" { variable "consul_image" { description = "Consul Docker image." type = string - default = "hashicorp/consul:1.17.0" + default = "hashicorp/consul:1.17.1" } variable "consul_server_hosts" { @@ -108,7 +108,7 @@ variable "skip_server_watch" { variable "consul_ecs_image" { description = "consul-ecs Docker image." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } variable "consul_dataplane_image" { diff --git a/modules/mesh-task/main.tf b/modules/mesh-task/main.tf index df16af39..67c2ca18 100644 --- a/modules/mesh-task/main.tf +++ b/modules/mesh-task/main.tf @@ -5,7 +5,7 @@ data "aws_region" "current" {} locals { // Must be updated for each release, and after each release to return to a "-dev" version. - version_string = "0.7.0" + version_string = "0.7.1-dev" consul_data_volume_name = "consul_data" consul_data_mount = { diff --git a/modules/mesh-task/variables.tf b/modules/mesh-task/variables.tf index 06f7524b..71461641 100644 --- a/modules/mesh-task/variables.tf +++ b/modules/mesh-task/variables.tf @@ -145,7 +145,7 @@ variable "outbound_only" { variable "consul_ecs_image" { description = "consul-ecs Docker image." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } variable "consul_dataplane_image" { diff --git a/test/acceptance/tests/basic/terraform/basic-install/main.tf b/test/acceptance/tests/basic/terraform/basic-install/main.tf index a89d9c28..e2b317d6 100644 --- a/test/acceptance/tests/basic/terraform/basic-install/main.tf +++ b/test/acceptance/tests/basic/terraform/basic-install/main.tf @@ -69,7 +69,7 @@ variable "launch_type" { variable "consul_ecs_image" { description = "Consul ECS image to use." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } variable "server_service_name" { diff --git a/test/acceptance/tests/hcp/terraform/ns/variables.tf b/test/acceptance/tests/hcp/terraform/ns/variables.tf index 3502ca38..0ca54b2a 100644 --- a/test/acceptance/tests/hcp/terraform/ns/variables.tf +++ b/test/acceptance/tests/hcp/terraform/ns/variables.tf @@ -66,7 +66,7 @@ variable "consul_image" { variable "consul_ecs_image" { description = "Consul ECS image to use." type = string - default = "hashicorp/consul-ecs:0.7.0" + default = "hashicorppreview/consul-ecs:0.7.1-dev" } variable "consul_server_address" {