Merge pull request #118 from resource-watch/staging

Staging
resource-watch · Mar 26, 2024 · 7a557f8 · 7a557f8
2 parents 3e1645c + c5df4d3
commit 7a557f8
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 211 deletions.
diff --git a/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf b/terraform-k8s-infrastructure/modules/k8s_microservice_routing/main.tf
@@ -263,7 +263,6 @@ resource "aws_api_gateway_deployment" "prod" {
       jsonencode(module.gfw-guira.endpoints),
       jsonencode(module.gfw-forma.endpoints),
       jsonencode(module.gfw-ogr.endpoints),
-      jsonencode(module.gfw-ogr-gfw-pro.endpoints),
       jsonencode(module.gfw-prodes.endpoints),
       jsonencode(module.gfw-umd.endpoints),
       jsonencode(module.gfw-user.endpoints),
@@ -971,23 +970,6 @@ module "gfw-ogr" {
   ]
 }
 
-module "gfw-ogr-gfw-pro" {
-  source           = "./microservices/gfw-ogr-gfw-pro"
-  api_gateway      = aws_api_gateway_rest_api.rw_api_gateway
-  cluster_ca       = var.cluster_ca
-  cluster_endpoint = var.cluster_endpoint
-  cluster_name     = var.cluster_name
-  x_rw_domain      = var.x_rw_domain
-  vpc              = var.vpc
-  vpc_link         = aws_api_gateway_vpc_link.rw_api_apps_lb_vpc_link
-  v1_resource      = module.v1_resource.aws_api_gateway_resource
-  connection_type  = "VPC_LINK"
-  require_api_key  = var.require_api_key
-
-  eks_asg_names = [
-    data.aws_autoscaling_groups.gfw_autoscaling_group.names.0
-  ]
-}
 
 module "gfw-prodes" {
   source           = "./microservices/gfw-prodes"

diff --git a/...k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/main.tf b/...k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/main.tf
diff --git a/...-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/outputs.tf b/...-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/outputs.tf
diff --git a/...nfrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/variables.tf b/...nfrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro/variables.tf
diff --git a/terraform-k8s-infrastructure/vars/terraform-dev.tfvars b/terraform-k8s-infrastructure/vars/terraform-dev.tfvars
@@ -10,4 +10,4 @@ elasticsearch_data_nodes_type            = "m5.large.elasticsearch"
 x_rw_domain                              = "dev-api.resourcewatch.org"
 namespaces                               = ["core", "aqueduct", "rw", "gfw", "prep", "climate-watch"]
 fw_backend_url                           = "https://dev-fw-api.globalforestwatch.org"
-require_api_key                          = true
+require_api_key                          = false
diff --git a/terraform-localstack/main.tf b/terraform-localstack/main.tf
@@ -80,7 +80,6 @@ resource "aws_api_gateway_deployment" "prod" {
       jsonencode(module.gfw-guira.endpoints),
       jsonencode(module.gfw-forma.endpoints),
       jsonencode(module.gfw-ogr.endpoints),
-      jsonencode(module.gfw-ogr-gfw-pro.endpoints),
       jsonencode(module.gfw-prodes.endpoints),
       jsonencode(module.gfw-umd.endpoints),
       jsonencode(module.gfw-user.endpoints),
@@ -465,15 +464,6 @@ module "gfw-ogr" {
   v2_resource     = module.v2_resource.aws_api_gateway_resource
 }
 
-module "gfw-ogr-gfw-pro" {
-  source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-ogr-gfw-pro"
-  api_gateway     = aws_api_gateway_rest_api.rw_api_gateway
-  x_rw_domain     = var.x_rw_domain
-  v1_resource     = module.v1_resource.aws_api_gateway_resource
-  connection_type = "INTERNET"
-  target_url      = var.microservice_host
-}
-
 module "gfw-prodes" {
   source          = "../terraform-k8s-infrastructure/modules/k8s_microservice_routing/microservices/gfw-prodes"
   api_gateway     = aws_api_gateway_rest_api.rw_api_gateway

diff --git a/terraform/vars/terraform-dev.tfvars b/terraform/vars/terraform-dev.tfvars
@@ -10,9 +10,9 @@ rds_instance_count       = 1
 db_instance_class        = "db.t3.medium"
 db_instance_count        = 1
 db_logs_exports          = ["audit", "profiler"]
-eks_version              = "1.24"
-eks_node_release_version = "1.24.7-20230105"
-ebs_csi_addon_version    = "v1.15.0-eksbuild.1"
+eks_version              = "1.29"
+eks_node_release_version = "1.29.0-20240202"
+ebs_csi_addon_version    = "v1.27.0-eksbuild.1"
 # apps_node_group_min_size          = 1
 # apps_node_group_max_size          = 16
 # apps_node_group_desired_size      = 3
@@ -22,6 +22,6 @@ ebs_csi_addon_version    = "v1.15.0-eksbuild.1"
 # gfw_node_group_desired_size       = 4
 # gfw_node_group_min_size_upscaled  = 2
 gateway_node_group_desired_size = 0
-hibernate                       = false
+hibernate                       = true
 aq_bucket_cors_allowed_origin   = "*"
 deploy_sparkpost_templates      = false
diff --git a/terraform/vars/terraform-production.tfvars b/terraform/vars/terraform-production.tfvars
@@ -16,5 +16,5 @@ ebs_csi_addon_version           = "v1.27.0-eksbuild.1"
 deploy_canaries                 = true
 gateway_node_group_desired_size = 2
 hibernate                       = false
-aq_bucket_cors_allowed_origin   = "https://wri.org/"
+aq_bucket_cors_allowed_origin   = "https://www.wri.org"
 deploy_sparkpost_templates      = true
diff --git a/terraform/vars/terraform-staging.tfvars b/terraform/vars/terraform-staging.tfvars
@@ -10,9 +10,9 @@ rds_instance_count              = 1
 db_instance_class               = "db.r5.large"
 db_instance_count               = 2
 db_logs_exports                 = ["audit", "profiler"]
-eks_version                     = "1.24"
-eks_node_release_version        = "1.24.7-20230105"
-ebs_csi_addon_version           = "v1.15.0-eksbuild.1"
+eks_version              = "1.29"
+eks_node_release_version = "1.29.0-20240202"
+ebs_csi_addon_version    = "v1.27.0-eksbuild.1"
 gateway_node_group_desired_size = 0
 hibernate                       = false