From fd4d85865e145f12330a4266be48fbdd6e919cf4 Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 9 Dec 2020 20:11:42 +0000 Subject: [PATCH] Refactor storage solution + Minio terraform module + XL mode enabled with erasure code + Upload script as a sample + Nginx terraform module + Updating ansible to reflect changes Signed-off-by: pmikus Change-Id: Ia8c439b749aa0de82bd6f1d0cfbecce4d7000a8f --- resources/tools/terraform/1n_nmd/main.tf | 40 --- .../terraform/1n_nmd/prod_storage/resources.tf | 9 - resources/tools/terraform/3n_azure_fsv2/.gitignore | 4 - .../lf_inventory/host_vars/10.32.8.14.yaml | 1 + .../lf_inventory/host_vars/10.32.8.15.yaml | 1 + .../lf_inventory/host_vars/10.32.8.16.yaml | 1 + .../lf_inventory/host_vars/10.32.8.17.yaml | 59 ++++ .../ansible/inventories/lf_inventory/hosts | 1 + terraform-ci-infra/1n_nmd/.gitignore | 1 + terraform-ci-infra/1n_nmd/.terraform.lock.hcl | 58 ++++ terraform-ci-infra/1n_nmd/main.tf | 71 +++++ terraform-ci-infra/1n_nmd/minio/conf/nomad/mc.hcl | 73 +++++ .../1n_nmd/minio/conf/nomad/minio.hcl | 212 ++++++-------- terraform-ci-infra/1n_nmd/minio/main.tf | 82 ++++++ terraform-ci-infra/1n_nmd/minio/outputs.tf | 21 ++ terraform-ci-infra/1n_nmd/minio/variables.tf | 170 ++++++++++++ terraform-ci-infra/1n_nmd/minio/versions.tf | 13 + .../1n_nmd/nginx/conf/nomad/nginx.hcl | 117 ++++---- terraform-ci-infra/1n_nmd/nginx/main.tf | 16 ++ terraform-ci-infra/1n_nmd/nginx/variables.tf | 13 + terraform-ci-infra/1n_nmd/nginx/versions.tf | 13 + terraform-ci-infra/1n_nmd/providers.tf | 21 ++ terraform-ci-infra/1n_nmd/terraform.tfstate | 309 +++++++++++++++++++++ terraform-ci-infra/1n_nmd/terraform.tfstate.backup | 281 +++++++++++++++++++ terraform-ci-infra/1n_nmd/tools/artifacts.py | 138 +++++++++ .../1n_nmd/variables.tf | 6 + .../1n_nmd/vpp_device}/prod_csit_shim.nomad | 0 .../1n_nmd/vpp_device}/resources.tf | 0 .../2n_aws_c5n}/.gitignore | 0 .../2n_aws_c5n/main.tf | 0 .../2n_aws_c5n/nic.tf | 0 .../3n_aws_c5n}/.gitignore | 0 .../3n_aws_c5n/main.tf | 0 .../3n_aws_c5n/nic.tf | 0 .../3n_azure_fsv2}/.gitignore | 0 .../3n_azure_fsv2/main.tf | 0 .../3n_azure_fsv2/nic.tf | 0 37 files changed, 1501 insertions(+), 230 deletions(-) delete mode 100644 resources/tools/terraform/1n_nmd/main.tf delete mode 100644 resources/tools/terraform/1n_nmd/prod_storage/resources.tf delete mode 100644 resources/tools/terraform/3n_azure_fsv2/.gitignore create mode 100644 resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml create mode 100644 terraform-ci-infra/1n_nmd/.gitignore create mode 100755 terraform-ci-infra/1n_nmd/.terraform.lock.hcl create mode 100644 terraform-ci-infra/1n_nmd/main.tf create mode 100644 terraform-ci-infra/1n_nmd/minio/conf/nomad/mc.hcl rename resources/tools/terraform/1n_nmd/prod_storage/prod-storage.nomad => terraform-ci-infra/1n_nmd/minio/conf/nomad/minio.hcl (58%) create mode 100644 terraform-ci-infra/1n_nmd/minio/main.tf create mode 100644 terraform-ci-infra/1n_nmd/minio/outputs.tf create mode 100644 terraform-ci-infra/1n_nmd/minio/variables.tf create mode 100644 terraform-ci-infra/1n_nmd/minio/versions.tf rename resources/tools/terraform/1n_nmd/prod_storage/prod-nginx.nomad => terraform-ci-infra/1n_nmd/nginx/conf/nomad/nginx.hcl (75%) create mode 100644 terraform-ci-infra/1n_nmd/nginx/main.tf create mode 100644 terraform-ci-infra/1n_nmd/nginx/variables.tf create mode 100644 terraform-ci-infra/1n_nmd/nginx/versions.tf create mode 100644 terraform-ci-infra/1n_nmd/providers.tf create mode 100644 terraform-ci-infra/1n_nmd/terraform.tfstate create mode 100644 terraform-ci-infra/1n_nmd/terraform.tfstate.backup create mode 100755 terraform-ci-infra/1n_nmd/tools/artifacts.py rename {resources/tools/terraform => terraform-ci-infra}/1n_nmd/variables.tf (57%) rename {resources/tools/terraform/1n_nmd/prod_vpp_device => terraform-ci-infra/1n_nmd/vpp_device}/prod_csit_shim.nomad (100%) rename {resources/tools/terraform/1n_nmd/prod_vpp_device => terraform-ci-infra/1n_nmd/vpp_device}/resources.tf (100%) rename {resources/tools/terraform/1n_nmd => terraform-ci-infra/2n_aws_c5n}/.gitignore (100%) rename {resources/tools/terraform => terraform-ci-infra}/2n_aws_c5n/main.tf (100%) rename {resources/tools/terraform => terraform-ci-infra}/2n_aws_c5n/nic.tf (100%) rename {resources/tools/terraform/2n_aws_c5n => terraform-ci-infra/3n_aws_c5n}/.gitignore (100%) rename {resources/tools/terraform => terraform-ci-infra}/3n_aws_c5n/main.tf (100%) rename {resources/tools/terraform => terraform-ci-infra}/3n_aws_c5n/nic.tf (100%) rename {resources/tools/terraform/3n_aws_c5n => terraform-ci-infra/3n_azure_fsv2}/.gitignore (100%) rename {resources/tools/terraform => terraform-ci-infra}/3n_azure_fsv2/main.tf (100%) rename {resources/tools/terraform => terraform-ci-infra}/3n_azure_fsv2/nic.tf (100%) diff --git a/resources/tools/terraform/1n_nmd/main.tf b/resources/tools/terraform/1n_nmd/main.tf deleted file mode 100644 index 330f647476..0000000000 --- a/resources/tools/terraform/1n_nmd/main.tf +++ /dev/null @@ -1,40 +0,0 @@ -terraform { - # This module is now only being tested with Terraform 0.13.5+. - required_version = ">= 0.13.5" -} - -provider "nomad" { - address = var.nomad_provider_address - alias = "yul1" -} - -# For convenience in simple configurations, a child module automatically -# inherits default (un-aliased) provider configurations from its parent. -# This means that explicit provider blocks appear only in the root module, -# and downstream modules can simply declare resources for that provider -# and have them automatically associated with the root provider -# configurations. - -# prod_storage -# + prod-group1-nginx -# + prod-group1-storage -# + services -# + docs.nginx.service.consul -# + logs.nginx.service.consul -# + storage.nginx.service.consul -module "prod_storage" { - source = "./prod_storage" - providers = { - nomad = nomad.yul1 - } -} - -# prod_vpp_device -# + prod-csit-shim-amd -# + prod-csit-shim-arm -module "prod_vpp_device" { - source = "./prod_vpp_device" - providers = { - nomad = nomad.yul1 - } -} \ No newline at end of file diff --git a/resources/tools/terraform/1n_nmd/prod_storage/resources.tf b/resources/tools/terraform/1n_nmd/prod_storage/resources.tf deleted file mode 100644 index 4c42927be6..0000000000 --- a/resources/tools/terraform/1n_nmd/prod_storage/resources.tf +++ /dev/null @@ -1,9 +0,0 @@ -resource "nomad_job" "prod_nginx" { - provider = nomad - jobspec = file("${path.module}/prod-nginx.nomad") -} - -resource "nomad_job" "prod_storage" { - provider = nomad - jobspec = file("${path.module}/prod-storage.nomad") -} \ No newline at end of file diff --git a/resources/tools/terraform/3n_azure_fsv2/.gitignore b/resources/tools/terraform/3n_azure_fsv2/.gitignore deleted file mode 100644 index fc64f0039f..0000000000 --- a/resources/tools/terraform/3n_azure_fsv2/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.terraform/ -.terraform.tfstate.lock.info -terraform.tfstate -terraform.tfstate.backup diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml index 4849733e18..dd2a2f5b95 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.14.yaml @@ -34,6 +34,7 @@ nomad_options: driver.raw_exec.enable: 1 docker.cleanup.image: true docker.privileged.enabled: true + docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" fingerprint.network.disallow_link_local: true nomad_retry_servers: [ "10.30.51.30", "10.30.51.32", "10.30.51.33" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml index e0058185cc..7e103cf8c7 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.15.yaml @@ -34,6 +34,7 @@ nomad_options: driver.raw_exec.enable: 1 docker.cleanup.image: true docker.privileged.enabled: true + docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" fingerprint.network.disallow_link_local: true nomad_retry_servers: [ "10.30.51.30", "10.30.51.32", "10.30.51.33" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml index 893b33e5bd..e1b47cae15 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.16.yaml @@ -34,6 +34,7 @@ nomad_options: driver.raw_exec.enable: 1 docker.cleanup.image: true docker.privileged.enabled: true + docker.volumes.enabled: true driver.whitelist: "docker,raw_exec,exec" fingerprint.network.disallow_link_local: true nomad_retry_servers: [ "10.30.51.30", "10.30.51.32", "10.30.51.33" ] diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml new file mode 100644 index 0000000000..6a4e238bdc --- /dev/null +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.17.yaml @@ -0,0 +1,59 @@ +--- +# file: host_vars/10.32.8.17.yaml + +hostname: "s57-nomad" +inventory_ipmi_hostname: "10.30.55.17" + +# User management. +users: + - username: localadmin + groups: [adm, sudo] + password: "$6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1" + ssh_key: + - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com" + - username: testuser + groups: [adm, sudo] + password: "$6$zpBUdQ4q$P2zKclumvCndWujgP/qQ8eMk3YZk7ESAom04Fqp26hJH2jWkMXEX..jqxzMdDLJKiDaDHIaSkQMVjHzd3cRLs1" + ssh_key: + - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com" + +# Nomad settings. +nomad_certificates: + - src: "{{ vault_nomad_v3_ca_file }}" + dest: "{{ nomad_ca_file }}" + - src: "{{ vault_nomad_v3_cert_file }}" + dest: "{{ nomad_cert_file }}" + - src: "{{ vault_nomad_v3_key_file }}" + dest: "{{ nomad_key_file }}" +nomad_datacenter: "yul1" +nomad_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" +nomad_name: "{{ hostname }}-{{ ansible_architecture }}" +nomad_node_role: "client" +nomad_node_class: "builder" +nomad_options: + driver.raw_exec.enable: 1 + docker.cleanup.image: true + docker.privileged.enabled: true + docker.volumes.enabled: true + driver.whitelist: "docker,raw_exec,exec" + fingerprint.network.disallow_link_local: true +nomad_retry_servers: [ "10.30.51.30", "10.30.51.32", "10.30.51.33" ] +nomad_servers: [ "10.30.51.32:4647", "10.30.51.33:4647", "10.30.51.30:4647" ] + +# Consul settigs. +consul_nomad_integration: true +consul_certificates: + - src: "{{ vault_consul_v1_ca_file }}" + dest: "{{ consul_ca_file }}" + - src: "{{ vault_consul_v1_cert_file }}" + dest: "{{ consul_cert_file }}" + - src: "{{ vault_consul_v1_key_file }}" + dest: "{{ consul_key_file }}" +consul_datacenter: "yul1" +consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" +consul_node_name: "{{ hostname }}" +consul_node_role: "client" +consul_retry_servers: + - "10.30.51.30" + - "10.30.51.32" + - "10.30.51.33" \ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts index d89fe4888f..741da675f1 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts @@ -61,6 +61,7 @@ all: 10.32.8.14: #s46-nomad - skylake 10.32.8.15: #s47-nomad - skylake 10.32.8.16: #s48-nomad - skylake + 10.32.8.17: #s57-nomad - skylake 10.30.51.39: #s53-nomad - thunderx 88xx 10.30.51.40: #s54-nomad - thunderx 88xx 10.30.51.65: #s52-nomad - thunderx 88xx diff --git a/terraform-ci-infra/1n_nmd/.gitignore b/terraform-ci-infra/1n_nmd/.gitignore new file mode 100644 index 0000000000..8b1a7baa3e --- /dev/null +++ b/terraform-ci-infra/1n_nmd/.gitignore @@ -0,0 +1 @@ +.terraform/ \ No newline at end of file diff --git a/terraform-ci-infra/1n_nmd/.terraform.lock.hcl b/terraform-ci-infra/1n_nmd/.terraform.lock.hcl new file mode 100755 index 0000000000..3a2e4ef85f --- /dev/null +++ b/terraform-ci-infra/1n_nmd/.terraform.lock.hcl @@ -0,0 +1,58 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/nomad" { + version = "1.4.11" + constraints = "~> 1.4.9" + hashes = [ + "h1:ElEvgyMfWoWyQbB6c51rGTjQlZKWf3QOvf5NhX/Vuyw=", + "zh:150d0ab25241a42f2ac5008878e0106c0887eec15181a40bee1433b87f01b8ed", + "zh:1d4ccda0729f12060e7f4ce5c6d83042d6d38ba2e546b68722ccb74832793b0c", + "zh:2964652181f59097aa1126f4b215b9232702b1a56df3e017e6b5683d5615714b", + "zh:42843e68bca24280e84ec600ae5d8f085fb26bdcdb4c0ccff2139ed81e1cb8c1", + "zh:4c6d90d40a360d84bc84c9af35c64056237537fa0f8118bf890fcf4e71f7b0f6", + "zh:51771ce42a99d7d4f5a4306367eee4cea72391c07f1f1c55c3c4a5c6a9eca53d", + "zh:6ab2389f1be6bb39d4966c253bf4fc77348e90f7e07ed2abb5ec5c90a4bbb615", + "zh:9b109254ea7ca6a5b0ede33b406cf5fed779f05672891bbd1cc3255c9cb17663", + "zh:a38c929d4fd03193cce94178c0fbaa1f7f09e93223ac71dc77c834d429b1c7c9", + "zh:bdc9bc10a1ecb5ae3da651df1709bf9d5474f25e310b73bdf32c86417674d32b", + ] +} + +provider "registry.terraform.io/hashicorp/template" { + version = "2.1.2" + constraints = "~> 2.1.2" + hashes = [ + "h1:8NcPRk3yxQtUlAT/YGfjBEJ76rQI2ljARYeIEjhtWho=", + "zh:149e4bf47ac21b67f6567767afcd29caaf0b0ca43714748093a00a2a98cd17a8", + "zh:2ff61a5eb7550e0df2baefccea78a8b621faef76154aad7ddf9c85c1d69f7ebf", + "zh:3b2d9a9f80754eb0a250a80e0dfdef385501697850a54ead744d1615e60fe648", + "zh:545b93c818035aac59f4a821644276c123a74aa210b1221974d832a6009df201", + "zh:5508512a522152a302591b399512fa736d8f57088c85ca74f7e00014db3a8c26", + "zh:701b56016a6db814ade171877375a2429b45979f97c2d112e4f2103f0433eb08", + "zh:90fc08165958538d8a099f17282c615d5b13f86bb215af33e2ca7551bf81996f", + "zh:affa6d409060c01a610854a395970d76701d0b07696e1ed6776b3f3b58014104", + "zh:b66ffed670bf0ed6714fa4ac26444a8e22f71ec6da134faf0b1f77fb2c13c666", + "zh:bb3d87db22f0ac56717eadde39690e3e27c1c01b10d0ecbe2e6e39f1e5c4d808", + "zh:c54b9693c9f348591432aabc808cbe1786bcda1cb70d312ef62a24545a14f945", + "zh:e7c8f8506cee5fa28f842714857d412a2b09e61127a0efe2a164c2f3d9bf2619", + ] +} + +provider "registry.terraform.io/hashicorp/vault" { + version = "2.16.0" + constraints = ">= 2.14.0" + hashes = [ + "h1:h27r8aZ5nwRfEelTQnJoA8s3TndJYPI7+3Df1DXIhXk=", + "zh:13dde74fac618ee0281bad60a60966a85d4a59c8420b15fd6499996fa1bc99b3", + "zh:1daad9da6c82f43cbd07bf1cfedf3c6960fb2f96bc59f94fd75d361065b8c51a", + "zh:68075d8e1824b745267ce9e4ef693b202b9282561811de6ccf7298935f482128", + "zh:86df4a4405413d575cd72985483163e62539afbd659fddef59fc637875b707e2", + "zh:8f8306ada4c1c44945ce5205e4f1cfbf5e3d46a9da2f3a1d0be17d32e4935845", + "zh:9eb75febcd6fcca9885a6f5e93293a200b2effbe31f47d265cc4d1346d42d29e", + "zh:a658b55b239bc7ad59a2bf55e7abbfe5f0111d37dd68b5d4bb947eee93969092", + "zh:af10679c241bd0e0168f57c24e839fd24c747f3e84b7bb6de3cd791471709249", + "zh:ee3030f36846de45450be088aa4c2b1f69246b2ecf40d7ea6a15a7f09ac5e5d0", + "zh:efe6cc23f77336604358e627b0b565c1421a97376e510a9cdaaf849524944713", + ] +} diff --git a/terraform-ci-infra/1n_nmd/main.tf b/terraform-ci-infra/1n_nmd/main.tf new file mode 100644 index 0000000000..cb79b416c0 --- /dev/null +++ b/terraform-ci-infra/1n_nmd/main.tf @@ -0,0 +1,71 @@ +# For convenience in simple configurations, a child module automatically +# inherits default (un-aliased) provider configurations from its parent. +# This means that explicit provider blocks appear only in the root module, +# and downstream modules can simply declare resources for that provider +# and have them automatically associated with the root provider +# configurations. +module "minio" { + source = "./minio" + providers = { + nomad = nomad.yul1 + } + + # nomad + nomad_datacenters = [ "yul1" ] + nomad_host_volume = "prod-volume-data1-1" + + # minio + minio_job_name = "prod-minio" + minio_group_count = 4 + minio_service_name = "storage" + minio_host = "http://10.32.8.1{4...7}" + minio_port = 9000 + minio_container_image = "minio/minio:RELEASE.2020-12-03T05-49-24Z" + minio_vault_secret = { + use_vault_provider = false, + vault_kv_policy_name = "kv-secret", + vault_kv_path = "secret/data/minio", + vault_kv_field_access_key = "access_key", + vault_kv_field_secret_key = "secret_key" + } + minio_data_dir = "/data/" + minio_use_host_volume = true + minio_use_canary = true + minio_resource_proxy = { + cpu = 200 + memory = 128 + } + minio_envs = [ "MINIO_BROWSER=\"off\"" ] + + # minio client + mc_job_name = "prod-mc" + mc_container_image = "minio/mc:RELEASE.2020-12-10T01-26-17Z" + mc_extra_commands = [ + "mc policy set public LOCALMINIO/logs.fd.io", + "mc policy set public LOCALMINIO/docs.fd.io", + "mc ilm add --expiry-days "180" LOCALMINIO/logs.fd.io", + "mc admin user add LOCALMINIO storage Storage1234", + "mc admin policy set LOCALMINIO writeonly user=storage" + ] + minio_buckets = [ "logs.fd.io", "docs.fd.io" ] +} + +module "nginx" { + source = "./nginx" + providers = { + nomad = nomad.yul1 + } + + # nomad + nomad_datacenters = [ "yul1" ] + + # nginx + nginx_job_name = "prod-nginx" +} + +#module "vpp_device" { +# source = "./vpp_device" +# providers = { +# nomad = nomad.yul1 +# } +#} \ No newline at end of file diff --git a/terraform-ci-infra/1n_nmd/minio/conf/nomad/mc.hcl b/terraform-ci-infra/1n_nmd/minio/conf/nomad/mc.hcl new file mode 100644 index 0000000000..238003bb00 --- /dev/null +++ b/terraform-ci-infra/1n_nmd/minio/conf/nomad/mc.hcl @@ -0,0 +1,73 @@ +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 = "global" + # + # 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. + # + # For more information, please see the online documentation at: + # + # https://www.nomadproject.io/docs/jobspec/schedulers.html + # + type = "batch" + + # 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. + # + # For more information and examples on the "group" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/group.html + # + group "prod-group1-mc" { + task "prod-task1-create-buckets" { + # The "driver" parameter specifies the task driver that should be used to + # run the task. + driver = "docker" + + %{ 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 { + image = "${image}" + entrypoint = [ + "/bin/sh", + "-c", + "${command}" + ] + dns_servers = [ "$${attr.unique.network.ip-address}" ] + privileged = false + } + + # 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_ACCESS_KEY = "{{ .Data.data.${vault_kv_field_access_key} }}" + MINIO_SECRET_KEY = "{{ .Data.data.${vault_kv_field_secret_key} }}" + {{ end }} + %{ else } + MINIO_ACCESS_KEY = "${access_key}" + MINIO_SECRET_KEY = "${secret_key}" + %{ endif } + ${ envs } + } + } + } +} diff --git a/resources/tools/terraform/1n_nmd/prod_storage/prod-storage.nomad b/terraform-ci-infra/1n_nmd/minio/conf/nomad/minio.hcl similarity index 58% rename from resources/tools/terraform/1n_nmd/prod_storage/prod-storage.nomad rename to terraform-ci-infra/1n_nmd/minio/conf/nomad/minio.hcl index 4e8f7ecb98..a2df44f666 100644 --- a/resources/tools/terraform/1n_nmd/prod_storage/prod-storage.nomad +++ b/terraform-ci-infra/1n_nmd/minio/conf/nomad/minio.hcl @@ -1,11 +1,11 @@ -job "prod-storage" { +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 = "global" # # The "datacenters" parameter specifies the list of datacenters which should # be considered when placing this task. This must be provided. - datacenters = [ "yul1" ] + 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 @@ -16,25 +16,27 @@ job "prod-storage" { # # https://www.nomadproject.io/docs/jobspec/schedulers.html # - type = "service" + 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 = 0 + max_parallel = 1 + + 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" + 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" + 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 @@ -44,11 +46,7 @@ job "prod-storage" { # deployment is marked as failed. progress_deadline = "10m" - # 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 = false - +%{ 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 @@ -58,15 +56,28 @@ job "prod-storage" { # 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 = 0 + canary = 1 + + # 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 = true + + # 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 = true +%{ endif } } # All groups in this job should be scheduled on different hosts. constraint { - operator = "distinct_hosts" - value = "true" + 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. # @@ -75,25 +86,20 @@ job "prod-storage" { # # https://www.nomadproject.io/docs/job-specification/group.html # - group "prod-group1-storage" { + group "prod-group1-minio" { # 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 = 2 - - # Hard coding prefered node as primary. - affinity { - attribute = "${attr.unique.hostname}" - value = "s46-nomad" - weight = 100 - } + count = ${group_count} # https://www.nomadproject.io/docs/job-specification/volume - volume "prod-volume1-storage" { + %{ if use_host_volume } + volume "prod-volume1-minio" { type = "host" read_only = false - source = "prod-volume-data1-1" + source = "${host_volume}" } + %{ endif } # The "task" stanza creates an individual unit of work, such as a Docker # container, web application, or batch processing. @@ -103,36 +109,54 @@ job "prod-storage" { # # https://www.nomadproject.io/docs/job-specification/task.html # - task "prod-task1-storage" { + task "prod-task1-minio" { # The "driver" parameter specifies the task driver that should be used to # run the task. - driver = "docker" + driver = "docker" + %{ if use_host_volume } volume_mount { - volume = "prod-volume1-storage" - destination = "/data/" - read_only = false + volume = "prod-volume1-minio" + destination = "${data_dir}" + 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 { - image = "minio/minio:RELEASE.2020-11-19T23-48-16Z" - dns_servers = [ "${attr.unique.network.ip-address}" ] - command = "server" - args = [ "/data/" ] + image = "${image}" + dns_servers = [ "$${attr.unique.network.ip-address}" ] + network_mode = "host" + command = "server" + args = [ "${host}:${port}${data_dir}" ] port_map { - http = 9000 + http = ${port} } - privileged = false + privileged = false } + # The env stanza configures a list of environment variables to populate + # the task's environment before starting. env { - MINIO_ACCESS_KEY = "minio" - MINIO_SECRET_KEY = "minio123" - MINIO_BROWSER = "off" +%{ if use_vault_provider } +{{ with secret "${vault_kv_path}" }} + MINIO_ACCESS_KEY = "{{ .Data.data.${vault_kv_field_access_key} }}" + MINIO_SECRET_KEY = "{{ .Data.data.${vault_kv_field_secret_key} }}" +{{ end }} +%{ else } + MINIO_ACCESS_KEY = "${access_key}" + MINIO_SECRET_KEY = "${secret_key}" +%{ endif } + ${ envs } } # The service stanza instructs Nomad to register a service with Consul. @@ -143,11 +167,11 @@ job "prod-storage" { # https://www.nomadproject.io/docs/job-specification/service.html # service { - name = "storage" + name = "${service_name}" port = "http" - tags = [ "storage${NOMAD_ALLOC_INDEX}" ] + tags = [ "storage$${NOMAD_ALLOC_INDEX}" ] check { - name = "alive" + name = "Min.io Server HTTP Check Live" type = "http" port = "http" protocol = "http" @@ -155,7 +179,16 @@ job "prod-storage" { path = "/minio/health/live" interval = "10s" timeout = "2s" - task = "${TASK}" + } + check { + name = "Min.io Server HTTP Check Ready" + type = "http" + port = "http" + protocol = "http" + method = "GET" + path = "/minio/health/ready" + interval = "10s" + timeout = "2s" } } @@ -170,87 +203,26 @@ job "prod-storage" { # https://www.nomadproject.io/docs/job-specification/resources.html # resources { - cpu = 2000 - memory = 2048 + cpu = ${cpu} + memory = ${memory} + # 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. + # + # For more information and examples on the "template" stanza, please see + # the online documentation at: + # + # https://www.nomadproject.io/docs/job-specification/network.html + # network { port "http" { - static = 9000 + static = ${port} } } } } - - task "prod-task2-sync" { - # The "raw_exec" parameter specifies the task driver that should be used - # to run the task. - driver = "raw_exec" - - # The "template" stanza instructs Nomad to manage a template, such as - # a configuration file or script. This template can optionally pull data - # from Consul or Vault to populate runtime configuration data. - # - # For more information and examples on the "template" stanza, please see - # the online documentation at: - # - # https://www.nomadproject.io/docs/job-specification/template.html - # - template { - data = <= 200 && var.minio_resource_proxy.memory >= 128 + error_message = "Proxy resource must be at least: cpu=200, memory=128." + } +} + +# MC +variable "mc_job_name" { + description = "Minio client job name" + type = string + default = "mc" +} + +variable "mc_service_name" { + description = "Minio client service name" + type = string + default = "mc" +} + +variable "mc_container_image" { + description = "Minio client docker image" + type = string + default = "minio/mc:latest" +} + +variable "mc_envs" { + description = "Minio client environment variables" + type = list(string) + default = [] +} + +variable "minio_buckets" { + description = "List of buckets to create on startup" + type = list(string) + default = [] +} + +variable "minio_upstreams" { + description = "List of upstream services (list of object with service_name, port)" + type = list(object({ + service_name = string, + port = number, + })) + default = [] +} + +variable "mc_extra_commands" { + description = "Extra commands to run in MC container after creating buckets" + type = list(string) + default = [""] +} \ No newline at end of file diff --git a/terraform-ci-infra/1n_nmd/minio/versions.tf b/terraform-ci-infra/1n_nmd/minio/versions.tf new file mode 100644 index 0000000000..960bd4bba6 --- /dev/null +++ b/terraform-ci-infra/1n_nmd/minio/versions.tf @@ -0,0 +1,13 @@ +terraform { + required_providers { + nomad = { + source = "hashicorp/nomad" + version = "~> 1.4.9" + } + template = { + source = "hashicorp/template" + version = "~> 2.1.2" + } + } + required_version = ">= 0.13" +} diff --git a/resources/tools/terraform/1n_nmd/prod_storage/prod-nginx.nomad b/terraform-ci-infra/1n_nmd/nginx/conf/nomad/nginx.hcl similarity index 75% rename from resources/tools/terraform/1n_nmd/prod_storage/prod-nginx.nomad rename to terraform-ci-infra/1n_nmd/nginx/conf/nomad/nginx.hcl index 2af62a06c3..9cb5f8ef45 100644 --- a/resources/tools/terraform/1n_nmd/prod_storage/prod-nginx.nomad +++ b/terraform-ci-infra/1n_nmd/nginx/conf/nomad/nginx.hcl @@ -1,11 +1,11 @@ -job "prod-nginx" { +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 = "global" # # The "datacenters" parameter specifies the list of datacenters which should # be considered when placing this task. This must be provided. - datacenters = [ "yul1" ] + 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 @@ -72,7 +72,6 @@ job "prod-nginx" { unlimited = 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. @@ -97,32 +96,6 @@ job "prod-nginx" { mode = "fail" } - # All groups in this job should be scheduled on different hosts. - constraint { - operator = "distinct_hosts" - value = "false" - } - - # Prioritize one node. - affinity { - attribute = "${attr.unique.hostname}" - value = "s46-nomad" - weight = 100 - } - - # The volume stanza allows the group to specify that it requires a given - # volume from the cluster. - # - # For more information and examples on the "volume" stanza, please see - # the online documentation at: - # - # https://www.nomadproject.io/docs/job-specification/volume - volume "prod-volume1-storage" { - type = "host" - read_only = false - source = "prod-volume-data1-1" - } - # The "task" stanza creates an individual unit of work, such as a Docker # container, web application, or batch processing. # @@ -136,19 +109,13 @@ job "prod-nginx" { # run the task. driver = "docker" - volume_mount { - volume = "prod-volume1-storage" - destination = "/data/" - read_only = true - } - # 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 { image = "nginx:stable" - dns_servers = [ "${attr.unique.network.ip-address}" ] + dns_servers = [ "$${attr.unique.network.ip-address}" ] port_map { https = 443 } @@ -156,6 +123,7 @@ job "prod-nginx" { volumes = [ "/etc/consul.d/ssl/consul.pem:/etc/ssl/certs/nginx-cert.pem", "/etc/consul.d/ssl/consul-key.pem:/etc/ssl/private/nginx-key.pem", + "custom/upstream.conf:/etc/nginx/conf.d/upstream.conf", "custom/logs.conf:/etc/nginx/conf.d/logs.conf", "custom/docs.conf:/etc/nginx/conf.d/docs.conf" ] @@ -170,6 +138,17 @@ job "prod-nginx" { # # https://www.nomadproject.io/docs/job-specification/template.html # + template { + data = <