diff --git a/.github/workflows/reusable-ecs-acceptance.yml b/.github/workflows/reusable-ecs-acceptance.yml index 1967a56b..e2bdb4c4 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.17.0" + default: "1.18.0" 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 57363060..b131d502 100644 --- a/.github/workflows/terraform-ci.yml +++ b/.github/workflows/terraform-ci.yml @@ -48,13 +48,14 @@ jobs: matrix: name: - acceptance-1.17-FARGATE-HCP - - acceptance-1.17-FARGATE + - acceptance-1.18-FARGATE include: - name: acceptance-1.17-FARGATE-HCP enable-hcp: true launch-type: FARGATE + consul-version: 1.17.1 - - name: acceptance-1.17-FARGATE + - name: acceptance-1.18-FARGATE enable-hcp: false launch-type: FARGATE fail-fast: false @@ -76,13 +77,14 @@ jobs: matrix: name: - acceptance-1.17-EC2-HCP - - acceptance-1.17-EC2 + - acceptance-1.18-EC2 include: - name: acceptance-1.17-EC2-HCP enable-hcp: true launch-type: EC2 + consul-version: 1.17.1 - - name: acceptance-1.17-EC2 + - name: acceptance-1.18-EC2 enable-hcp: false launch-type: EC2 fail-fast: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 83994ecb..09a2e656 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Unreleased +## 0.8.0 (Feb 29, 2024) BREAKING CHANGES * Following are the changes made to the task definitions for `mesh-task` and `gateway-task` submodules to react to the changes made in [this](https://github.com/hashicorp/consul-ecs/pull/211) PR. diff --git a/examples/admin-partitions/terraform/variables.tf b/examples/admin-partitions/terraform/variables.tf index 4cbbf1ea..ed34b006 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorppreview/consul-dataplane:1.4.0-dev" + default = "hashicorp/consul-dataplane:1.4.0" } variable "client_partition" { diff --git a/examples/cluster-peering/gateway/variables.tf b/examples/cluster-peering/gateway/variables.tf index 33ddbe5e..e49f051b 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } diff --git a/examples/cluster-peering/variables.tf b/examples/cluster-peering/variables.tf index fdb90869..13691e52 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } 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..cef4c38e 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.18.0-ent" } variable "consul_license" { diff --git a/examples/locality-aware-routing/variables.tf b/examples/locality-aware-routing/variables.tf index c283a5b4..d5954376 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } 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.18.0-ent" } \ No newline at end of file diff --git a/examples/mesh-gateways/gateway/variables.tf b/examples/mesh-gateways/gateway/variables.tf index f34e729d..dbb0fb1d 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } diff --git a/examples/mesh-gateways/variables.tf b/examples/mesh-gateways/variables.tf index 664e7443..14b26957 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } variable "consul_server_startup_timeout" { diff --git a/examples/service-sameness/datacenter/variables.tf b/examples/service-sameness/datacenter/variables.tf index 83af8cc8..59ed1e39 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.18.0-ent" } variable "consul_license" { diff --git a/examples/service-sameness/gateway/variables.tf b/examples/service-sameness/gateway/variables.tf index c274c395..e7d4784a 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } variable "consul_server_lb_dns_name" { diff --git a/examples/service-sameness/variables.tf b/examples/service-sameness/variables.tf index 3d4777d0..dc666663 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } variable "consul_server_startup_timeout" { diff --git a/examples/terminating-gateway-tls/variables.tf b/examples/terminating-gateway-tls/variables.tf index 3627d654..0c011e09 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.17.1" + default = "hashicorp/consul:1.18.0" } variable "certs_mount_path" { diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf index 54b1e0a2..644f3d0c 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } variable "ecs_cluster_arn" { diff --git a/modules/dev-server/variables.tf b/modules/dev-server/variables.tf index fed2c467..80d4c977 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.18.0" } variable "consul_license" { diff --git a/modules/gateway-task/main.tf b/modules/gateway-task/main.tf index db552a14..31934151 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-dev" + version_string = "0.8.0" consul_data_volume_name = "consul_data" consul_data_mount = { diff --git a/modules/gateway-task/variables.tf b/modules/gateway-task/variables.tf index ff1de19d..46ee004d 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.18.0" } variable "consul_server_hosts" { @@ -108,13 +108,13 @@ variable "skip_server_watch" { variable "consul_ecs_image" { description = "consul-ecs Docker image." type = string - default = "hashicorppreview/consul-ecs:0.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorppreview/consul-dataplane:1.4.0-dev" + default = "hashicorp/consul-dataplane:1.4.0" } variable "envoy_readiness_port" { diff --git a/modules/mesh-task/main.tf b/modules/mesh-task/main.tf index 9f8b5532..b00b8d27 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-dev" + version_string = "0.8.0" consul_data_volume_name = "consul_data" consul_data_mount = { diff --git a/modules/mesh-task/variables.tf b/modules/mesh-task/variables.tf index 121636ad..b624a0aa 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorppreview/consul-dataplane:1.4.0-dev" + default = "hashicorp/consul-dataplane:1.4.0" } 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 2a998522..c3671f31 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } variable "server_service_name" { diff --git a/test/acceptance/tests/hcp/terraform/ap-tproxy/variables.tf b/test/acceptance/tests/hcp/terraform/ap-tproxy/variables.tf index aefc534e..a71d6cdd 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 = "hashicorppreview/consul-ecs:0.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } 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 aefc534e..a71d6cdd 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } 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 ed9c5526..a8f91c71 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 = "hashicorppreview/consul-ecs:0.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } variable "consul_server_address" { diff --git a/test/acceptance/tests/hcp/terraform/ns-tproxy/variables.tf b/test/acceptance/tests/hcp/terraform/ns-tproxy/variables.tf index c2c9c4e6..c829c32e 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 = "hashicorppreview/consul-ecs:0.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } 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 c2c9c4e6..c829c32e 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.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } variable "consul_server_address" { diff --git a/test/acceptance/tests/tproxy/terraform/main.tf b/test/acceptance/tests/tproxy/terraform/main.tf index da749fa3..0e88f031 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 = "hashicorppreview/consul-ecs:0.8.0-dev" + default = "hashicorp/consul-ecs:0.8.0" } variable "server_service_name" {