From ca81b6ccfdcee62846217f824c1e4a1610b8a950 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 31 Mar 2022 15:59:10 +0200 Subject: [PATCH] refactor(terraform): Directory structure Signed-off-by: Peter Mikus Change-Id: I2f3cdf0241aaf7c4a8ba4e00b701df10c9165cf8 --- fdio.infra.terraform/1n_nmd/main.tf | 89 -------------- .../1n_nmd/minio_s3_gateway/main.tf | 51 -------- .../1n_nmd/minio_s3_gateway/versions.tf | 13 -- .../main.tf | 2 +- .../output.tf | 0 .../providers.tf | 0 .../variables.tf | 0 .../versions.tf | 0 .../main.tf | 4 +- .../output.tf | 0 .../providers.tf | 0 .../variables.tf | 0 .../versions.tf | 0 .../conf/nomad/alertmanager.hcl.tftpl | 0 .../fdio/main.tf | 0 .../fdio/providers.tf | 0 .../fdio/variables.tf | 0 .../fdio/versions.tf | 0 .../main.tf | 0 .../variables.tf | 0 .../versions.tf | 0 .../conf/nomad/loki.hcl.tftpl} | 133 ++++++++++++--------- fdio.infra.terraform/terraform-nomad-loki/main.tf | 40 +++++++ .../variables.tf | 124 ++++--------------- .../etl => terraform-nomad-loki}/versions.tf | 0 .../conf/nomad/prometheus.hcl.tftpl | 7 -- .../fdio/main.tf | 0 .../fdio/providers.tf | 0 .../fdio/variables.tf | 0 .../fdio/versions.tf | 0 .../main.tf | 3 +- .../variables.tf | 0 .../versions.tf | 0 .../conf/nomad/etl.hcl.tftpl | 0 .../fdio/main.tf | 0 .../fdio/providers.tf | 0 .../fdio/variables.tf | 0 .../fdio/versions.tf | 0 .../etl => terraform-nomad-pyspark-etl}/main.tf | 0 .../variables.tf | 0 .../terraform-nomad-pyspark-etl/versions.tf | 9 ++ .../fdio/main.tf | 0 .../fdio/providers.tf | 0 .../fdio/variables.tf | 0 .../fdio/versions.tf | 0 .../main.tf | 0 .../variables.tf | 0 .../versions.tf | 0 48 files changed, 153 insertions(+), 322 deletions(-) delete mode 100644 fdio.infra.terraform/1n_nmd/minio_s3_gateway/main.tf delete mode 100644 fdio.infra.terraform/1n_nmd/minio_s3_gateway/versions.tf rename fdio.infra.terraform/{1n_aws_t3/fdio-csit-dash-app-base => terraform-aws-fdio-csit-dash-app-base}/main.tf (79%) rename fdio.infra.terraform/{1n_aws_t3/fdio-csit-dash-app-base => terraform-aws-fdio-csit-dash-app-base}/output.tf (100%) rename fdio.infra.terraform/{1n_aws_t3/fdio-csit-dash-app-base => terraform-aws-fdio-csit-dash-app-base}/providers.tf (100%) rename fdio.infra.terraform/{1n_aws_t3/fdio-csit-dash-app-base => terraform-aws-fdio-csit-dash-app-base}/variables.tf (100%) rename fdio.infra.terraform/{1n_aws_t3/fdio-csit-dash-app-base => terraform-aws-fdio-csit-dash-app-base}/versions.tf (100%) rename fdio.infra.terraform/{1n_aws_t3/fdio-csit-dash-env => terraform-aws-fdio-csit-dash-env}/main.tf (96%) rename fdio.infra.terraform/{1n_aws_t3/fdio-csit-dash-env => terraform-aws-fdio-csit-dash-env}/output.tf (100%) rename fdio.infra.terraform/{1n_aws_t3/fdio-csit-dash-env => terraform-aws-fdio-csit-dash-env}/providers.tf (100%) rename fdio.infra.terraform/{1n_aws_t3/fdio-csit-dash-env => terraform-aws-fdio-csit-dash-env}/variables.tf (100%) rename fdio.infra.terraform/{1n_aws_t3/fdio-csit-dash-env => terraform-aws-fdio-csit-dash-env}/versions.tf (100%) rename fdio.infra.terraform/{1n_nmd/alertmanager => terraform-nomad-alertmanager}/conf/nomad/alertmanager.hcl.tftpl (100%) rename fdio.infra.terraform/{1n_nmd/alertmanager => terraform-nomad-alertmanager}/fdio/main.tf (100%) rename fdio.infra.terraform/{1n_nmd/alertmanager => terraform-nomad-alertmanager}/fdio/providers.tf (100%) rename fdio.infra.terraform/{1n_nmd/alertmanager => terraform-nomad-alertmanager}/fdio/variables.tf (100%) rename fdio.infra.terraform/{1n_nmd/alertmanager => terraform-nomad-alertmanager}/fdio/versions.tf (100%) rename fdio.infra.terraform/{1n_nmd/alertmanager => terraform-nomad-alertmanager}/main.tf (100%) rename fdio.infra.terraform/{1n_nmd/alertmanager => terraform-nomad-alertmanager}/variables.tf (100%) rename fdio.infra.terraform/{1n_nmd/alertmanager => terraform-nomad-alertmanager}/versions.tf (100%) rename fdio.infra.terraform/{1n_nmd/minio_s3_gateway/conf/nomad/minio.hcl => terraform-nomad-loki/conf/nomad/loki.hcl.tftpl} (78%) create mode 100644 fdio.infra.terraform/terraform-nomad-loki/main.tf rename fdio.infra.terraform/{1n_nmd/minio_s3_gateway => terraform-nomad-loki}/variables.tf (54%) rename fdio.infra.terraform/{1n_nmd/etl => terraform-nomad-loki}/versions.tf (100%) rename fdio.infra.terraform/{1n_nmd/prometheus => terraform-nomad-prometheus}/conf/nomad/prometheus.hcl.tftpl (98%) rename fdio.infra.terraform/{1n_nmd/prometheus => terraform-nomad-prometheus}/fdio/main.tf (100%) rename fdio.infra.terraform/{1n_nmd/prometheus => terraform-nomad-prometheus}/fdio/providers.tf (100%) rename fdio.infra.terraform/{1n_nmd/prometheus => terraform-nomad-prometheus}/fdio/variables.tf (100%) rename fdio.infra.terraform/{1n_nmd/prometheus => terraform-nomad-prometheus}/fdio/versions.tf (100%) rename fdio.infra.terraform/{1n_nmd/prometheus => terraform-nomad-prometheus}/main.tf (94%) rename fdio.infra.terraform/{1n_nmd/prometheus => terraform-nomad-prometheus}/variables.tf (100%) rename fdio.infra.terraform/{1n_nmd/prometheus => terraform-nomad-prometheus}/versions.tf (100%) rename fdio.infra.terraform/{1n_nmd/etl => terraform-nomad-pyspark-etl}/conf/nomad/etl.hcl.tftpl (100%) rename fdio.infra.terraform/{1n_nmd/etl => terraform-nomad-pyspark-etl}/fdio/main.tf (100%) rename fdio.infra.terraform/{1n_nmd/etl => terraform-nomad-pyspark-etl}/fdio/providers.tf (100%) rename fdio.infra.terraform/{1n_nmd/etl => terraform-nomad-pyspark-etl}/fdio/variables.tf (100%) rename fdio.infra.terraform/{1n_nmd/etl => terraform-nomad-pyspark-etl}/fdio/versions.tf (100%) rename fdio.infra.terraform/{1n_nmd/etl => terraform-nomad-pyspark-etl}/main.tf (100%) rename fdio.infra.terraform/{1n_nmd/etl => terraform-nomad-pyspark-etl}/variables.tf (100%) create mode 100644 fdio.infra.terraform/terraform-nomad-pyspark-etl/versions.tf rename fdio.infra.terraform/{1n_nmd/vault-aws-secret-backend => terraform-vault-aws-secret-backend}/fdio/main.tf (100%) rename fdio.infra.terraform/{1n_nmd/vault-aws-secret-backend => terraform-vault-aws-secret-backend}/fdio/providers.tf (100%) rename fdio.infra.terraform/{1n_nmd/vault-aws-secret-backend => terraform-vault-aws-secret-backend}/fdio/variables.tf (100%) rename fdio.infra.terraform/{1n_nmd/vault-aws-secret-backend => terraform-vault-aws-secret-backend}/fdio/versions.tf (100%) rename fdio.infra.terraform/{1n_nmd/vault-aws-secret-backend => terraform-vault-aws-secret-backend}/main.tf (100%) rename fdio.infra.terraform/{1n_nmd/vault-aws-secret-backend => terraform-vault-aws-secret-backend}/variables.tf (100%) rename fdio.infra.terraform/{1n_nmd/vault-aws-secret-backend => terraform-vault-aws-secret-backend}/versions.tf (100%) diff --git a/fdio.infra.terraform/1n_nmd/main.tf b/fdio.infra.terraform/1n_nmd/main.tf index 7cdd245b7a..24d5ff3efc 100644 --- a/fdio.infra.terraform/1n_nmd/main.tf +++ b/fdio.infra.terraform/1n_nmd/main.tf @@ -4,31 +4,6 @@ # and downstream modules can simply declare resources for that provider # and have them automatically associated with the root provider # configurations. -module "grafana" { - source = "./grafana" - providers = { - nomad = nomad.yul1 - } - - # nomad - nomad_datacenters = ["yul1"] - - # grafana - grafana_job_name = "prod-grafana" - grafana_use_canary = true - grafana_group_count = 1 - grafana_vault_secret = { - use_vault_provider = false, - vault_kv_policy_name = "kv-secret", - vault_kv_path = "secret/data/grafana", - vault_kv_field_access_key = "access_key", - vault_kv_field_secret_key = "secret_key" - } - grafana_container_image = "grafana/grafana:7.3.7" - grafana_cpu = 1000 - grafana_mem = 2048 - grafana_port = 3000 -} #module "minio" { # source = "./minio" @@ -66,41 +41,6 @@ data "vault_generic_secret" "minio_creds" { path = "kv/secret/data/minio" } -module "minio_s3_gateway" { - source = "./minio_s3_gateway" - providers = { - nomad = nomad.yul1 - } - - # nomad - datacenters = ["yul1"] - volume_source = "prod-volume-data1-1" - - # minio - job_name = "minio-s3-gateway" - group_count = 4 - service_name = "minio" - mode = "gateway" - port_base = 9001 - port_console = 9002 - image = "minio/minio:latest" - access_key = data.vault_generic_secret.minio_creds.data["access_key"] - secret_key = data.vault_generic_secret.minio_creds.data["secret_key"] - volume_destination = "/data/" - use_host_volume = true - use_canary = true - envs = [ - "MINIO_BROWSER=\"off\"", - "MINIO_CACHE=\"on\"", - "MINIO_CACHE_DRIVES=\"/data/s3_cache1\"", - "MINIO_CACHE_EXCLUDE=\"\"", - "MINIO_CACHE_QUOTA=80", - "MINIO_CACHE_AFTER=1", - "MINIO_CACHE_WATERMARK_LOW=70", - "MINIO_CACHE_WATERMARK_HIGH=90" - ] -} - #module "nginx" { # source = "./nginx" # providers = { @@ -116,35 +56,6 @@ module "minio_s3_gateway" { # nginx_use_host_volume = true #} -module "prometheus" { - source = "./prometheus" - providers = { - nomad = nomad.yul1 - } - - # nomad - nomad_datacenters = ["yul1"] - nomad_host_volume = "prod-volume-data1-1" - - # prometheus - prometheus_job_name = "prod-prometheus" - prometheus_use_canary = true - prometheus_group_count = 4 - prometheus_vault_secret = { - use_vault_provider = false, - vault_kv_policy_name = "kv-secret", - vault_kv_path = "secret/data/prometheus", - vault_kv_field_access_key = "access_key", - vault_kv_field_secret_key = "secret_key" - } - prometheus_data_dir = "/data/" - prometheus_use_host_volume = true - prometheus_version = "2.28.1" - prometheus_cpu = 2000 - prometheus_mem = 8192 - prometheus_port = 9090 -} - module "vpp_device" { source = "./vpp_device" providers = { diff --git a/fdio.infra.terraform/1n_nmd/minio_s3_gateway/main.tf b/fdio.infra.terraform/1n_nmd/minio_s3_gateway/main.tf deleted file mode 100644 index 2ae3cac9c2..0000000000 --- a/fdio.infra.terraform/1n_nmd/minio_s3_gateway/main.tf +++ /dev/null @@ -1,51 +0,0 @@ -locals { - datacenters = join(",", var.datacenters) - envs = join("\n", concat([], var.envs)) - upstreams = jsonencode(var.upstreams) -} - -data "template_file" "nomad_job_minio" { - template = file("${path.module}/conf/nomad/minio.hcl") - vars = { - access_key = var.access_key - auto_promote = var.auto_promote - auto_revert = var.auto_revert - canary = var.canary - cpu = var.cpu - cpu_proxy = var.resource_proxy.cpu - datacenters = local.datacenters - envs = local.envs - group_count = var.group_count - host = var.host - image = var.image - job_name = var.job_name - max_parallel = var.max_parallel - memory = var.memory - memory_proxy = var.resource_proxy.memory - mode = var.mode - port_base = var.port_base - port_console = var.port_console - region = var.region - secret_key = var.secret_key - service_name = var.service_name - use_canary = var.use_canary - use_host_volume = var.use_host_volume - upstreams = local.upstreams - use_vault_kms = var.kms_variables.use_vault_kms - use_vault_provider = var.vault_secret.use_vault_provider - vault_address = var.kms_variables.vault_address - vault_kms_approle_kv = var.kms_variables.vault_kms_approle_kv - vault_kms_key_name = var.kms_variables.vault_kms_key_name - vault_kv_policy_name = var.vault_secret.vault_kv_policy_name - vault_kv_path = var.vault_secret.vault_kv_path - vault_kv_field_access_key = var.vault_secret.vault_kv_field_access_key - vault_kv_field_secret_key = var.vault_secret.vault_kv_field_secret_key - volume_destination = var.volume_destination - volume_source = var.volume_source - } -} - -resource "nomad_job" "nomad_job_minio" { - jobspec = data.template_file.nomad_job_minio.rendered - detach = false -} diff --git a/fdio.infra.terraform/1n_nmd/minio_s3_gateway/versions.tf b/fdio.infra.terraform/1n_nmd/minio_s3_gateway/versions.tf deleted file mode 100644 index b80610a525..0000000000 --- a/fdio.infra.terraform/1n_nmd/minio_s3_gateway/versions.tf +++ /dev/null @@ -1,13 +0,0 @@ -terraform { - required_providers { - nomad = { - source = "hashicorp/nomad" - version = "~> 1.4.15" - } - template = { - source = "hashicorp/template" - version = "~> 2.2.0" - } - } - required_version = ">= 1.0.3" -} diff --git a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-app-base/main.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf similarity index 79% rename from fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-app-base/main.tf rename to fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf index 63d30e4098..1de8c391b1 100644 --- a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-app-base/main.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf @@ -4,7 +4,7 @@ data "vault_aws_access_credentials" "creds" { } module "elastic_beanstalk_application_version" { - source = "../../terraform-aws-elastic-beanstalk-application-version" + source = "../terraform-aws-elastic-beanstalk-application-version" application_description = "FD.io CSIT Results Dashboard" application_name = "fdio-csit-dash-app" application_version_name = "fdio-csit-dash-app-base" diff --git a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-app-base/output.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/output.tf similarity index 100% rename from fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-app-base/output.tf rename to fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/output.tf diff --git a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-app-base/providers.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/providers.tf similarity index 100% rename from fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-app-base/providers.tf rename to fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/providers.tf diff --git a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-app-base/variables.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf similarity index 100% rename from fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-app-base/variables.tf rename to fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf diff --git a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-app-base/versions.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf similarity index 100% rename from fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-app-base/versions.tf rename to fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf diff --git a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-env/main.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf similarity index 96% rename from fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-env/main.tf rename to fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf index fa7bcea8d9..7add0851c8 100644 --- a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-env/main.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf @@ -8,7 +8,7 @@ data "vault_aws_access_credentials" "creds" { } module "elastic_beanstalk_application" { - source = "../../terraform-aws-elastic-beanstalk-application" + source = "../terraform-aws-elastic-beanstalk-application" # application application_description = "FD.io CSIT Results Dashboard" @@ -19,7 +19,7 @@ module "elastic_beanstalk_application" { } module "elastic_beanstalk_environment" { - source = "../../terraform-aws-elastic-beanstalk-environment" + source = "../terraform-aws-elastic-beanstalk-environment" # vpc vpc_cidr_block = "192.168.0.0/24" diff --git a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-env/output.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/output.tf similarity index 100% rename from fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-env/output.tf rename to fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/output.tf diff --git a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-env/providers.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/providers.tf similarity index 100% rename from fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-env/providers.tf rename to fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/providers.tf diff --git a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-env/variables.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf similarity index 100% rename from fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-env/variables.tf rename to fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf diff --git a/fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-env/versions.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf similarity index 100% rename from fdio.infra.terraform/1n_aws_t3/fdio-csit-dash-env/versions.tf rename to fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/versions.tf diff --git a/fdio.infra.terraform/1n_nmd/alertmanager/conf/nomad/alertmanager.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-alertmanager/conf/nomad/alertmanager.hcl.tftpl similarity index 100% rename from fdio.infra.terraform/1n_nmd/alertmanager/conf/nomad/alertmanager.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-alertmanager/conf/nomad/alertmanager.hcl.tftpl diff --git a/fdio.infra.terraform/1n_nmd/alertmanager/fdio/main.tf b/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/main.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/alertmanager/fdio/main.tf rename to fdio.infra.terraform/terraform-nomad-alertmanager/fdio/main.tf diff --git a/fdio.infra.terraform/1n_nmd/alertmanager/fdio/providers.tf b/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/providers.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/alertmanager/fdio/providers.tf rename to fdio.infra.terraform/terraform-nomad-alertmanager/fdio/providers.tf diff --git a/fdio.infra.terraform/1n_nmd/alertmanager/fdio/variables.tf b/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/variables.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/alertmanager/fdio/variables.tf rename to fdio.infra.terraform/terraform-nomad-alertmanager/fdio/variables.tf diff --git a/fdio.infra.terraform/1n_nmd/alertmanager/fdio/versions.tf b/fdio.infra.terraform/terraform-nomad-alertmanager/fdio/versions.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/alertmanager/fdio/versions.tf rename to fdio.infra.terraform/terraform-nomad-alertmanager/fdio/versions.tf diff --git a/fdio.infra.terraform/1n_nmd/alertmanager/main.tf b/fdio.infra.terraform/terraform-nomad-alertmanager/main.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/alertmanager/main.tf rename to fdio.infra.terraform/terraform-nomad-alertmanager/main.tf diff --git a/fdio.infra.terraform/1n_nmd/alertmanager/variables.tf b/fdio.infra.terraform/terraform-nomad-alertmanager/variables.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/alertmanager/variables.tf rename to fdio.infra.terraform/terraform-nomad-alertmanager/variables.tf diff --git a/fdio.infra.terraform/1n_nmd/alertmanager/versions.tf b/fdio.infra.terraform/terraform-nomad-alertmanager/versions.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/alertmanager/versions.tf rename to fdio.infra.terraform/terraform-nomad-alertmanager/versions.tf diff --git a/fdio.infra.terraform/1n_nmd/minio_s3_gateway/conf/nomad/minio.hcl b/fdio.infra.terraform/terraform-nomad-loki/conf/nomad/loki.hcl.tftpl similarity index 78% rename from fdio.infra.terraform/1n_nmd/minio_s3_gateway/conf/nomad/minio.hcl rename to fdio.infra.terraform/terraform-nomad-loki/conf/nomad/loki.hcl.tftpl index 6210040b0c..7b38437566 100644 --- a/fdio.infra.terraform/1n_nmd/minio_s3_gateway/conf/nomad/minio.hcl +++ b/fdio.infra.terraform/terraform-nomad-loki/conf/nomad/loki.hcl.tftpl @@ -69,12 +69,6 @@ job "${job_name}" { %{ endif } } - # All groups in this job should be scheduled on different hosts. - constraint { - operator = "distinct_hosts" - value = "true" - } - # The "group" stanza defines a series of tasks that should be co-located on # the same Nomad client. Any task within a group will be placed on the same # client. @@ -112,6 +106,22 @@ job "${job_name}" { mode = "delay" } + # The constraint allows restricting the set of eligible nodes. Constraints + # may filter on attributes or client metadata. + # + # https://www.nomadproject.io/docs/job-specification/constraint + # + constraint { + attribute = "$${attr.cpu.arch}" + operator = "!=" + value = "arm64" + } + + constraint { + attribute = "$${node.class}" + value = "builder" + } + # The network stanza specifies the networking requirements for the task # group, including the network mode and port allocations. When scheduling # jobs in Nomad they are provisioned across your fleet of machines along @@ -122,20 +132,16 @@ job "${job_name}" { # https://www.nomadproject.io/docs/job-specification/network # network { - port "base" { - static = ${port_base} - to = ${port_base} - } - port "console" { - static = ${port_console} - to = ${port_console} + port "${service_name}" { + static = ${port} + to = ${port} } } # The "task" stanza creates an individual unit of work, such as a Docker # container, web application, or batch processing. # - # https://www.nomadproject.io/docs/job-specification/task.html + # https://www.nomadproject.io/docs/job-specification/task # task "${job_name}-task-1" { # The "driver" parameter specifies the task driver that should be used to @@ -161,12 +167,7 @@ job "${job_name}" { # are specific to each driver, so please see specific driver # documentation for more information. config { - args = [ - "${mode}", "s3", - "-address", ":${port_base}", - "-console-address", ":${port_console}" - ] - command = "local/minio" + command = "local/loki-linux-amd64" } # The artifact stanza instructs Nomad to fetch and unpack a remote resource, @@ -174,30 +175,57 @@ job "${job_name}" { # popular go-getter library, which permits downloading artifacts from a # variety of locations using a URL as the input source. # - # For more information and examples on the "artifact" stanza, please see - # the online documentation at: - # # https://www.nomadproject.io/docs/job-specification/artifact # artifact { - source = "https://dl.min.io/server/minio/release/linux-amd64/minio" + source = "${url}" + args = [ + "-config.file secrets/config.yml" + ] } - # The env stanza configures a list of environment variables to populate - # the task's environment before starting. - env { -%{ if use_vault_provider } -{{ with secret "${vault_kv_path}" }} - MINIO_ROOT_USER = "{{ .Data.data.${vault_kv_field_access_key} }}" - MINIO_ROOT_PASSWORD = "{{ .Data.data.${vault_kv_field_secret_key} }}" -{{ end }} -%{ else } - MINIO_ROOT_USER = "${access_key}" - MINIO_ROOT_PASSWORD = "${secret_key}" - AWS_ACCESS_KEY_ID = "${access_key}" - AWS_SECRET_ACCESS_KEY = "${secret_key}" -%{ endif } - ${ envs } + template { + change_mode = "noop" + change_signal = "SIGINT" + destination = "secrets/loki.yml" + data = <= 200 && var.resource_proxy.memory >= 128 - error_message = "Proxy resource must be at least: cpu=200, memory=128." - } + default = 3100 } variable "service_name" { description = "Specifies the name this service will be advertised in Consul" type = string - default = "minio" -} - -variable "secret_key" { - description = "Minio secret key" - type = string - default = "minio" -} - -variable "upstreams" { - type = list(object({ - service_name = string, - port = number, - })) - description = "List of upstream services" - default = [] + default = "loki" } variable "use_canary" { - description = "Uses canary deployment for Minio" + description = "Uses canary deployment" type = bool - default = false + default = true } variable "use_host_volume" { @@ -174,6 +102,12 @@ variable "use_host_volume" { default = false } +variable "volume_destination" { + description = "Specifies where the volume should be mounted inside the task" + type = string + default = "" +} + variable "vault_secret" { type = object({ use_vault_provider = bool, @@ -182,18 +116,12 @@ variable "vault_secret" { vault_kv_field_access_key = string, vault_kv_field_secret_key = string }) - description = "Set of properties to be able to fetch secret from vault" + description = "Set of properties to be able to fetch secret from vault." default = { use_vault_provider = false vault_kv_policy_name = "kv" - vault_kv_path = "secret/data/minio" + vault_kv_path = "secret/data/prometheus" vault_kv_field_access_key = "access_key" vault_kv_field_secret_key = "secret_key" } } - -variable "volume_destination" { - description = "Specifies where the volume should be mounted inside the task" - type = string - default = "/data/" -} diff --git a/fdio.infra.terraform/1n_nmd/etl/versions.tf b/fdio.infra.terraform/terraform-nomad-loki/versions.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/etl/versions.tf rename to fdio.infra.terraform/terraform-nomad-loki/versions.tf diff --git a/fdio.infra.terraform/1n_nmd/prometheus/conf/nomad/prometheus.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-prometheus/conf/nomad/prometheus.hcl.tftpl similarity index 98% rename from fdio.infra.terraform/1n_nmd/prometheus/conf/nomad/prometheus.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-prometheus/conf/nomad/prometheus.hcl.tftpl index 224f7e5e00..1e1cd0863d 100644 --- a/fdio.infra.terraform/1n_nmd/prometheus/conf/nomad/prometheus.hcl.tftpl +++ b/fdio.infra.terraform/terraform-nomad-prometheus/conf/nomad/prometheus.hcl.tftpl @@ -581,13 +581,6 @@ scrape_configs: - server: '{{ env "NOMAD_IP_prometheus" }}:8500' services: [ 'storage' ] metrics_path: /minio/prometheus/metrics - - - job_name: 'Minio Proxy' - bearer_token: eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJleHAiOjQ3OTAwNjE1NDIsImlzcyI6InByb21ldGhldXMiLCJzdWIiOiJBS0lBUTJBSDdZUFBXVDZDV1hYSSJ9.CU9x9j-yO0_Uta5iep6yqNiGQPolrr2608E3lpU6Yg21rIv_eOwS5zqzXaSvrhzkJP9H5kO1Pj6kqjYhbqjN_w - consul_sd_configs: - - server: '{{ env "NOMAD_IP_prometheus" }}:8500' - services: [ 'minio' ] - metrics_path: /minio/v2/metrics/cluster EOH } diff --git a/fdio.infra.terraform/1n_nmd/prometheus/fdio/main.tf b/fdio.infra.terraform/terraform-nomad-prometheus/fdio/main.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/prometheus/fdio/main.tf rename to fdio.infra.terraform/terraform-nomad-prometheus/fdio/main.tf diff --git a/fdio.infra.terraform/1n_nmd/prometheus/fdio/providers.tf b/fdio.infra.terraform/terraform-nomad-prometheus/fdio/providers.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/prometheus/fdio/providers.tf rename to fdio.infra.terraform/terraform-nomad-prometheus/fdio/providers.tf diff --git a/fdio.infra.terraform/1n_nmd/prometheus/fdio/variables.tf b/fdio.infra.terraform/terraform-nomad-prometheus/fdio/variables.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/prometheus/fdio/variables.tf rename to fdio.infra.terraform/terraform-nomad-prometheus/fdio/variables.tf diff --git a/fdio.infra.terraform/1n_nmd/prometheus/fdio/versions.tf b/fdio.infra.terraform/terraform-nomad-prometheus/fdio/versions.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/prometheus/fdio/versions.tf rename to fdio.infra.terraform/terraform-nomad-prometheus/fdio/versions.tf diff --git a/fdio.infra.terraform/1n_nmd/prometheus/main.tf b/fdio.infra.terraform/terraform-nomad-prometheus/main.tf similarity index 94% rename from fdio.infra.terraform/1n_nmd/prometheus/main.tf rename to fdio.infra.terraform/terraform-nomad-prometheus/main.tf index 0a4d987831..10b71b8c82 100644 --- a/fdio.infra.terraform/1n_nmd/prometheus/main.tf +++ b/fdio.infra.terraform/terraform-nomad-prometheus/main.tf @@ -4,8 +4,7 @@ locals { [ "https://github.com", "/prometheus/prometheus/releases/download/", - "v${var.pm_version}/", - "prometheus-${var.pm_version}.linux-amd64.tar.gz" + "v${var.pm_version}/prometheus-${var.pm_version}.linux-amd64.tar.gz" ] ) } diff --git a/fdio.infra.terraform/1n_nmd/prometheus/variables.tf b/fdio.infra.terraform/terraform-nomad-prometheus/variables.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/prometheus/variables.tf rename to fdio.infra.terraform/terraform-nomad-prometheus/variables.tf diff --git a/fdio.infra.terraform/1n_nmd/prometheus/versions.tf b/fdio.infra.terraform/terraform-nomad-prometheus/versions.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/prometheus/versions.tf rename to fdio.infra.terraform/terraform-nomad-prometheus/versions.tf diff --git a/fdio.infra.terraform/1n_nmd/etl/conf/nomad/etl.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl.hcl.tftpl similarity index 100% rename from fdio.infra.terraform/1n_nmd/etl/conf/nomad/etl.hcl.tftpl rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/conf/nomad/etl.hcl.tftpl diff --git a/fdio.infra.terraform/1n_nmd/etl/fdio/main.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/main.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/etl/fdio/main.tf rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/main.tf diff --git a/fdio.infra.terraform/1n_nmd/etl/fdio/providers.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/providers.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/etl/fdio/providers.tf rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/providers.tf diff --git a/fdio.infra.terraform/1n_nmd/etl/fdio/variables.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/variables.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/etl/fdio/variables.tf rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/variables.tf diff --git a/fdio.infra.terraform/1n_nmd/etl/fdio/versions.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/versions.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/etl/fdio/versions.tf rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/versions.tf diff --git a/fdio.infra.terraform/1n_nmd/etl/main.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/main.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/etl/main.tf rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/main.tf diff --git a/fdio.infra.terraform/1n_nmd/etl/variables.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/variables.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/etl/variables.tf rename to fdio.infra.terraform/terraform-nomad-pyspark-etl/variables.tf diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/versions.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/versions.tf new file mode 100644 index 0000000000..a01708f28a --- /dev/null +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/versions.tf @@ -0,0 +1,9 @@ +terraform { + required_providers { + nomad = { + source = "hashicorp/nomad" + version = ">= 1.4.16" + } + } + required_version = ">= 1.1.4" +} diff --git a/fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/fdio/main.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/main.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/fdio/main.tf rename to fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/main.tf diff --git a/fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/fdio/providers.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/providers.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/fdio/providers.tf rename to fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/providers.tf diff --git a/fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/fdio/variables.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/fdio/variables.tf rename to fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf diff --git a/fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/fdio/versions.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/versions.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/fdio/versions.tf rename to fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/versions.tf diff --git a/fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/main.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/main.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/main.tf rename to fdio.infra.terraform/terraform-vault-aws-secret-backend/main.tf diff --git a/fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/variables.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/variables.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/variables.tf rename to fdio.infra.terraform/terraform-vault-aws-secret-backend/variables.tf diff --git a/fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/versions.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/versions.tf similarity index 100% rename from fdio.infra.terraform/1n_nmd/vault-aws-secret-backend/versions.tf rename to fdio.infra.terraform/terraform-vault-aws-secret-backend/versions.tf -- 2.16.6