From db14fd41c072d0a947695722a58f9895ab4299bf Mon Sep 17 00:00:00 2001 From: amanpruthi Date: Tue, 17 Sep 2024 18:45:02 +0530 Subject: [PATCH 1/2] feat: Support license as a secretKeyRef --- main.tf | 10 +++++++--- variables.tf | 12 ++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/main.tf b/main.tf index 7f0f8ff..e324403 100644 --- a/main.tf +++ b/main.tf @@ -257,10 +257,14 @@ module "wandb" { spec = { values = { global = { - host = local.url - license = var.license + host = local.url + license = var.license + licenseSecret = { + name = var.license_secret_name, ## this will support wandb-operator chart version 0.17.9 + key = var.license_secret_key_name + } cloudProvider = "azure" - bucket = local.bucket_config == null ? { + bucket = local.bucket_config == null ? { provider = "az" name = module.storage[0].account.name path = "${module.storage[0].container.name}/${var.bucket_path}" diff --git a/variables.tf b/variables.tf index e5e5060..9c63886 100644 --- a/variables.tf +++ b/variables.tf @@ -308,3 +308,15 @@ variable "clickhouse_region" { description = "ClickHouse region (eastus2, westus3, etc)." default = "" } + +variable "license_secret_name" { + type = string + description = "Wandb licence secret name" + default = "" +} + +variable "license_secret_key_name" { + type = string + description = "Wandb licence secret key name" + default = "" +} From 03ba33fc257d9f6161a60c149043290059f0f1cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 17 Sep 2024 13:15:39 +0000 Subject: [PATCH 2/2] terraform-docs: automated action --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 56dafe2..928f619 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,8 @@ resources that lack official modules. | [kubernetes\_instance\_type](#input\_kubernetes\_instance\_type) | Use for the Kubernetes cluster. | `string` | `"Standard_D4a_v4"` | no | | [kubernetes\_node\_count](#input\_kubernetes\_node\_count) | n/a | `number` | `2` | no | | [license](#input\_license) | Your wandb/local license | `string` | n/a | yes | +| [license\_secret\_key\_name](#input\_license\_secret\_key\_name) | Wandb licence secret key name | `string` | `""` | no | +| [license\_secret\_name](#input\_license\_secret\_name) | Wandb licence secret name | `string` | `""` | no | | [location](#input\_location) | n/a | `string` | n/a | yes | | [namespace](#input\_namespace) | String used for prefix resources. | `string` | n/a | yes | | [node\_max\_pods](#input\_node\_max\_pods) | Maximum number of pods per node | `number` | `30` | no |