From f0986b479cd7d16222985de40dc7d11fe35b5b95 Mon Sep 17 00:00:00 2001 From: Ganesh S Date: Mon, 18 Dec 2023 23:04:52 +0530 Subject: [PATCH] Prep 0.7.1 release (#247) * Prep 0.7.1 release * Update changelog * Update image version * Update CHANGELOG --- CHANGELOG.md | 6 +++++- examples/admin-partitions/terraform/variables.tf | 4 ++-- examples/cluster-peering/gateway/variables.tf | 2 +- examples/cluster-peering/variables.tf | 2 +- examples/locality-aware-routing/datacenter/variables.tf | 2 +- examples/locality-aware-routing/variables.tf | 2 +- examples/mesh-gateways/gateway/variables.tf | 2 +- examples/mesh-gateways/variables.tf | 2 +- examples/service-sameness/gateway/variables.tf | 2 +- examples/service-sameness/variables.tf | 2 +- modules/controller/variables.tf | 2 +- modules/gateway-task/variables.tf | 4 ++-- modules/mesh-task/variables.tf | 4 ++-- test/acceptance/tests/basic/terraform/basic-install/main.tf | 2 +- test/acceptance/tests/hcp/terraform/ap/variables.tf | 2 +- .../acceptance/tests/hcp/terraform/hcp-install/variables.tf | 2 +- test/acceptance/tests/hcp/terraform/ns/variables.tf | 2 +- 17 files changed, 24 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 866b14ba..15aef4cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -## Unreleased +## 0.7.1 (Dec 19, 2023) + +IMPROVEMENTS +* Bump Consul ECS image version to 0.7.1 +* Bump Consul Dataplane's image version to 1.3.1 BUG FIXES * Fixes a bug in the health check logic of the `consul-ecs-control-plane` container in `mesh-task` and `gateway-task` submodule. Because of the bug, the ECS agent tries to start up the `consul-dataplane` container before the `consul-ecs-control-plane` container writes the Consul ECS binary to a shared volume. [[GH-241]](https://github.com/hashicorp/terraform-aws-consul-ecs/pull/241) diff --git a/examples/admin-partitions/terraform/variables.tf b/examples/admin-partitions/terraform/variables.tf index ee54e552..8d425531 100644 --- a/examples/admin-partitions/terraform/variables.tf +++ b/examples/admin-partitions/terraform/variables.tf @@ -20,13 +20,13 @@ variable "tags" { variable "consul_ecs_image" { description = "Consul ECS image to use." type = string - default = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.3.0" + default = "hashicorp/consul-dataplane:1.3.1" } variable "client_partition" { diff --git a/examples/cluster-peering/gateway/variables.tf b/examples/cluster-peering/gateway/variables.tf index de71aab6..a9bb2dfa 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 = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } diff --git a/examples/cluster-peering/variables.tf b/examples/cluster-peering/variables.tf index b4db89ab..07c3ab2c 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 = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "consul_server_startup_timeout" { diff --git a/examples/locality-aware-routing/datacenter/variables.tf b/examples/locality-aware-routing/datacenter/variables.tf index 22f764f5..92447f27 100644 --- a/examples/locality-aware-routing/datacenter/variables.tf +++ b/examples/locality-aware-routing/datacenter/variables.tf @@ -49,7 +49,7 @@ variable "consul_server_startup_timeout" { variable "consul_image" { description = "Consul Docker image." type = string - default = "hashicorppreview/consul-enterprise:1.17-dev" + default = "hashicorp/consul-enterprise:1.17.1-ent" } variable "consul_license" { diff --git a/examples/locality-aware-routing/variables.tf b/examples/locality-aware-routing/variables.tf index 19227471..d0e718d9 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 = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "consul_server_startup_timeout" { diff --git a/examples/mesh-gateways/gateway/variables.tf b/examples/mesh-gateways/gateway/variables.tf index dffa1e16..00a0976a 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 = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } diff --git a/examples/mesh-gateways/variables.tf b/examples/mesh-gateways/variables.tf index 1388e486..b8c0ce21 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.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "consul_server_startup_timeout" { diff --git a/examples/service-sameness/gateway/variables.tf b/examples/service-sameness/gateway/variables.tf index 4c16a906..c9b696b2 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 = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "consul_server_lb_dns_name" { diff --git a/examples/service-sameness/variables.tf b/examples/service-sameness/variables.tf index 54d5a9da..7efb53bf 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 = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "consul_server_startup_timeout" { diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf index a7ccd1e1..86aa8496 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 = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "ecs_cluster_arn" { diff --git a/modules/gateway-task/variables.tf b/modules/gateway-task/variables.tf index 1159ca91..7d225cb0 100644 --- a/modules/gateway-task/variables.tf +++ b/modules/gateway-task/variables.tf @@ -108,13 +108,13 @@ variable "skip_server_watch" { variable "consul_ecs_image" { description = "consul-ecs Docker image." type = string - default = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.3.0" + default = "hashicorp/consul-dataplane:1.3.1" } variable "envoy_readiness_port" { diff --git a/modules/mesh-task/variables.tf b/modules/mesh-task/variables.tf index 4c2c8bf5..b6f13194 100644 --- a/modules/mesh-task/variables.tf +++ b/modules/mesh-task/variables.tf @@ -145,13 +145,13 @@ variable "outbound_only" { variable "consul_ecs_image" { description = "consul-ecs Docker image." type = string - default = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.3.0" + default = "hashicorp/consul-dataplane:1.3.1" } variable "envoy_public_listener_port" { diff --git a/test/acceptance/tests/basic/terraform/basic-install/main.tf b/test/acceptance/tests/basic/terraform/basic-install/main.tf index 25228462..947eace6 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 = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } 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 e3aeed96..9c89f732 100644 --- a/test/acceptance/tests/hcp/terraform/ap/variables.tf +++ b/test/acceptance/tests/hcp/terraform/ap/variables.tf @@ -70,7 +70,7 @@ variable "consul_image" { variable "consul_ecs_image" { description = "Consul ECS image to use." type = string - default = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "consul_server_address" { diff --git a/test/acceptance/tests/hcp/terraform/hcp-install/variables.tf b/test/acceptance/tests/hcp/terraform/hcp-install/variables.tf index bb21f7c6..cf231842 100644 --- a/test/acceptance/tests/hcp/terraform/hcp-install/variables.tf +++ b/test/acceptance/tests/hcp/terraform/hcp-install/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.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "consul_server_address" { diff --git a/test/acceptance/tests/hcp/terraform/ns/variables.tf b/test/acceptance/tests/hcp/terraform/ns/variables.tf index 8a98f0ac..51325370 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 = "hashicorppreview/consul-ecs:0.7.1" + default = "hashicorp/consul-ecs:0.7.1" } variable "consul_server_address" {