Skip to content

Commit

Permalink
feat: Clean up chart
Browse files Browse the repository at this point in the history
  • Loading branch information
jsbroks committed Aug 29, 2023
1 parent b33d8e9 commit dd25b09
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 41 deletions.
14 changes: 2 additions & 12 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resource "helm_release" "operator" {
chart = "operator"
repository = "https://charts.wandb.ai"
version = var.operator_chart_version
namespace = var.operator_namespace
namespace = var.operator_chart_namespace
create_namespace = true
wait = true
atomic = false
Expand All @@ -30,20 +30,10 @@ resource "helm_release" "wandb" {
wait = true

set {
name = "wandbName"
name = "name"
value = "wandb"
}

set {
name = "domain"
value = var.wandb_fqdn
}

set {
name = "cloud"
value = var.wandb_cloud
}

set {
name = "spec"
value = yamlencode(var.spec)
Expand Down
16 changes: 1 addition & 15 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,13 @@ variable "wandb_namespace" {
description = "Kubernetes namespace where the operator will be deployed. By default, it uses the `default` namespace."
}

variable "wandb_fqdn" {
type = string
description = "The FQDN to the W&B application"
}

variable "wandb_cloud" {
type = string
validation {
condition = can(regex("^(google|aws|azure)$", var.wandb_cloud))
error_message = "The cloud provider must be one of google, aws, or azure"
}
description = "The cloud provider to use."
}

variable "controller_image_tag" {
type = string
default = "latest"
description = "wandb/controller image tag"
}

variable "operator_namespace" {
variable "operator_chart_namespace" {
type = string
default = "wandb"
description = "Kubernetes namespace where the operator CRD's will be deployed. By default, it uses the `default` namespace."
Expand Down
10 changes: 0 additions & 10 deletions wandb-cr/templates/google.yaml

This file was deleted.

3 changes: 2 additions & 1 deletion wandb-cr/templates/operator.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
apiVersion: apps.wandb.com/v1
kind: WeightsAndBiases
metadata:
name: {{ .Values.wandbName }}
name: {{ .Values.name }}
namespace: {{ .Release.Namespace }}
labels:
app.kubernetes.io/name: weightsandbiases
Expand Down
4 changes: 1 addition & 3 deletions wandb-cr/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
wandbName: "wandb"
cloud: ""
domain: ""
name: "wandb"
spec: {}

0 comments on commit dd25b09

Please sign in to comment.