Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,11 @@ for app in ['app', 'console', 'executor', 'parquet', 'weave', 'weave-trace']:
postfix = current_values.get(app, {}).get('deploymentPostfix', "")
if postfix != "":
app_names[app] += '-' + postfix
k8s_resource(app_names['app'], objects=['wandb-app:ServiceAccount:' + current_namespace])
k8s_resource(app_names['console'])

if current_values.get('app', {}).get('install', False):
k8s_resource(app_names['app'], objects=['wandb-app:ServiceAccount:' + current_namespace])
if current_values.get('console', {}).get('install', False):
k8s_resource(app_names['console'])
k8s_resource("wandb-nginx", port_forwards=settings["forwardedPorts"]["nginx"], objects=['wandb-console:ServiceAccount:' + current_namespace])
if current_values.get('anaconda2', {}).get('install', False):
k8s_resource('wandb-anaconda2', objects=['wandb-anaconda2:ServiceAccount:' + current_namespace])
Expand Down
10 changes: 9 additions & 1 deletion charts/operator-wandb/templates/frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@ metadata:
labels:
{{- include "wandb.commonLabels" . | nindent 4 }}
data:
{{- if not .Values.app.install }}
FRONTEND_APP_BACKEND: "{{ .Release.Name }}-api:8081"
FRONTEND_AUTH_BACKEND: "{{ .Release.Name }}-api:8081"

# this doesn't actually work, but the FE pod currently requires this host to be valid
FRONTEND_LOCAL_BACKEND: "{{ .Release.Name }}-api:8083"
{{- else }}
FRONTEND_APP_BACKEND: "{{ .Release.Name }}-app:8080"
FRONTEND_AUTH_BACKEND: "{{ .Release.Name }}-app:8080"
FRONTEND_WEAVE_BACKEND: "{{ .Release.Name }}-weave:9994"
FRONTEND_LOCAL_BACKEND: "{{ .Release.Name }}-app:8083"
{{- end }}
FRONTEND_WEAVE_BACKEND: "{{ .Release.Name }}-weave:9994"
REACT_APP_GIT_TAG: "HEAD"
REACT_APP_HOST: "{{ .Values.global.host }}"
REACT_APP_ENVIRONMENT_NAME: "local"
Expand Down
6 changes: 6 additions & 0 deletions charts/operator-wandb/templates/nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,15 @@ data:
listen 8080;
proxy_set_header Host $host:8080;
client_max_body_size 0;
{{- if .Values.frontend.install }}
location / {
proxy_pass http://{{ .Release.Name }}-frontend:8080;
}
{{- else }}
location / {
proxy_pass http://{{ .Release.Name }}-app:8080;
}
{{- end }}
location /console {
proxy_pass http://{{ .Release.Name }}-console:8082;
}
Expand Down
72 changes: 72 additions & 0 deletions test-configs/operator-wandb/separate-pods-no-app.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
global:
repositoryPrefix: "us-docker.pkg.dev/wandb-production/public"
imageRegistry: "us-docker.pkg.dev/wandb-production/public"
bucket:
provider: "s3"
name: "minio:9000/bucket"
region: "us-east-1"
accessKey: "minio"
secretKey: "testpassword"
env:
GLOBAL_ADMIN_API_KEY: "local-e6473d304d3487851f5e2501657d3d81f8420874"
GORILLA_INSECURE_ALLOW_API_KEY_ADMIN_ACCESS: "true"
BUCKET_PROXY: "true"
GORILLA_GLUE_FILE_STORE_IS_PROXIED: "true"
GORILLA_FILE_STORE_IS_PROXIED: "true"
redis:
password: "redis123"
glue:
enabled: true
api:
enabled: true
executor:
enabled: true
size: "testing"

app:
install: false

executor:
install: true

filemeta:
install: true

frontend:
install: true

nginx:
install: true
additionalServices:
bucket:
host: "http://minio:9000"
headers:
Host: "minio:9000"

ingress:
install: false
create: false

mysql:
install: true
resources:
requests:
cpu: "50m"
memory: "64Mi"

redis:
install: true
resources:
requests:
cpu: "50m"
memory: "64Mi"

reloader:
install: true
resources:
requests:
cpu: "50m"
memory: "64Mi"

anaconda2:
install: true
Loading