From 5f3a768a45781f0c4ab0f3fc9ed1d7fc754ad811 Mon Sep 17 00:00:00 2001 From: DanStough Date: Wed, 26 Jun 2024 13:07:19 -0400 Subject: [PATCH] build: prepare for 0.8.1 release --- .github/workflows/reusable-ecs-acceptance.yml | 2 +- .github/workflows/terraform-ci.yml | 6 +++--- CHANGELOG.md | 7 +++++++ 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 | 4 ++-- examples/locality-aware-routing/variables.tf | 6 +++--- examples/mesh-gateways/gateway/variables.tf | 2 +- examples/mesh-gateways/variables.tf | 2 +- examples/service-sameness/datacenter/variables.tf | 4 ++-- examples/service-sameness/gateway/variables.tf | 2 +- examples/service-sameness/variables.tf | 4 ++-- examples/terminating-gateway-tls/variables.tf | 4 ++-- modules/controller/variables.tf | 4 ++-- modules/dev-server/variables.tf | 4 ++-- modules/gateway-task/main.tf | 2 +- modules/gateway-task/variables.tf | 6 +++--- modules/mesh-task/main.tf | 4 ++-- modules/mesh-task/variables.tf | 6 +++--- .../acceptance/tests/basic/terraform/basic-install/main.tf | 4 ++-- test/acceptance/tests/hcp/terraform/ap-tproxy/variables.tf | 2 +- test/acceptance/tests/hcp/terraform/ap/variables.tf | 2 +- .../tests/hcp/terraform/hcp-install/variables.tf | 4 ++-- test/acceptance/tests/hcp/terraform/ns-tproxy/variables.tf | 4 ++-- test/acceptance/tests/hcp/terraform/ns/variables.tf | 4 ++-- test/acceptance/tests/tproxy/terraform/main.tf | 4 ++-- 27 files changed, 54 insertions(+), 47 deletions(-) diff --git a/.github/workflows/reusable-ecs-acceptance.yml b/.github/workflows/reusable-ecs-acceptance.yml index e2bdb4c4..e6cc2e9e 100644 --- a/.github/workflows/reusable-ecs-acceptance.yml +++ b/.github/workflows/reusable-ecs-acceptance.yml @@ -22,7 +22,7 @@ on: consul-version: required: false type: string - default: "1.18.0" + default: "1.18.2" 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 f2b31f32..c342146e 100644 --- a/.github/workflows/terraform-ci.yml +++ b/.github/workflows/terraform-ci.yml @@ -58,7 +58,7 @@ jobs: - name: acceptance-1.18-FARGATE enable-hcp: false launch-type: FARGATE - consul-version: 1.18.0 + consul-version: 1.18.2 fail-fast: false uses: ./.github/workflows/reusable-ecs-acceptance.yml with: @@ -89,7 +89,7 @@ jobs: - name: acceptance-1.18-EC2 enable-hcp: false launch-type: EC2 - consul-version: 1.18.0 + consul-version: 1.18.2 fail-fast: false uses: ./.github/workflows/reusable-ecs-acceptance.yml with: @@ -98,4 +98,4 @@ jobs: launch-type: ${{ matrix.launch-type }} enable-hcp: ${{ matrix.enable-hcp }} consul-version: ${{ matrix.consul-version }} - secrets: inherit \ No newline at end of file + secrets: inherit diff --git a/CHANGELOG.md b/CHANGELOG.md index 09a2e656..1e5792fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 0.8.1 (July 8, 2024) + +IMPROVEMENTS +* Bump Consul image to `1.18.2`[[GH-320](https://github.com/hashicorp/terraform-aws-consul-ecs/pull/320)] +* Bump Consul Dataplane image to `1.4.2` [[GH-320](https://github.com/hashicorp/terraform-aws-consul-ecs/pull/320)] +* Bump Consul ECS image to `0.8.1` [[GH-320](https://github.com/hashicorp/terraform-aws-consul-ecs/pull/320)] + ## 0.8.0 (Feb 29, 2024) BREAKING CHANGES diff --git a/examples/admin-partitions/terraform/variables.tf b/examples/admin-partitions/terraform/variables.tf index ed34b006..b73e1fe1 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 = "hashicorp/consul-ecs:0.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.4.0" + default = "hashicorp/consul-dataplane:1.4.2" } variable "client_partition" { diff --git a/examples/cluster-peering/gateway/variables.tf b/examples/cluster-peering/gateway/variables.tf index e49f051b..734aa35f 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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } diff --git a/examples/cluster-peering/variables.tf b/examples/cluster-peering/variables.tf index 13691e52..29359c36 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.8.0" + default = "hashicorp/consul-ecs:0.8.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 cef4c38e..fef2203f 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 = "hashicorp/consul-enterprise:1.18.0-ent" + default = "hashicorp/consul-enterprise:1.18.2-ent" } variable "consul_license" { @@ -67,4 +67,4 @@ variable "ecs_cluster_arn" { variable "log_group_name" { description = "Name of the CloudWatch log group where the server task's logs will be pushed to." type = string -} \ No newline at end of file +} diff --git a/examples/locality-aware-routing/variables.tf b/examples/locality-aware-routing/variables.tf index d5954376..ead66f77 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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } 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.18.0-ent" -} \ No newline at end of file + default = "hashicorp/consul-enterprise:1.18.2-ent" +} diff --git a/examples/mesh-gateways/gateway/variables.tf b/examples/mesh-gateways/gateway/variables.tf index dbb0fb1d..58b7a115 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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } diff --git a/examples/mesh-gateways/variables.tf b/examples/mesh-gateways/variables.tf index 14b26957..7813f77d 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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "consul_server_startup_timeout" { diff --git a/examples/service-sameness/datacenter/variables.tf b/examples/service-sameness/datacenter/variables.tf index 59ed1e39..4f9962d3 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.18.0-ent" + default = "public.ecr.aws/hashicorp/consul-enterprise:1.18.2-ent" } variable "consul_license" { @@ -67,4 +67,4 @@ variable "ecs_cluster_arn" { variable "log_group_name" { description = "Name of the CloudWatch log group where the server task's logs will be pushed to." type = string -} \ No newline at end of file +} diff --git a/examples/service-sameness/gateway/variables.tf b/examples/service-sameness/gateway/variables.tf index e7d4784a..7ad62429 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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "consul_server_lb_dns_name" { diff --git a/examples/service-sameness/variables.tf b/examples/service-sameness/variables.tf index dc666663..7dbd862b 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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "consul_server_startup_timeout" { @@ -56,4 +56,4 @@ variable "dc1_consul_admin_partition" { description = "The name of the admin partition that will be created in datacenter one's Consul server" type = string default = "part-1" -} \ No newline at end of file +} diff --git a/examples/terminating-gateway-tls/variables.tf b/examples/terminating-gateway-tls/variables.tf index 0c011e09..4f1e6665 100644 --- a/examples/terminating-gateway-tls/variables.tf +++ b/examples/terminating-gateway-tls/variables.tf @@ -21,7 +21,7 @@ variable "lb_ingress_ip" { variable "consul_image" { type = string description = "hashicorp consul image" - default = "hashicorp/consul:1.18.0" + default = "hashicorp/consul:1.18.2" } variable "certs_mount_path" { @@ -40,4 +40,4 @@ variable "cert_paths" { key_path = "/efs/external-app/ca.key" ca_path = "/efs/external-app/ca.cert" } -} \ No newline at end of file +} diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf index 644f3d0c..fc65d63a 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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "ecs_cluster_arn" { @@ -161,4 +161,4 @@ variable "grpc_config" { contains(["port", "tls", "tlsServerName"], key) ]) } -} \ No newline at end of file +} diff --git a/modules/dev-server/variables.tf b/modules/dev-server/variables.tf index 80d4c977..e0e8b4fb 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.18.0" + default = "hashicorp/consul:1.18.2" } variable "consul_license" { @@ -223,4 +223,4 @@ variable "consul_server_startup_timeout" { description = "The number of seconds to wait for the Consul server to become available via its ALB before continuing. The default is 300s (5m), which should be enough in most cases." type = number default = 300 -} \ No newline at end of file +} diff --git a/modules/gateway-task/main.tf b/modules/gateway-task/main.tf index 31934151..ade7a2c6 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.8.0" + version_string = "0.8.1" consul_data_volume_name = "consul_data" consul_data_mount = { diff --git a/modules/gateway-task/variables.tf b/modules/gateway-task/variables.tf index 46ee004d..ae71ee56 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.18.0" + default = "hashicorp/consul:1.18.2" } variable "consul_server_hosts" { @@ -108,13 +108,13 @@ variable "skip_server_watch" { variable "consul_ecs_image" { description = "consul-ecs Docker image." type = string - default = "hashicorp/consul-ecs:0.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.4.0" + default = "hashicorp/consul-dataplane:1.4.2" } variable "envoy_readiness_port" { diff --git a/modules/mesh-task/main.tf b/modules/mesh-task/main.tf index b00b8d27..d0d459a4 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.8.0" + version_string = "0.8.1" consul_data_volume_name = "consul_data" consul_data_mount = { @@ -317,4 +317,4 @@ resource "aws_ecs_task_definition" "this" { ) ) ) -} \ No newline at end of file +} diff --git a/modules/mesh-task/variables.tf b/modules/mesh-task/variables.tf index b624a0aa..d035d197 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 = "hashicorp/consul-ecs:0.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.4.0" + default = "hashicorp/consul-dataplane:1.4.2" } variable "envoy_public_listener_port" { @@ -509,4 +509,4 @@ variable "exclude_uids" { description = "List of additional UIDs to exclude from outbound traffic redirection." type = list(string) default = [] -} \ No newline at end of file +} diff --git a/test/acceptance/tests/basic/terraform/basic-install/main.tf b/test/acceptance/tests/basic/terraform/basic-install/main.tf index c3671f31..11e17f55 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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "server_service_name" { @@ -462,4 +462,4 @@ locals { awslogs-stream-prefix = "test_client_${var.suffix}" } } -} \ No newline at end of file +} diff --git a/test/acceptance/tests/hcp/terraform/ap-tproxy/variables.tf b/test/acceptance/tests/hcp/terraform/ap-tproxy/variables.tf index a71d6cdd..465a3ca1 100644 --- a/test/acceptance/tests/hcp/terraform/ap-tproxy/variables.tf +++ b/test/acceptance/tests/hcp/terraform/ap-tproxy/variables.tf @@ -70,7 +70,7 @@ variable "consul_image" { variable "consul_ecs_image" { description = "Consul ECS image to use." type = string - default = "hashicorp/consul-ecs:0.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "consul_server_address" { diff --git a/test/acceptance/tests/hcp/terraform/ap/variables.tf b/test/acceptance/tests/hcp/terraform/ap/variables.tf index a71d6cdd..465a3ca1 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 = "hashicorp/consul-ecs:0.8.0" + default = "hashicorp/consul-ecs:0.8.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 a8f91c71..e594a159 100644 --- a/test/acceptance/tests/hcp/terraform/hcp-install/variables.tf +++ b/test/acceptance/tests/hcp/terraform/hcp-install/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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "consul_server_address" { @@ -95,4 +95,4 @@ variable "grpc_port" { description = "Port where the server's gRPC interface is exposed" type = number default = 8502 -} \ No newline at end of file +} diff --git a/test/acceptance/tests/hcp/terraform/ns-tproxy/variables.tf b/test/acceptance/tests/hcp/terraform/ns-tproxy/variables.tf index c829c32e..18e38de0 100644 --- a/test/acceptance/tests/hcp/terraform/ns-tproxy/variables.tf +++ b/test/acceptance/tests/hcp/terraform/ns-tproxy/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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "consul_server_address" { @@ -106,4 +106,4 @@ variable "grpc_port" { description = "Port where the server's gRPC interface is exposed" type = number default = 8502 -} \ No newline at end of file +} diff --git a/test/acceptance/tests/hcp/terraform/ns/variables.tf b/test/acceptance/tests/hcp/terraform/ns/variables.tf index c829c32e..18e38de0 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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "consul_server_address" { @@ -106,4 +106,4 @@ variable "grpc_port" { description = "Port where the server's gRPC interface is exposed" type = number default = 8502 -} \ No newline at end of file +} diff --git a/test/acceptance/tests/tproxy/terraform/main.tf b/test/acceptance/tests/tproxy/terraform/main.tf index 0e88f031..85a2271f 100644 --- a/test/acceptance/tests/tproxy/terraform/main.tf +++ b/test/acceptance/tests/tproxy/terraform/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.8.0" + default = "hashicorp/consul-ecs:0.8.1" } variable "server_service_name" { @@ -426,4 +426,4 @@ locals { awslogs-stream-prefix = "test_client_${var.suffix}" } } -} \ No newline at end of file +}