chore(weave): Use app fullname for weave auth (#115)

wandb · Apr 16, 2024 · 6105c97 · 6105c97
1 parent f39f42c
commit 6105c97
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: operator-wandb
 description: A Helm chart for deploying W&B to Kubernetes
 type: application
-version: 0.12.7
+version: 0.12.8
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

diff --git a/charts/operator-wandb/charts/weave/templates/_helpers.tpl b/charts/operator-wandb/charts/weave/templates/_helpers.tpl
@@ -8,7 +8,7 @@ Expand the name of the chart.
 {{- end }}
 
 {{/*
-Create a default fully qualified app name.
+Create a default fully qualified app name. (Should be something like wandb-weave)
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
@@ -25,6 +25,24 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 {{- end }}
 
+{{/*
+Create a default fully qualified app name. (Should be something like wandb-app)
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "weave.appFullname" -}}
+{{- if .Values.app.fullnameOverride }}
+{{- .Values.app.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Values.app.serviceName .Values.app.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

diff --git a/charts/operator-wandb/charts/weave/templates/deployment.yaml b/charts/operator-wandb/charts/weave/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
             - name: WEAVE_LOCAL_ARTIFACT_DIR
               value: /vol/weave/cache
             - name: WEAVE_AUTH_GRAPHQL_URL
-              value: {{ .Values.global.host }}/graphql
+              value: http://{{ include "weave.appFullname" . }}.{{ $.Release.Namespace }}.svc.{{ .Values.app.clusterDomain }}:8080/graphql
             - name: WEAVE_SERVER_NUM_WORKERS
               value: "4"
 

diff --git a/charts/operator-wandb/charts/weave/values.yaml b/charts/operator-wandb/charts/weave/values.yaml
@@ -1,5 +1,12 @@
 enabled: true
 
+# These need to be set as well if app name overrides are set
+app:
+  serviceName: "app"
+  clusterDomain: "cluster.local"
+  nameOverride: ""
+  fullnameOverride: ""
+
 nameOverride: ""
 fullnameOverride: ""