From 35787d5942aca15b5cb24fbbb1b500f282d31f97 Mon Sep 17 00:00:00 2001 From: Ganeshrockz Date: Wed, 8 Nov 2023 10:47:44 +0530 Subject: [PATCH] Prep release 0.7.0 --- .github/workflows/reusable-ecs-acceptance.yml | 2 +- .github/workflows/terraform-ci.yml | 16 ++++++++-------- examples/admin-partitions/terraform/variables.tf | 4 ++-- examples/cluster-peering/gateway/variables.tf | 2 +- examples/cluster-peering/variables.tf | 2 +- examples/locality-aware-routing/variables.tf | 4 ++-- examples/mesh-gateways/gateway/variables.tf | 2 +- examples/mesh-gateways/variables.tf | 2 +- .../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 +- .../tests/hcp/terraform/ap/variables.tf | 2 +- .../tests/hcp/terraform/hcp-install/variables.tf | 2 +- .../tests/hcp/terraform/ns/variables.tf | 2 +- 19 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/reusable-ecs-acceptance.yml b/.github/workflows/reusable-ecs-acceptance.yml index 0f59c3f3..6fd06c06 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.16.2" + default: "1.17.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 e9a5989d..cac7b3aa 100644 --- a/.github/workflows/terraform-ci.yml +++ b/.github/workflows/terraform-ci.yml @@ -94,14 +94,14 @@ jobs: # HCP is always disabled for tests on PRs. matrix: name: - - acceptance-1.16-FARGATE-HCP - - acceptance-1.16-FARGATE + - acceptance-1.17-FARGATE-HCP + - acceptance-1.17-FARGATE include: - - name: acceptance-1.16-FARGATE-HCP + - name: acceptance-1.17-FARGATE-HCP enable-hcp: true launch-type: FARGATE - - name: acceptance-1.16-FARGATE + - name: acceptance-1.17-FARGATE enable-hcp: false launch-type: FARGATE fail-fast: false @@ -122,14 +122,14 @@ jobs: # HCP is always disabled for tests on PRs. matrix: name: - - acceptance-1.16-EC2-HCP - - acceptance-1.16-EC2 + - acceptance-1.17-EC2-HCP + - acceptance-1.17-EC2 include: - - name: acceptance-1.16-EC2-HCP + - name: acceptance-1.17-EC2-HCP enable-hcp: true launch-type: EC2 - - name: acceptance-1.16-EC2 + - name: acceptance-1.17-EC2 enable-hcp: false launch-type: EC2 fail-fast: false diff --git a/examples/admin-partitions/terraform/variables.tf b/examples/admin-partitions/terraform/variables.tf index 9b17e6b4..b62a2b4d 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.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.3.0-rc1" + default = "hashicorp/consul-dataplane:1.3.0" } variable "client_partition" { diff --git a/examples/cluster-peering/gateway/variables.tf b/examples/cluster-peering/gateway/variables.tf index 7a7426c9..aff71c14 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.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } diff --git a/examples/cluster-peering/variables.tf b/examples/cluster-peering/variables.tf index 9df73073..f17c6a2f 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.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } variable "consul_server_startup_timeout" { diff --git a/examples/locality-aware-routing/variables.tf b/examples/locality-aware-routing/variables.tf index ad91a59a..0e667870 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.0-rc1" + default = "hashicorp/consul-ecs:0.7.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-rc1-ent" + default = "hashicorp/consul-enterprise:1.17.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 f1f95db2..6fb4d4bf 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.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } diff --git a/examples/mesh-gateways/variables.tf b/examples/mesh-gateways/variables.tf index f6208247..eedafcde 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.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } variable "consul_server_startup_timeout" { diff --git a/examples/service-sameness/datacenter/variables.tf b/examples/service-sameness/datacenter/variables.tf index 0bc416ee..83af8cc8 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-rc1-ent" + default = "public.ecr.aws/hashicorp/consul-enterprise:1.17.0-ent" } variable "consul_license" { diff --git a/examples/service-sameness/gateway/variables.tf b/examples/service-sameness/gateway/variables.tf index 802c110c..6fe7144f 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.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } variable "consul_server_lb_dns_name" { diff --git a/examples/service-sameness/variables.tf b/examples/service-sameness/variables.tf index 21f666aa..e4315af3 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.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } variable "consul_server_startup_timeout" { diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf index c92ddbf0..171bbb6a 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.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } variable "ecs_cluster_arn" { diff --git a/modules/dev-server/variables.tf b/modules/dev-server/variables.tf index 3b356205..fed2c467 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-rc1" + default = "hashicorp/consul:1.17.0" } variable "consul_license" { diff --git a/modules/gateway-task/variables.tf b/modules/gateway-task/variables.tf index 3f07d935..97616b3a 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-rc1" + default = "hashicorp/consul:1.17.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 = "hashicorp/consul-ecs:0.7.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.3.0-rc1" + default = "hashicorp/consul-dataplane:1.3.0" } variable "envoy_readiness_port" { diff --git a/modules/mesh-task/variables.tf b/modules/mesh-task/variables.tf index a5b449dd..06f7524b 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.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } variable "consul_dataplane_image" { description = "consul-dataplane Docker image." type = string - default = "hashicorp/consul-dataplane:1.3.0-rc1" + default = "hashicorp/consul-dataplane:1.3.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 ca7f9926..26f2e392 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 = "hashicorp/consul-ecs:0.7.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } 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 6399fc63..8e6bede6 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 = "hashicorp/consul-ecs:0.7.0-rc1" + default = "hashicorp/consul-ecs:0.7.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 aca439b3..2c4c4432 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 = "hashicorp/consul-ecs:0.7.0-rc1" + default = "hashicorp/consul-ecs:0.7.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 1395f905..20c1abe0 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 = "hashicorp/consul-ecs:0.7.0-rc1" + default = "hashicorp/consul-ecs:0.7.0" } variable "consul_server_address" {