Merge branch 'main' into sa-solutions/issues/1

wandb · Jan 7, 2025 · 53e51f7 · 53e51f7
2 parents eab9c15 + 388483b
commit 53e51f7
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.0.0](https://github.com/wandb/terraform-aws-wandb/compare/v5.2.2...v6.0.0) (2025-01-07)
+
+
+### ⚠ BREAKING CHANGES
+
+* Bump helm-wandb vers to v2.0.0, requires TF > 1.9 (#315)
+
+### Features
+
+* Bump helm-wandb vers to v2.0.0, requires TF > 1.9 ([#315](https://github.com/wandb/terraform-aws-wandb/issues/315)) ([0f4b21c](https://github.com/wandb/terraform-aws-wandb/commit/0f4b21c35d9bfcc746cd52f159b1653892cff366))
+
 ### [5.2.2](https://github.com/wandb/terraform-aws-wandb/compare/v5.2.1...v5.2.2) (2024-12-26)
 
 

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ audit logging and SAML single sign-on.
 This module is intended to run in an AWS account with minimal preparation,
 however it does have the following pre-requisites:
 
-### Terrafom version >= 1.5
+### Terrafom version >= 1.9
 
 ### Credentials / Permissions
 

diff --git a/examples/byo-vpc-eks-sql-redis/main.tf b/examples/byo-vpc-eks-sql-redis/main.tf
@@ -160,7 +160,7 @@ locals {
 
 module "wandb" {
   source  = "wandb/wandb/helm"
-  version = "1.2.0"
+  version = "2.0.0"
 
   depends_on = [
     module.app_lb,

diff --git a/examples/byo-vpc-sql/main.tf b/examples/byo-vpc-sql/main.tf
@@ -264,7 +264,7 @@ locals {
 
 module "wandb" {
   source  = "wandb/wandb/helm"
-  version = "1.2.0"
+  version = "2.0.0"
 
   depends_on = [
     module.app_eks,

diff --git a/main.tf b/main.tf
@@ -252,7 +252,7 @@ locals {
 
 module "wandb" {
   source  = "wandb/wandb/helm"
-  version = "1.2.0"
+  version = "2.0.0"
 
   depends_on = [
     module.database,
@@ -262,6 +262,7 @@ module "wandb" {
 
   operator_chart_version = var.operator_chart_version
   controller_image_tag   = var.controller_image_tag
+  enable_helm_release    = var.enable_helm_release
 
   spec = {
     values = {

diff --git a/variables.tf b/variables.tf
@@ -38,6 +38,12 @@ variable "controller_image_tag" {
   default     = "1.14.0"
 }
 
+variable "enable_helm_release" {
+  type        = bool
+  default     = true
+  description = "Enable or disable applying and releasing Helm chart"
+}
+
 ##########################################
 # Database                               #
 ##########################################

diff --git a/versions.tf b/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.0"
+  required_version = "~> 1.9"
   required_providers {
     aws = {
       source  = "hashicorp/aws"