Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade nwp in india production #763

Merged
merged 5 commits into from
Feb 6, 2025
Merged

upgrade nwp in india production #763

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af71a82
upgrade nwp in india production
peterdudfield Feb 4, 2025
3a69b46
upgrade version
peterdudfield Feb 4, 2025
fdc5230
upgrade airflow
peterdudfield Feb 5, 2025
c83c581
Merge branch 'main' into nwp-india-prod
peterdudfield Feb 5, 2025
f4f6073
Merge branch 'main' into nwp-india-prod
peterdudfield Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 36 additions & 35 deletions terraform/india/production/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,65 +125,68 @@ import {

# 4.0
module "nwp_consumer_ecmwf_live_ecs_task" {
source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/ecs_task?ref=205465e"
source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/ecs_task?ref=37046a3"

ecs-task_name = "nwp-consumer-ecmwf-india"
ecs-task_type = "consumer"
ecs-task_execution_role_arn = module.ecs-cluster.ecs_task_execution_role_arn
ecs-task_size = {
cpu = 2048
memory = 10240
cpu = 512
memory = 1024
}


aws-region = var.region
aws-environment = local.environment
aws-secretsmanager_secret_arn = aws_secretsmanager_secret.nwp_consumer_secret.arn

s3-buckets = [{
id: module.s3-nwp-bucket.bucket_id,
access_policy_arn: module.s3-nwp-bucket.write_policy_arn
}]
s3-buckets = [
{
id : module.s3-nwp-bucket.bucket_id,
access_policy_arn : module.s3-nwp-bucket.write_policy_arn
}
]

container-env_vars = [
{ "name" : "MODEL_REPOSITORY", "value" : "ecmwf-realtime" },
{ "name" : "MODEL", "value" : "hres-ifs-india" },
{ "name" : "AWS_REGION", "value" : var.region },
{ "name" : "ECMWF_REALTIME_S3_REGION", "value": "eu-west-1" },
{ "name" : "ECMWF_REALTIME_S3_BUCKET", "value" : "ocf-ecmwf-production" },
{ "name" : "ZARRDIR", "value" : "s3://${module.s3-nwp-bucket.bucket_id}/ecmwf/data" },
{ "name" : "LOGLEVEL", "value" : "DEBUG" },
{ "name" : "SENTRY_DSN", "value" : var.sentry_dsn },
{ "name" : "CONCURRENCY", "value" : "false" },
# legacy
{ "name" : "AWS_S3_BUCKET", "value" : module.s3-nwp-bucket.bucket_id },
{ "name" : "ECMWF_AWS_REGION", "value": "eu-west-1" },
{ "name" : "ECMWF_AWS_REGION", "value" : "eu-west-1" },
{ "name" : "ECMWF_AWS_S3_BUCKET", "value" : "ocf-ecmwf-production" },
{ "name" : "LOGLEVEL", "value" : "DEBUG" },
{ "name" : "ECMWF_AREA", "value" : "india" },
{ "name" : "SENTRY_DSN", "value" : var.sentry_dsn },
{ "name" : "ENVIRONMENT", "value" : local.environment },
]
container-secret_vars = ["ECMWF_AWS_ACCESS_KEY", "ECMWF_AWS_ACCESS_SECRET"]
container-secret_vars = [
{secret_policy_arn:aws_secretsmanager_secret.nwp_consumer_secret.arn,
values: ["ECMWF_REALTIME_S3_ACCESS_KEY", "ECMWF_REALTIME_S3_ACCESS_SECRET"]
}]
container-tag = var.version-nwp
container-name = "openclimatefix/nwp-consumer"
container-command = [
"download",
"--source=ecmwf-s3",
"--sink=s3",
"--rdir=ecmwf/raw",
"--zdir=ecmwf/data",
"--create-latest"
"consume"
]
}

# 4.1
module "nwp_consumer_gfs_live_ecs_task" {
source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/ecs_task?ref=205465e"
source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/ecs_task?ref=37046a3"

ecs-task_name = "nwp-consumer-gfs-india"
ecs-task_type = "consumer"
ecs-task_size = {
cpu = 1024
memory = 5120
storage = 60
cpu = 512
memory = 1024
}
ecs-task_execution_role_arn = module.ecs-cluster.ecs_task_execution_role_arn

aws-region = var.region
aws-environment = local.environment
aws-secretsmanager_secret_arn = aws_secretsmanager_secret.nwp_consumer_secret.arn

s3-buckets = [
{
Expand All @@ -193,29 +196,27 @@ module "nwp_consumer_gfs_live_ecs_task" {
]

container-env_vars = [
{ "name" : "MODEL_REPOSITORY", "value" : "gfs" },
{ "name" : "AWS_REGION", "value" : var.region },
{ "name" : "AWS_S3_BUCKET", "value" : module.s3-nwp-bucket.bucket_id },
{ "name" : "ZARRDIR", "value" : "s3://${module.s3-nwp-bucket.bucket_id}/gfs/data" },
{ "name" : "LOGLEVEL", "value" : "DEBUG" },
{ "name" : "SENTRY_DSN", "value" : var.sentry_dsn },
{ "name" : "CONCURRENCY", "value" : "false" },
# legacy
{ "name" : "AWS_S3_BUCKET", "value" : module.s3-nwp-bucket.bucket_id },
{ "name" : "ENVIRONMENT", "value" : local.environment },
]
container-secret_vars = []
container-tag = var.version-nwp
container-name = "openclimatefix/nwp-consumer"
container-command = [
"download",
"--source=gfs",
"--sink=s3",
"--rdir=gfs/raw",
"--zdir=gfs/data",
"--create-latest",
"--no-rename-vars"
"consume"
]
}

# 4.2
module "nwp-consumer-metoffice-live-ecs-task" {
source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/ecs_task?ref=f0ecf51"
source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/ecs_task?ref=37046a3"

ecs-task_name = "nwp-consumer-metoffice-india"
ecs-task_type = "consumer"
Expand Down Expand Up @@ -249,7 +250,7 @@ module "nwp-consumer-metoffice-live-ecs-task" {
values: ["METOFFICE_API_KEY"],
}
]
container-tag = "devsjc-major-refactor"
container-tag = var.version-nwp
container-name = "openclimatefix/nwp-consumer"
container-command = ["consume"]
}
Expand Down Expand Up @@ -442,7 +443,7 @@ module "forecast-ad" {

# 5.0
module "airflow" {
source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/airflow?ref=7e27e14"
source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/airflow?ref=631a791"
aws-environment = local.environment
aws-region = local.region
aws-domain = local.domain
Expand Down