Skip to content

Commit

Permalink
update titiler with timeout setting, remove vpc
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil Varner committed May 30, 2024
1 parent 09574cb commit 878ab82
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
with:
stage: prod
url: https://console.modelmywatershed.org
fd-aws-tf-modules-version: v2.24.0
fd-aws-tf-modules-version: v2.26.0
2 changes: 1 addition & 1 deletion .github/workflows/deploy-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
with:
stage: staging
url: https://console.staging.modelmywatershed.org
fd-aws-tf-modules-version: v2.24.0
fd-aws-tf-modules-version: v2.26.0
2 changes: 1 addition & 1 deletion .github/workflows/validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Pre-commit CI
on: push

env:
fd-aws-tf-modules-version: v2.24.0
fd-aws-tf-modules-version: v2.26.0

jobs:
validate:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ The `bucket` name will be the value to be set for `TF_STATE_BUCKET`, e.g.,
Download the filmdrop-aws-tf-modules source:

```shell
./scripts/retrieve_tf_modules.sh v2.24.0
./scripts/retrieve_tf_modules.sh v2.26.0
```

Re-run this anytime you with to uptake a new `filmdrop-aws-tf-modules` release,
Expand Down
2 changes: 1 addition & 1 deletion scripts/retrieve_tf_modules.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -Eeuo pipefail
# set -x # print each command before executing
set -x # print each command before executing

FILMDROP_TERRAFORM_RELEASE=$1

Expand Down
14 changes: 5 additions & 9 deletions staging.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ s3_logs_archive_bucket = ""

##### INFRASTRUCTURE FLAGS ####
# To disable each flag: set to 'false'; to enable: set to 'true'
deploy_vpc = true
deploy_vpc = false
deploy_vpc_search = false
deploy_log_archive = true
deploy_alarms = false
Expand All @@ -24,18 +24,12 @@ deploy_sample_data_bucket = false
##### NETWORKING VARIABLES ####
# If left blank, the infrastructure will try to query the values from the control tower vpc
vpc_id = ""
vpc_cidr = "10.26.0.0/18"
vpc_cidr = ""
security_group_id = ""
public_subnets_az_to_id_map = {
"us-west-2a" = "10.26.0.0/22"
"us-west-2b" = "10.26.4.0/22"
"us-west-2c" = "10.26.8.0/22"
}

private_subnets_az_to_id_map = {
"us-west-2a" = "10.26.12.0/22"
"us-west-2b" = "10.26.16.0/22"
"us-west-2c" = "10.26.20.0/22"
}

##### ALARM VARIABLES ####
Expand All @@ -51,10 +45,12 @@ titiler_inputs = {
app_name = "titiler"
domain_alias = "tiler.staging.modelmywatershed.org"
deploy_cloudfront = true
mosaic_titiler_release_tag = "v0.14.0-1.0.4"
mosaic_titiler_release_tag = "v0.14.0-1.0.5"
stac_server_and_titiler_s3_arns = []
mosaic_titiler_waf_allowed_url = "https://api.impactobservatory.com/stac-aws/"
mosaic_titiler_host_header = "tiler.staging.modelmywatershed.org"
mosaic_titiler_host_header = "tiler.staging.modelmywatershed.org"
mosaic_tile_timeout = 300
web_acl_id = ""
auth_function = {
cf_function_name = ""
Expand Down

0 comments on commit 878ab82

Please sign in to comment.