From f0745eaf3e2d7111b6becfccac3134b18961e862 Mon Sep 17 00:00:00 2001 From: Flamarion Jorge <29267749+flamarion@users.noreply.github.com> Date: Thu, 7 Dec 2023 17:57:08 +0100 Subject: [PATCH 1/4] fix: Fix private access example (#155) * fix: Fix private access example * Remove test configuration --- examples/private-access-only/main.tf | 15 ++++++++------- examples/private-access-only/variables.tf | 19 +++++++++++++++++-- examples/private-access-only/versions.tf | 4 ++-- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/examples/private-access-only/main.tf b/examples/private-access-only/main.tf index 6c56c856..de412ae5 100644 --- a/examples/private-access-only/main.tf +++ b/examples/private-access-only/main.tf @@ -61,18 +61,19 @@ module "standard" { namespace = var.namespace public_access = false - wandb_license = var.wandb_license - domain_name = aws_route53_zone.private.name zone_id = aws_route53_zone.private.zone_id # Creating a custom VPC so that we can initalize a route53 zone first and configure a vpn - create_vpc = false - network_id = module.networking.vpc_id - network_private_subnets = module.networking.private_subnets - network_public_subnets = module.networking.public_subnets + create_vpc = false + network_id = module.networking.vpc_id + network_private_subnets = module.networking.private_subnets + network_public_subnets = module.networking.public_subnets + allowed_inbound_cidr = var.allowed_inbound_cidr + allowed_inbound_ipv6_cidr = var.allowed_inbound_ipv6_cidr + eks_cluster_version = var.eks_cluster_version } output "url" { value = module.standard.url -} \ No newline at end of file +} diff --git a/examples/private-access-only/variables.tf b/examples/private-access-only/variables.tf index e829a2ee..d66f3807 100644 --- a/examples/private-access-only/variables.tf +++ b/examples/private-access-only/variables.tf @@ -3,7 +3,22 @@ variable "namespace" { description = "Name prefix used for resources" } -variable "wandb_license" { - type = string +variable "allowed_inbound_cidr" { + default = ["0.0.0.0/0"] + nullable = false + type = list(string) } + +variable "allowed_inbound_ipv6_cidr" { + default = ["::/0"] + nullable = false + type = list(string) +} + +variable "eks_cluster_version" { + description = "EKS cluster kubernetes version" + default = "1.26" + nullable = false + type = string +} diff --git a/examples/private-access-only/versions.tf b/examples/private-access-only/versions.tf index ee9da534..6276e085 100644 --- a/examples/private-access-only/versions.tf +++ b/examples/private-access-only/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 3.60" + version = "~> 4.0" } } -} \ No newline at end of file +} From 18ca7f14d8a8d37fe7d231e798103d9693d92e57 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 7 Dec 2023 16:57:34 +0000 Subject: [PATCH 2/4] chore(release): version 3.4.1 [skip ci] ### [3.4.1](https://github.com/wandb/terraform-aws-wandb/compare/v3.4.0...v3.4.1) (2023-12-07) ### Bug Fixes * Fix private access example ([#155](https://github.com/wandb/terraform-aws-wandb/issues/155)) ([f0745ea](https://github.com/wandb/terraform-aws-wandb/commit/f0745eaf3e2d7111b6becfccac3134b18961e862)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99741a5a..ce5d2dff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. +### [3.4.1](https://github.com/wandb/terraform-aws-wandb/compare/v3.4.0...v3.4.1) (2023-12-07) + + +### Bug Fixes + +* Fix private access example ([#155](https://github.com/wandb/terraform-aws-wandb/issues/155)) ([f0745ea](https://github.com/wandb/terraform-aws-wandb/commit/f0745eaf3e2d7111b6becfccac3134b18961e862)) + ## [3.4.0](https://github.com/wandb/terraform-aws-wandb/compare/v3.3.0...v3.4.0) (2023-11-13) From 86dbc7df0de1aa6d2bc69862770ea67010354c20 Mon Sep 17 00:00:00 2001 From: George Scott Date: Thu, 7 Dec 2023 16:59:53 -0600 Subject: [PATCH 3/4] fix: Switch to gp3 volumes on EKS nodes (#146) * feat: Switch to GP3 volumes, enable monitoring * switch to gp3 volumes, use m7a instance type * add m6a instance type * Update variables.tf * Update variables.tf --- modules/app_eks/main.tf | 24 +++++++++++++----------- modules/app_eks/variables.tf | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/app_eks/main.tf b/modules/app_eks/main.tf index af6be069..d58211b4 100644 --- a/modules/app_eks/main.tf +++ b/modules/app_eks/main.tf @@ -64,19 +64,21 @@ module "eks" { node_groups = { primary = { - version = var.cluster_version, - desired_capacity = 2, - max_capacity = 5, - min_capacity = 2, - instance_types = var.instance_types, - iam_role_arn = aws_iam_role.node.arn, - create_launch_template = local.encrypt_ebs_volume, - disk_encrypted = local.encrypt_ebs_volume, - disk_kms_key_id = var.kms_key_arn, - force_update_version = local.encrypt_ebs_volume, # IMDsv2 - metadata_http_tokens = "required", + create_launch_template = local.encrypt_ebs_volume, + desired_capacity = 2, + disk_encrypted = local.encrypt_ebs_volume, + disk_kms_key_id = var.kms_key_arn, + disk_type = "gp3" + enable_monitoring = true + force_update_version = local.encrypt_ebs_volume, + iam_role_arn = aws_iam_role.node.arn, + instance_types = var.instance_types, + max_capacity = 5, metadata_http_put_response_hop_limit = 2 + metadata_http_tokens = "required", + min_capacity = 2, + version = var.cluster_version, } } diff --git a/modules/app_eks/variables.tf b/modules/app_eks/variables.tf index 35ef7701..6f0f5898 100644 --- a/modules/app_eks/variables.tf +++ b/modules/app_eks/variables.tf @@ -62,8 +62,8 @@ variable "kms_key_arn" { variable "instance_types" { description = "EC2 Instance type for primary node group." + nullable = false type = list(string) - default = ["m4.large"] } variable "lb_security_group_inbound_id" { From 9bbabcdf0fc75bf0847c7053245e2e9ea625a38a Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 7 Dec 2023 23:00:18 +0000 Subject: [PATCH 4/4] chore(release): version 3.4.2 [skip ci] ### [3.4.2](https://github.com/wandb/terraform-aws-wandb/compare/v3.4.1...v3.4.2) (2023-12-07) ### Bug Fixes * Switch to gp3 volumes on EKS nodes ([#146](https://github.com/wandb/terraform-aws-wandb/issues/146)) ([86dbc7d](https://github.com/wandb/terraform-aws-wandb/commit/86dbc7df0de1aa6d2bc69862770ea67010354c20)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce5d2dff..e3d4f8d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. +### [3.4.2](https://github.com/wandb/terraform-aws-wandb/compare/v3.4.1...v3.4.2) (2023-12-07) + + +### Bug Fixes + +* Switch to gp3 volumes on EKS nodes ([#146](https://github.com/wandb/terraform-aws-wandb/issues/146)) ([86dbc7d](https://github.com/wandb/terraform-aws-wandb/commit/86dbc7df0de1aa6d2bc69862770ea67010354c20)) + ### [3.4.1](https://github.com/wandb/terraform-aws-wandb/compare/v3.4.0...v3.4.1) (2023-12-07)