From 0c083564ce7f526d7950be757d2d0c6f84afd096 Mon Sep 17 00:00:00 2001 From: Cihan Demirci <128653800+fcdm@users.noreply.github.com> Date: Mon, 17 Apr 2023 13:25:27 +0100 Subject: [PATCH] Add us-east-1 hosts file and update regions (#4042) ## Describe your changes ## Issue ticket number and link ## Checklist before requesting a review - [x] I have performed a self-review of my code. - [ ] If it is a core feature, I have added thorough tests. - [ ] Do we need to implement analytics? if so did you add the relevant metrics to the dashboard? - [ ] If this PR requires public announcement, mark it with /release-notes label and add several sentences in this section. ## Checklist before merging - [ ] Do not forget to reformat commit message to not include the above checklist --- .github/ansible/prod.us-east-1.hosts.yaml | 50 +++++++++++++++++++++++ .github/workflows/deploy-prod.yml | 6 ++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 .github/ansible/prod.us-east-1.hosts.yaml diff --git a/.github/ansible/prod.us-east-1.hosts.yaml b/.github/ansible/prod.us-east-1.hosts.yaml new file mode 100644 index 0000000000..fcf472432b --- /dev/null +++ b/.github/ansible/prod.us-east-1.hosts.yaml @@ -0,0 +1,50 @@ +storage: + vars: + bucket_name: neon-prod-storage-us-east-1 + bucket_region: us-east-1 + console_mgmt_base_url: http://neon-internal-api.aws.neon.tech + broker_endpoint: http://storage-broker-lb.theta.us-east-1.internal.aws.neon.tech:50051 + pageserver_config_stub: + pg_distrib_dir: /usr/local + metric_collection_endpoint: http://neon-internal-api.aws.neon.tech/billing/api/v1/usage_events + metric_collection_interval: 10min + disk_usage_based_eviction: + max_usage_pct: 85 # TODO: decrease to 80 after all pageservers are below 80 + min_avail_bytes: 0 + period: "10s" + tenant_config: + eviction_policy: + kind: "LayerAccessThreshold" + period: "10m" + threshold: &default_eviction_threshold "24h" + evictions_low_residence_duration_metric_threshold: *default_eviction_threshold + remote_storage: + bucket_name: "{{ bucket_name }}" + bucket_region: "{{ bucket_region }}" + prefix_in_bucket: "pageserver/v1" + safekeeper_s3_prefix: safekeeper/v1/wal + hostname_suffix: "" + remote_user: ssm-user + ansible_aws_ssm_region: us-east-1 + ansible_aws_ssm_bucket_name: neon-prod-storage-us-east-1 + console_region_id: aws-us-east-1 + sentry_environment: production + + children: + pageservers: + hosts: + pageserver-0.us-east-1.aws.neon.tech: + ansible_host: i-0f58137883429f55a + pageserver-1.us-east-1.aws.neon.tech: + ansible_host: i-08e7ee6190a099019 + pageserver-2.us-east-1.aws.neon.tech: + ansible_host: i-0686a4e5e208e31a1 + + safekeepers: + hosts: + safekeeper-0.us-east-1.aws.neon.tech: + ansible_host: i-04ce739e88793d864 + safekeeper-1.us-east-1.aws.neon.tech: + ansible_host: i-0e9e6c9227fb81410 + safekeeper-2.us-east-1.aws.neon.tech: + ansible_host: i-072f4dd86a327d52f diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 6096ac8ab9..92c7eb2492 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -49,7 +49,7 @@ jobs: shell: bash strategy: matrix: - target_region: [ us-east-2, us-west-2, eu-central-1, ap-southeast-1 ] + target_region: [ us-east-2, us-west-2, eu-central-1, ap-southeast-1, us-east-1 ] environment: name: prod-${{ matrix.target_region }} steps: @@ -97,6 +97,10 @@ jobs: target_cluster: prod-ap-southeast-1-epsilon deploy_link_proxy: false deploy_legacy_scram_proxy: false + - target_region: us-east-1 + target_cluster: prod-us-east-1-theta + deploy_link_proxy: false + deploy_legacy_scram_proxy: false environment: name: prod-${{ matrix.target_region }} steps: