From 3d0a2a4da593948bf39a86c225cf0d79d3d0e9b8 Mon Sep 17 00:00:00 2001 From: Ganeshrockz Date: Thu, 15 Feb 2024 22:22:25 +0530 Subject: [PATCH 1/2] Prepare 0.7.3-dev release --- .github/workflows/reusable-ecs-acceptance.yml | 2 +- .github/workflows/terraform-ci.yml | 8 ++++---- 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 | 4 ++-- examples/mesh-gateways/gateway/variables.tf | 2 +- examples/mesh-gateways/variables.tf | 2 +- examples/service-sameness/datacenter/variables.tf | 2 +- examples/service-sameness/gateway/variables.tf | 2 +- examples/service-sameness/variables.tf | 2 +- modules/controller/variables.tf | 2 +- modules/dev-server/variables.tf | 2 +- modules/gateway-task/variables.tf | 6 +++--- modules/mesh-task/variables.tf | 4 ++-- .../tests/basic/terraform/basic-install/main.tf | 2 +- test/acceptance/tests/hcp/terraform/ap/variables.tf | 2 +- .../tests/hcp/terraform/hcp-install/variables.tf | 2 +- test/acceptance/tests/hcp/terraform/ns/variables.tf | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/reusable-ecs-acceptance.yml b/.github/workflows/reusable-ecs-acceptance.yml index fb4ce085..6ba96d31 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.1" + default: "1.17.3" 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 6fc21332..3382335e 100644 --- a/.github/workflows/terraform-ci.yml +++ b/.github/workflows/terraform-ci.yml @@ -100,12 +100,12 @@ jobs: - name: acceptance-1.17-FARGATE-HCP enable-hcp: true launch-type: FARGATE - consul-version: 1.17.0 + consul-version: 1.17.2 - name: acceptance-1.17-FARGATE enable-hcp: false launch-type: FARGATE - consul-version: 1.17.1 + consul-version: 1.17.3 fail-fast: false uses: ./.github/workflows/reusable-ecs-acceptance.yml with: @@ -131,12 +131,12 @@ jobs: - name: acceptance-1.17-EC2-HCP enable-hcp: true launch-type: EC2 - consul-version: 1.17.0 + consul-version: 1.17.2 - name: acceptance-1.17-EC2 enable-hcp: false launch-type: EC2 - consul-version: 1.17.1 + consul-version: 1.17.3 fail-fast: false uses: ./.github/workflows/reusable-ecs-acceptance.yml with: diff --git a/examples/admin-partitions/terraform/variables.tf b/examples/admin-partitions/terraform/variables.tf index 9c94f011..03004128 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.7.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.3.2" + default = "hashicorp/consul-dataplane:1.3.3" } variable "client_partition" { diff --git a/examples/cluster-peering/gateway/variables.tf b/examples/cluster-peering/gateway/variables.tf index cd2e2e83..17b634c4 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.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } diff --git a/examples/cluster-peering/variables.tf b/examples/cluster-peering/variables.tf index 1d883430..d5159e02 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.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } variable "consul_server_startup_timeout" { diff --git a/examples/locality-aware-routing/datacenter/variables.tf b/examples/locality-aware-routing/datacenter/variables.tf index 92447f27..5d9a0f79 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.17.1-ent" + default = "hashicorp/consul-enterprise:1.17.3-ent" } variable "consul_license" { diff --git a/examples/locality-aware-routing/variables.tf b/examples/locality-aware-routing/variables.tf index bb481383..e60bdb96 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.2" + default = "hashicorppreview/consul-ecs:0.7.3-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.1-ent" + default = "hashicorp/consul-enterprise:1.17.3-ent" } \ No newline at end of file diff --git a/examples/mesh-gateways/gateway/variables.tf b/examples/mesh-gateways/gateway/variables.tf index f7e40864..26287c8f 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.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } diff --git a/examples/mesh-gateways/variables.tf b/examples/mesh-gateways/variables.tf index 40770b0b..0178e4d2 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.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } variable "consul_server_startup_timeout" { diff --git a/examples/service-sameness/datacenter/variables.tf b/examples/service-sameness/datacenter/variables.tf index ea513dc4..9ee04fe4 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.2-ent" + default = "public.ecr.aws/hashicorp/consul-enterprise:1.17.3-ent" } variable "consul_license" { diff --git a/examples/service-sameness/gateway/variables.tf b/examples/service-sameness/gateway/variables.tf index 44e46b86..caae791f 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.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } variable "consul_server_lb_dns_name" { diff --git a/examples/service-sameness/variables.tf b/examples/service-sameness/variables.tf index 1773dbee..64e11ab4 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.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } variable "consul_server_startup_timeout" { diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf index 2b0ed21b..13391afe 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.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } variable "ecs_cluster_arn" { diff --git a/modules/dev-server/variables.tf b/modules/dev-server/variables.tf index 6a4a8aa7..46899d87 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.2" + default = "hashicorp/consul:1.17.3" } variable "consul_license" { diff --git a/modules/gateway-task/variables.tf b/modules/gateway-task/variables.tf index 32746d23..f674aabb 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.2" + default = "hashicorp/consul:1.17.3" } 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.7.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.3.2" + default = "hashicorp/consul-dataplane:1.3.3" } variable "envoy_readiness_port" { diff --git a/modules/mesh-task/variables.tf b/modules/mesh-task/variables.tf index e74e4b29..5e900fba 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.7.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.3.2" + default = "hashicorp/consul-dataplane:1.3.3" } 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 6688fedc..41c78e23 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.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } 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 9d5ed6cd..51e2463d 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.7.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } 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 e1cabbbf..27b53ad5 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 = "hashicorp/consul-ecs:0.7.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } 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 25e4eff8..b32ea0a7 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.2" + default = "hashicorppreview/consul-ecs:0.7.3-dev" } variable "consul_server_address" { From 284c8b6f53ec8f3088e8a3b0d3ed38a5c994612c Mon Sep 17 00:00:00 2001 From: Ganeshrockz Date: Thu, 15 Feb 2024 22:24:23 +0530 Subject: [PATCH 2/2] Update ECS version --- examples/admin-partitions/terraform/variables.tf | 2 +- examples/cluster-peering/gateway/variables.tf | 2 +- examples/cluster-peering/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 | 2 +- modules/mesh-task/variables.tf | 2 +- test/acceptance/tests/basic/terraform/basic-install/main.tf | 2 +- test/acceptance/tests/hcp/terraform/ap/variables.tf | 2 +- test/acceptance/tests/hcp/terraform/hcp-install/variables.tf | 2 +- test/acceptance/tests/hcp/terraform/ns/variables.tf | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/admin-partitions/terraform/variables.tf b/examples/admin-partitions/terraform/variables.tf index 03004128..3bf76815 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 = "hashicorppreview/consul-ecs:0.7.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } variable "consul_dataplane_image" { diff --git a/examples/cluster-peering/gateway/variables.tf b/examples/cluster-peering/gateway/variables.tf index 17b634c4..3f35298c 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } diff --git a/examples/cluster-peering/variables.tf b/examples/cluster-peering/variables.tf index d5159e02..97b161b5 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } variable "consul_server_startup_timeout" { diff --git a/examples/locality-aware-routing/variables.tf b/examples/locality-aware-routing/variables.tf index e60bdb96..99ce5a39 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } variable "consul_server_startup_timeout" { diff --git a/examples/mesh-gateways/gateway/variables.tf b/examples/mesh-gateways/gateway/variables.tf index 26287c8f..1f7c9440 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } diff --git a/examples/mesh-gateways/variables.tf b/examples/mesh-gateways/variables.tf index 0178e4d2..629bf7bf 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } variable "consul_server_startup_timeout" { diff --git a/examples/service-sameness/gateway/variables.tf b/examples/service-sameness/gateway/variables.tf index caae791f..dee3ea57 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } variable "consul_server_lb_dns_name" { diff --git a/examples/service-sameness/variables.tf b/examples/service-sameness/variables.tf index 64e11ab4..adba96a2 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } variable "consul_server_startup_timeout" { diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf index 13391afe..e018d10b 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } variable "ecs_cluster_arn" { diff --git a/modules/gateway-task/variables.tf b/modules/gateway-task/variables.tf index f674aabb..ac240f53 100644 --- a/modules/gateway-task/variables.tf +++ b/modules/gateway-task/variables.tf @@ -108,7 +108,7 @@ variable "skip_server_watch" { variable "consul_ecs_image" { description = "consul-ecs Docker image." type = string - default = "hashicorppreview/consul-ecs:0.7.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } variable "consul_dataplane_image" { diff --git a/modules/mesh-task/variables.tf b/modules/mesh-task/variables.tf index 5e900fba..32b2e03d 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 = "hashicorppreview/consul-ecs:0.7.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } 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 41c78e23..32fdaf01 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } 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 51e2463d..af77449e 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } 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 27b53ad5..67572390 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } 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 b32ea0a7..abfe3e22 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.3-dev" + default = "hashicorppreview/consul-ecs:0.7.3" } variable "consul_server_address" {