Merge remote-tracking branch 'origin/main' into operator-phase2

wandb · Jan 9, 2024 · d09f004 · d09f004
2 parents 6281da7 + a5a7bf2
commit d09f004
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+### [4.0.2](https://github.com/wandb/terraform-aws-wandb/compare/v4.0.1...v4.0.2) (2024-01-09)
+
+
+### Bug Fixes
+
+* EFS index vs subnet for_each ([#163](https://github.com/wandb/terraform-aws-wandb/issues/163)) ([1e47177](https://github.com/wandb/terraform-aws-wandb/commit/1e47177a0017ef694e7667781111d9ce2d375f2b))
+
+### [4.0.1](https://github.com/wandb/terraform-aws-wandb/compare/v4.0.0...v4.0.1) (2024-01-09)
+
+
+### Bug Fixes
+
+* Disable gorilla glue tasks ([#161](https://github.com/wandb/terraform-aws-wandb/issues/161)) ([5d24bda](https://github.com/wandb/terraform-aws-wandb/commit/5d24bda4fead8d79b3e06d488ecb824980a3d15b))
+
 ## [4.0.0](https://github.com/wandb/terraform-aws-wandb/compare/v3.4.2...v4.0.0) (2024-01-08)
 
 

diff --git a/examples/public-dns-external/main.tf b/examples/public-dns-external/main.tf
@@ -1,5 +1,5 @@
 provider "aws" {
-  region  = "us-west-2"
+  region = "us-west-2"
 
   default_tags {
     tags = {
@@ -36,7 +36,7 @@ module "wandb_infra" {
   zone_id     = var.zone_id
   subdomain   = var.subdomain
 
-  # license = var.wandb_license
+  license = var.wandb_license
 
   bucket_name        = var.bucket_name
   bucket_kms_key_arn = var.bucket_kms_key_arn

diff --git a/main.tf b/main.tf
@@ -242,6 +242,12 @@ module "wandb" {
         }
       }
 
+      app = {
+        extraEnv = {
+          "GORILLA_GLUE_LIST" = "true"
+        }
+      }
+
       mysql = { install = false }
       redis = { install = false }
 

diff --git a/modules/app_eks/efs.tf b/modules/app_eks/efs.tf
@@ -34,7 +34,8 @@ resource "aws_security_group_rule" "nfs_ingress" {
 }
 
 resource "aws_efs_mount_target" "storage_class" {
-  for_each        = { for subnet in var.network_private_subnets : subnet => subnet }
+  for_each = { for index, subnet in var.network_private_subnets : index => subnet }
+
   file_system_id  = aws_efs_file_system.storage_class.id
   subnet_id       = each.value
   security_groups = [aws_security_group.storage_class_nfs.id]