Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes non-consolidated service settings. #286

Merged
merged 1 commit into from
Apr 3, 2024
Merged

Removes non-consolidated service settings. #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,20 +207,19 @@ module "settings" {
count = var.is_replicated_deployment ? 1 : 0

# TFE Base Configuration
consolidated_services_enabled = var.consolidated_services_enabled
production_type = var.operational_mode
disk_path = var.disk_path
iact_subnet_list = var.iact_subnet_list
iact_subnet_time_limit = var.iact_subnet_time_limit
release_sequence = var.release_sequence
tls_vers = var.tls_vers
metrics_endpoint_enabled = var.metrics_endpoint_enabled
metrics_endpoint_port_http = var.metrics_endpoint_port_http
metrics_endpoint_port_https = var.metrics_endpoint_port_https
custom_image_tag = var.custom_image_tag
custom_agent_image_tag = var.custom_agent_image_tag
capacity_concurrency = var.capacity_concurrency
capacity_memory = var.capacity_memory
production_type = var.operational_mode
disk_path = var.disk_path
iact_subnet_list = var.iact_subnet_list
iact_subnet_time_limit = var.iact_subnet_time_limit
release_sequence = var.release_sequence
tls_vers = var.tls_vers
metrics_endpoint_enabled = var.metrics_endpoint_enabled
metrics_endpoint_port_http = var.metrics_endpoint_port_http
metrics_endpoint_port_https = var.metrics_endpoint_port_https
custom_image_tag = var.custom_image_tag
custom_agent_image_tag = var.custom_agent_image_tag
capacity_concurrency = var.capacity_concurrency
capacity_memory = var.capacity_memory

extra_no_proxy = local.extra_no_proxy

Expand Down
17 changes: 8 additions & 9 deletions tests/private-active-active/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,14 @@ module "secrets" {
module "tfe" {
source = "../.."

consolidated_services_enabled = var.consolidated_services_enabled
distribution = "rhel"
dns_zone_name = data.google_dns_managed_zone.main.name
fqdn = "${random_pet.main.id}.${data.google_dns_managed_zone.main.dns_name}"
namespace = random_pet.main.id
existing_service_account_id = var.existing_service_account_id
node_count = 2
tfe_license_secret_id = try(module.secrets[0].license_secret, data.tfe_outputs.base.values.license_secret_id)
labels = local.labels
distribution = "rhel"
dns_zone_name = data.google_dns_managed_zone.main.name
fqdn = "${random_pet.main.id}.${data.google_dns_managed_zone.main.dns_name}"
namespace = random_pet.main.id
existing_service_account_id = var.existing_service_account_id
node_count = 2
tfe_license_secret_id = try(module.secrets[0].license_secret, data.tfe_outputs.base.values.license_secret_id)
labels = local.labels

iact_subnet_list = ["${module.test_proxy.compute_instance.network_interface[0].network_ip}/32"]
iact_subnet_time_limit = 1440
Expand Down
6 changes: 0 additions & 6 deletions tests/private-active-active/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0

variable "consolidated_services_enabled" {
default = true
type = bool
description = "(Required) True if TFE uses consolidated services."
}

variable "existing_service_account_id" {
default = null
type = string
Expand Down
58 changes: 28 additions & 30 deletions tests/private-tcp-active-active/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,35 +36,34 @@ module "secrets" {
module "tfe" {
source = "../.."

bypass_preflight_checks = true
consolidated_services_enabled = var.consolidated_services_enabled
distribution = "rhel"
dns_zone_name = data.google_dns_managed_zone.main.name
fqdn = "${random_pet.main.id}.${data.google_dns_managed_zone.main.dns_name}"
namespace = random_pet.main.id
existing_service_account_id = var.existing_service_account_id
node_count = 2
tfe_license_secret_id = try(module.secrets[0].license_secret, data.tfe_outputs.base.values.license_secret_id)
labels = local.labels
ca_certificate_secret_id = data.tfe_outputs.base.values.ca_certificate_secret_id
iact_subnet_list = ["${module.test_proxy.compute_instance.network_interface[0].network_ip}/32"]
iact_subnet_time_limit = 1440
load_balancer = "PRIVATE_TCP"
proxy_ip = module.test_proxy.proxy_ip
proxy_port = module.test_proxy.proxy_port
redis_auth_enabled = true
redis_version = "REDIS_7_0"
ssl_certificate_secret = data.tfe_outputs.base.values.wildcard_ssl_certificate_secret_id
ssl_private_key_secret = data.tfe_outputs.base.values.wildcard_ssl_private_key_secret_id
tls_bootstrap_cert_pathname = "/var/lib/terraform-enterprise/certificate.pem"
tls_bootstrap_key_pathname = "/var/lib/terraform-enterprise/key.pem"
vm_disk_source_image = data.google_compute_image.rhel.self_link
vm_machine_type = "n1-standard-32"
vm_mig_check_interval_sec = 300
vm_mig_healthy_threshold = 1
vm_mig_initial_delay_sec = 3600
vm_mig_timeout_sec = 300
vm_mig_unhealthy_threshold = 10
bypass_preflight_checks = true
distribution = "rhel"
dns_zone_name = data.google_dns_managed_zone.main.name
fqdn = "${random_pet.main.id}.${data.google_dns_managed_zone.main.dns_name}"
namespace = random_pet.main.id
existing_service_account_id = var.existing_service_account_id
node_count = 2
tfe_license_secret_id = try(module.secrets[0].license_secret, data.tfe_outputs.base.values.license_secret_id)
labels = local.labels
ca_certificate_secret_id = data.tfe_outputs.base.values.ca_certificate_secret_id
iact_subnet_list = ["${module.test_proxy.compute_instance.network_interface[0].network_ip}/32"]
iact_subnet_time_limit = 1440
load_balancer = "PRIVATE_TCP"
proxy_ip = module.test_proxy.proxy_ip
proxy_port = module.test_proxy.proxy_port
redis_auth_enabled = true
redis_version = "REDIS_7_0"
ssl_certificate_secret = data.tfe_outputs.base.values.wildcard_ssl_certificate_secret_id
ssl_private_key_secret = data.tfe_outputs.base.values.wildcard_ssl_private_key_secret_id
tls_bootstrap_cert_pathname = "/var/lib/terraform-enterprise/certificate.pem"
tls_bootstrap_key_pathname = "/var/lib/terraform-enterprise/key.pem"
vm_disk_source_image = data.google_compute_image.rhel.self_link
vm_machine_type = "n1-standard-32"
vm_mig_check_interval_sec = 300
vm_mig_healthy_threshold = 1
vm_mig_initial_delay_sec = 3600
vm_mig_timeout_sec = 300
vm_mig_unhealthy_threshold = 10

# FDO Specific Values
is_replicated_deployment = var.is_replicated_deployment
Expand All @@ -77,4 +76,3 @@ module "tfe" {
registry_username = var.registry_username
tfe_image = "${local.registry}/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
}

6 changes: 0 additions & 6 deletions tests/private-tcp-active-active/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0

variable "consolidated_services_enabled" {
default = true
type = bool
description = "(Required) True if TFE uses consolidated services."
}

variable "existing_service_account_id" {
default = null
type = string
Expand Down
13 changes: 6 additions & 7 deletions tests/public-active-active/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@ module "secrets" {
module "tfe" {
source = "../.."

consolidated_services_enabled = var.consolidated_services_enabled
dns_zone_name = data.google_dns_managed_zone.main.name
fqdn = "${random_pet.main.id}.${data.google_dns_managed_zone.main.dns_name}"
namespace = random_pet.main.id
existing_service_account_id = var.existing_service_account_id
node_count = 2
tfe_license_secret_id = try(module.secrets[0].license_secret, data.tfe_outputs.base.values.license_secret_id)
dns_zone_name = data.google_dns_managed_zone.main.name
fqdn = "${random_pet.main.id}.${data.google_dns_managed_zone.main.dns_name}"
namespace = random_pet.main.id
existing_service_account_id = var.existing_service_account_id
node_count = 2
tfe_license_secret_id = try(module.secrets[0].license_secret, data.tfe_outputs.base.values.license_secret_id)

distribution = "ubuntu"
iact_subnet_list = var.iact_subnet_list
Expand Down
7 changes: 0 additions & 7 deletions tests/public-active-active/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0

variable "consolidated_services_enabled" {
default = true
type = bool
description = "(Required) True if TFE uses consolidated services."
}

variable "existing_service_account_id" {
default = null
type = string
Expand Down Expand Up @@ -91,4 +85,3 @@ variable "tfe" {
workspace = string
})
}

9 changes: 4 additions & 5 deletions tests/standalone-external-rhel8-worker/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,10 @@ module "tfe" {
node_count = 1
tfe_license_secret_id = try(module.secrets[0].license_secret, data.tfe_outputs.base.values.license_secret_id)

existing_service_account_id = var.existing_service_account_id
custom_image_tag = "${local.repository_location}-docker.pkg.dev/${data.google_project.project.project_id}/${local.repository_name}/rhel-7.9:latest"
iact_subnet_list = ["0.0.0.0/0"]
iact_subnet_time_limit = 60
consolidated_services_enabled = var.consolidated_services_enabled
existing_service_account_id = var.existing_service_account_id
custom_image_tag = "${local.repository_location}-docker.pkg.dev/${data.google_project.project.project_id}/${local.repository_name}/rhel-7.9:latest"
iact_subnet_list = ["0.0.0.0/0"]
iact_subnet_time_limit = 60
labels = {
department = "engineering"
description = "standalone-external-services-scenario-deployed-from-gha"
Expand Down
6 changes: 0 additions & 6 deletions tests/standalone-external-rhel8-worker/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0

variable "consolidated_services_enabled" {
default = true
type = bool
description = "(Required) True if TFE uses consolidated services."
}

variable "existing_service_account_id" {
default = null
type = string
Expand Down
17 changes: 8 additions & 9 deletions tests/standalone-mounted-disk/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,14 @@ resource "local_file" "private_key_pem" {
}

module "tfe" {
source = "../.."
consolidated_services_enabled = var.consolidated_services_enabled
disk_path = "/opt/hashicorp/data"
distribution = "ubuntu"
dns_zone_name = data.google_dns_managed_zone.main.name
fqdn = "${random_pet.main.id}.${trimsuffix(data.google_dns_managed_zone.main.dns_name, ".")}"
namespace = random_pet.main.id
node_count = 1
tfe_license_secret_id = try(module.secrets[0].license_secret, data.tfe_outputs.base.values.license_secret_id)
source = "../.."
disk_path = "/opt/hashicorp/data"
distribution = "ubuntu"
dns_zone_name = data.google_dns_managed_zone.main.name
fqdn = "${random_pet.main.id}.${trimsuffix(data.google_dns_managed_zone.main.dns_name, ".")}"
namespace = random_pet.main.id
node_count = 1
tfe_license_secret_id = try(module.secrets[0].license_secret, data.tfe_outputs.base.values.license_secret_id)

existing_service_account_id = var.existing_service_account_id
iact_subnet_list = ["0.0.0.0/0"]
Expand Down
6 changes: 0 additions & 6 deletions tests/standalone-mounted-disk/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0

variable "consolidated_services_enabled" {
default = true
type = bool
description = "(Required) True if TFE uses consolidated services."
}

variable "existing_service_account_id" {
default = null
type = string
Expand Down
6 changes: 0 additions & 6 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,12 +333,6 @@ variable "capacity_memory" {
description = "The maximum amount of memory (in megabytes) that a Terraform plan or apply can use on the system; defaults to 512."
}

variable "consolidated_services_enabled" {
default = true
type = bool
description = "(Required) True if TFE uses consolidated services."
}

variable "custom_agent_image_tag" {
default = null
type = string
Expand Down
Loading