diff --git a/.github/workflows/terraform-ci.yml b/.github/workflows/terraform-ci.yml index 82f72479..cbd1aadd 100644 --- a/.github/workflows/terraform-ci.yml +++ b/.github/workflows/terraform-ci.yml @@ -99,7 +99,7 @@ jobs: - acceptance-1.15-EC2 include: - name: acceptance-1.15-FARGATE-HCP - consul-version: '1.15.10' + consul-version: '1.15.9' enable-hcp: true launch-type: FARGATE @@ -157,7 +157,7 @@ jobs: - acceptance-1.13-FARGATE include: - name: acceptance-1.13-EC2-HCP - consul-version: '1.13.8' + consul-version: '1.13.9' enable-hcp: true launch-type: EC2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d7b3aad..19b9da5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.6.2 (Feb 16, 2024) + +IMPROVEMENTS +* Bump Consul image to `1.15.10`[[GH-289](https://github.com/hashicorp/terraform-aws-consul-ecs/pull/289)] +* Bump Consul ECS image to `0.6.2` [[GH-292](https://github.com/hashicorp/terraform-aws-consul-ecs/pull/292)] + ## 0.6.1 (Aug 1, 2023) IMPROVEMENTS diff --git a/examples/admin-partitions/terraform/variables.tf b/examples/admin-partitions/terraform/variables.tf index a40066a7..24ba7784 100644 --- a/examples/admin-partitions/terraform/variables.tf +++ b/examples/admin-partitions/terraform/variables.tf @@ -21,7 +21,7 @@ variable "consul_image" { variable "consul_ecs_image" { description = "Consul ECS image to use." type = string - default = "hashicorppreview/consul-ecs:0.6.2" + default = "hashicorp/consul-ecs:0.6.2" } variable "client_partition" { diff --git a/examples/mesh-gateways/gateway/variables.tf b/examples/mesh-gateways/gateway/variables.tf index e40874c5..badcbea4 100644 --- a/examples/mesh-gateways/gateway/variables.tf +++ b/examples/mesh-gateways/gateway/variables.tf @@ -111,5 +111,5 @@ variable "additional_task_role_policies" { variable "consul_ecs_image" { description = "Consul ECS image to use in all tasks." type = string - default = "hashicorppreview/consul-ecs:0.6.2" + default = "hashicorp/consul-ecs:0.6.2" } diff --git a/examples/mesh-gateways/variables.tf b/examples/mesh-gateways/variables.tf index 8a700e71..90d62f02 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 = "hashicorppreview/consul-ecs:0.6.2" + default = "hashicorp/consul-ecs:0.6.2" } variable "consul_server_startup_timeout" { diff --git a/modules/acl-controller/variables.tf b/modules/acl-controller/variables.tf index 4e61c4a7..a3dbab46 100644 --- a/modules/acl-controller/variables.tf +++ b/modules/acl-controller/variables.tf @@ -4,7 +4,7 @@ variable "consul_ecs_image" { description = "consul-ecs Docker image." type = string - default = "hashicorppreview/consul-ecs:0.6.2" + default = "hashicorp/consul-ecs:0.6.2" } variable "ecs_cluster_arn" { diff --git a/modules/gateway-task/main.tf b/modules/gateway-task/main.tf index 6c07618e..0f6780db 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.6.2-dev" + version_string = "0.6.2" gossip_encryption_enabled = var.gossip_key_secret_arn != "" consul_data_volume_name = "consul_data" diff --git a/modules/gateway-task/variables.tf b/modules/gateway-task/variables.tf index b4495ba9..7391212e 100644 --- a/modules/gateway-task/variables.tf +++ b/modules/gateway-task/variables.tf @@ -91,7 +91,7 @@ variable "consul_image" { variable "consul_ecs_image" { description = "consul-ecs Docker image." type = string - default = "hashicorppreview/consul-ecs:0.6.2" + default = "hashicorp/consul-ecs:0.6.2" } variable "envoy_image" { diff --git a/modules/mesh-task/main.tf b/modules/mesh-task/main.tf index 203badae..84b92d0b 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.6.2-dev" + version_string = "0.6.2" gossip_encryption_enabled = var.gossip_key_secret_arn != "" consul_data_volume_name = "consul_data" diff --git a/modules/mesh-task/variables.tf b/modules/mesh-task/variables.tf index c2e91b92..6fce60df 100644 --- a/modules/mesh-task/variables.tf +++ b/modules/mesh-task/variables.tf @@ -145,7 +145,7 @@ variable "consul_image" { variable "consul_ecs_image" { description = "consul-ecs Docker image." type = string - default = "hashicorppreview/consul-ecs:0.6.2" + default = "hashicorp/consul-ecs:0.6.2" } variable "envoy_image" { diff --git a/test/acceptance/tests/basic/terraform/basic-install/main.tf b/test/acceptance/tests/basic/terraform/basic-install/main.tf index ee7e04a7..f636467b 100644 --- a/test/acceptance/tests/basic/terraform/basic-install/main.tf +++ b/test/acceptance/tests/basic/terraform/basic-install/main.tf @@ -64,7 +64,7 @@ variable "launch_type" { variable "consul_ecs_image" { description = "Consul ECS image to use." type = string - default = "hashicorppreview/consul-ecs:0.6.2" + default = "hashicorp/consul-ecs:0.6.2" } variable "server_service_name" { diff --git a/test/acceptance/tests/hcp/terraform/ap/variables.tf b/test/acceptance/tests/hcp/terraform/ap/variables.tf index de7be824..2dc5f627 100644 --- a/test/acceptance/tests/hcp/terraform/ap/variables.tf +++ b/test/acceptance/tests/hcp/terraform/ap/variables.tf @@ -65,7 +65,7 @@ variable "consul_image" { variable "consul_ecs_image" { description = "Consul ECS image to use." type = string - default = "hashicorppreview/consul-ecs:0.6.2" + default = "hashicorp/consul-ecs:0.6.2" } variable "consul_public_endpoint_url" { diff --git a/test/acceptance/tests/hcp/terraform/hcp-install/variables.tf b/test/acceptance/tests/hcp/terraform/hcp-install/variables.tf index 1921582a..1a275b9d 100644 --- a/test/acceptance/tests/hcp/terraform/hcp-install/variables.tf +++ b/test/acceptance/tests/hcp/terraform/hcp-install/variables.tf @@ -61,7 +61,7 @@ variable "consul_image" { variable "consul_ecs_image" { description = "Consul ECS image to use." type = string - default = "hashicorppreview/consul-ecs:0.6.2" + default = "hashicorp/consul-ecs:0.6.2" } variable "consul_public_endpoint_url" { diff --git a/test/acceptance/tests/hcp/terraform/ns/variables.tf b/test/acceptance/tests/hcp/terraform/ns/variables.tf index c49fb281..c04c4534 100644 --- a/test/acceptance/tests/hcp/terraform/ns/variables.tf +++ b/test/acceptance/tests/hcp/terraform/ns/variables.tf @@ -61,7 +61,7 @@ variable "consul_image" { variable "consul_ecs_image" { description = "Consul ECS image to use." type = string - default = "hashicorppreview/consul-ecs:0.6.2" + default = "hashicorp/consul-ecs:0.6.2" } variable "consul_public_endpoint_url" {