From 50553186120f97a4ac418e2226dbdf1ace436df1 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Mon, 22 Aug 2022 10:30:43 +0000 Subject: [PATCH] fix(terraform): Cleanup Signed-off-by: Peter Mikus Change-Id: Ib3ea836c0c3c3ebc564745933c441c46c6b8467d --- .../terraform-aws-1n-aws-c5n/providers.tf | 2 +- .../terraform-aws-2n-aws-c5n/providers.tf | 2 +- .../terraform-aws-3n-aws-c5n/providers.tf | 2 +- .../terraform-nomad-loki/README.md | 52 ---- .../terraform-nomad-loki/conf/nomad/loki.hcl.tftpl | 261 --------------------- fdio.infra.terraform/terraform-nomad-loki/main.tf | 40 ---- .../terraform-nomad-loki/variables.tf | 127 ---------- .../terraform-nomad-loki/versions.tf | 9 - 8 files changed, 3 insertions(+), 492 deletions(-) delete mode 100644 fdio.infra.terraform/terraform-nomad-loki/README.md delete mode 100644 fdio.infra.terraform/terraform-nomad-loki/conf/nomad/loki.hcl.tftpl delete mode 100644 fdio.infra.terraform/terraform-nomad-loki/main.tf delete mode 100644 fdio.infra.terraform/terraform-nomad-loki/variables.tf delete mode 100644 fdio.infra.terraform/terraform-nomad-loki/versions.tf diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf index d0e7490d38..2482ca2839 100644 --- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf +++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf @@ -5,7 +5,7 @@ provider "aws" { } provider "vault" { - address = "http://vault.service.consul:8200" + address = "http://10.30.51.24:8200" skip_tls_verify = true token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf index d0e7490d38..2482ca2839 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf @@ -5,7 +5,7 @@ provider "aws" { } provider "vault" { - address = "http://vault.service.consul:8200" + address = "http://10.30.51.24:8200" skip_tls_verify = true token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf index d0e7490d38..2482ca2839 100644 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf +++ b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf @@ -5,7 +5,7 @@ provider "aws" { } provider "vault" { - address = "http://vault.service.consul:8200" + address = "http://10.30.51.24:8200" skip_tls_verify = true token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-nomad-loki/README.md b/fdio.infra.terraform/terraform-nomad-loki/README.md deleted file mode 100644 index 7fec0932db..0000000000 --- a/fdio.infra.terraform/terraform-nomad-loki/README.md +++ /dev/null @@ -1,52 +0,0 @@ - -## Requirements - -| Name | Version | -|------|---------| -| [terraform](#requirement\_terraform) | >= 1.1.4 | -| [nomad](#requirement\_nomad) | >= 1.4.16 | - -## Providers - -| Name | Version | -|------|---------| -| [nomad](#provider\_nomad) | 1.4.16 | - -## Modules - -No modules. - -## Resources - -| Name | Type | -|------|------| -| [nomad_job.nomad_job_prometheus](https://registry.terraform.io/providers/hashicorp/nomad/latest/docs/resources/job) | resource | - -## Inputs - -| Name | Description | Type | Default | Required | -|------|-------------|------|---------|:--------:| -| [auto\_promote](#input\_auto\_promote) | Specifies if the job should auto-promote to the canary version | `bool` | `true` | no | -| [auto\_revert](#input\_auto\_revert) | Specifies if the job should auto-revert to the last stable job | `bool` | `true` | no | -| [canary](#input\_canary) | Equal to the count of the task group allows blue/green depl. | `number` | `1` | no | -| [cpu](#input\_cpu) | CPU allocation | `number` | `2000` | no | -| [data\_dir](#input\_data\_dir) | Loki data dir allocation | `string` | `""` | no | -| [datacenters](#input\_datacenters) | Specifies the list of DCs to be considered placing this task | `list(string)` | 
[
  "dc1"
]
| no | -| [gl\_version](#input\_gl\_version) | Grafana Loki version | `string` | `"2.4.2"` | no | -| [group\_count](#input\_group\_count) | Specifies the number of the task groups running under this one | `number` | `1` | no | -| [job\_name](#input\_job\_name) | Specifies a name for the job | `string` | `"loki"` | no | -| [max\_parallel](#input\_max\_parallel) | Specifies the maximum number of updates to perform in parallel | `number` | `1` | no | -| [memory](#input\_memory) | Specifies the memory required in MB | `number` | `4096` | no | -| [port](#input\_port) | Specifies the static TCP/UDP port to allocate | `number` | `3100` | no | -| [region](#input\_region) | Specifies the list of DCs to be considered placing this task | `string` | `"global"` | no | -| [service\_name](#input\_service\_name) | Specifies the name this service will be advertised in Consul | `string` | `"loki"` | no | -| [use\_canary](#input\_use\_canary) | Uses canary deployment | `bool` | `true` | no | -| [use\_host\_volume](#input\_use\_host\_volume) | Use Nomad host volume feature | `bool` | `false` | no | -| [vault\_secret](#input\_vault\_secret) | Set of properties to be able to fetch secret from vault. | 
object({
    use_vault_provider        = bool,
    vault_kv_policy_name      = string,
    vault_kv_path             = string,
    vault_kv_field_access_key = string,
    vault_kv_field_secret_key = string
  })
| 
{
  "use_vault_provider": false,
  "vault_kv_field_access_key": "access_key",
  "vault_kv_field_secret_key": "secret_key",
  "vault_kv_path": "secret/data/prometheus",
  "vault_kv_policy_name": "kv"
}
| no | -| [volume\_destination](#input\_volume\_destination) | Specifies where the volume should be mounted inside the task | `string` | `""` | no | -| [volume\_source](#input\_volume\_source) | The name of the volume to request | `string` | `""` | no | - -## Outputs - -No outputs. - \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-nomad-loki/conf/nomad/loki.hcl.tftpl b/fdio.infra.terraform/terraform-nomad-loki/conf/nomad/loki.hcl.tftpl deleted file mode 100644 index 7b38437566..0000000000 --- a/fdio.infra.terraform/terraform-nomad-loki/conf/nomad/loki.hcl.tftpl +++ /dev/null @@ -1,261 +0,0 @@ -job "${job_name}" { - # The "region" parameter specifies the region in which to execute the job. - # If omitted, this inherits the default region name of "global". - # region = "${region}" - - # The "datacenters" parameter specifies the list of datacenters which should - # be considered when placing this task. This must be provided. - datacenters = "${datacenters}" - - # The "type" parameter controls the type of job, which impacts the scheduler's - # decision on placement. This configuration is optional and defaults to - # "service". For a full list of job types and their differences, please see - # the online documentation. - # - # https://www.nomadproject.io/docs/jobspec/schedulers - # - type = "service" - - update { - # The "max_parallel" parameter specifies the maximum number of updates to - # perform in parallel. In this case, this specifies to update a single task - # at a time. - max_parallel = ${max_parallel} - - health_check = "checks" - - # The "min_healthy_time" parameter specifies the minimum time the allocation - # must be in the healthy state before it is marked as healthy and unblocks - # further allocations from being updated. - min_healthy_time = "10s" - - # The "healthy_deadline" parameter specifies the deadline in which the - # allocation must be marked as healthy after which the allocation is - # automatically transitioned to unhealthy. Transitioning to unhealthy will - # fail the deployment and potentially roll back the job if "auto_revert" is - # set to true. - healthy_deadline = "3m" - - # The "progress_deadline" parameter specifies the deadline in which an - # allocation must be marked as healthy. The deadline begins when the first - # allocation for the deployment is created and is reset whenever an allocation - # as part of the deployment transitions to a healthy state. If no allocation - # transitions to the healthy state before the progress deadline, the - # deployment is marked as failed. - progress_deadline = "10m" - -%{ if use_canary } - # The "canary" parameter specifies that changes to the job that would result - # in destructive updates should create the specified number of canaries - # without stopping any previous allocations. Once the operator determines the - # canaries are healthy, they can be promoted which unblocks a rolling update - # of the remaining allocations at a rate of "max_parallel". - # - # Further, setting "canary" equal to the count of the task group allows - # blue/green deployments. When the job is updated, a full set of the new - # version is deployed and upon promotion the old version is stopped. - canary = ${canary} - - # Specifies if the job should auto-promote to the canary version when all - # canaries become healthy during a deployment. Defaults to false which means - # canaries must be manually updated with the nomad deployment promote - # command. - auto_promote = ${auto_promote} - - # The "auto_revert" parameter specifies if the job should auto-revert to the - # last stable job on deployment failure. A job is marked as stable if all the - # allocations as part of its deployment were marked healthy. - auto_revert = ${auto_revert} -%{ endif } - } - - # 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. - # - # https://www.nomadproject.io/docs/job-specification/group - # - group "${job_name}-group-1" { - # The "count" parameter specifies the number of the task groups that should - # be running under this group. This value must be non-negative and defaults - # to 1. - count = ${group_count} - - # The volume stanza allows the group to specify that it requires a given - # volume from the cluster. The key of the stanza is the name of the volume - # as it will be exposed to task configuration. - # - # https://www.nomadproject.io/docs/job-specification/volume - %{ if use_host_volume } - volume "${job_name}-volume-1" { - type = "host" - read_only = false - source = "${volume_source}" - } - %{ endif } - - # The restart stanza configures a tasks's behavior on task failure. Restarts - # happen on the client that is running the task. - # - # https://www.nomadproject.io/docs/job-specification/restart - # - restart { - interval = "30m" - attempts = 40 - delay = "15s" - 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 - # with other jobs and services. Because you don't know in advance what host - # your job will be provisioned on, Nomad will provide your tasks with - # network configuration when they start up. - # - # https://www.nomadproject.io/docs/job-specification/network - # - network { - 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 - # - task "${job_name}-task-1" { - # The "driver" parameter specifies the task driver that should be used to - # run the task. - driver = "exec" - - %{ if use_host_volume } - volume_mount { - volume = "${job_name}-volume-1" - destination = "${volume_destination}" - read_only = false - } - %{ endif } - - %{ if use_vault_provider } - vault { - policies = "${vault_kv_policy_name}" - } - %{ endif } - - # The "config" stanza specifies the driver configuration, which is passed - # directly to the driver to start the task. The details of configurations - # are specific to each driver, so please see specific driver - # documentation for more information. - config { - command = "local/loki-linux-amd64" - } - - # The artifact stanza instructs Nomad to fetch and unpack a remote resource, - # such as a file, tarball, or binary. Nomad downloads artifacts using the - # popular go-getter library, which permits downloading artifacts from a - # variety of locations using a URL as the input source. - # - # https://www.nomadproject.io/docs/job-specification/artifact - # - artifact { - source = "${url}" - args = [ - "-config.file secrets/config.yml" - ] - } - - template { - change_mode = "noop" - change_signal = "SIGINT" - destination = "secrets/loki.yml" - data = <