Skip to content

fix: Make bucket proxy conditional #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielpanzella merged 2 commits into from
Jul 14, 2026
Merged

fix: Make bucket proxy conditional #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42619b9
fix: Make bucket proxy conditional
danielpanzella Jul 14, 2026
1106901
fix: Remove nginx proxy
danielpanzella Jul 14, 2026
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
1 change: 1 addition & 0 deletions api/v2/weightsandbiases_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ type WandbAppSpec struct {
Version string `json:"version"`
Features map[string]bool `json:"features"`
InternalServiceAuth InternalServiceAuth `json:"internalServiceAuth,omitempty"`
BucketProxy bool `json:"bucketProxy"`

ServiceAccount ServiceAccountSpec `json:"serviceAccount,omitempty"`

Expand Down
3 changes: 3 additions & 0 deletions config/crd/bases/apps.wandb.com_weightsandbiases.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3821,6 +3821,8 @@ spec:
items:
type: string
type: array
bucketProxy:
type: boolean
features:
additionalProperties:
type: boolean
Expand Down Expand Up @@ -4280,6 +4282,7 @@ spec:
version:
type: string
required:
- bucketProxy
- features
- hostname
- version
Expand Down
162 changes: 12 additions & 150 deletions hack/testing-manifests/server-manifest/0.83.0-clickhouse-keeper.1/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ requiredOperatorVersion: ^2.0.0

features:
filestreamQueue: false
proxy: false

bucket:
default:
Expand Down Expand Up @@ -249,11 +248,20 @@ commonEnvvars:
- name: session-key
type: generatedSecret
- name: BUCKET_PROXY
value: "true"
sources:
- name: bucket-proxy
type: custom-resource
field: spec.wandb.bucketProxy
- name: GORILLA_GLUE_FILE_STORE_IS_PROXIED
value: "true"
sources:
- name: bucket-proxy
type: custom-resource
field: spec.wandb.bucketProxy
- name: GORILLA_FILE_STORE_IS_PROXIED
value: "true"
sources:
- name: bucket-proxy
type: custom-resource
field: spec.wandb.bucketProxy
- name: GORILLA_FILE_HOST
sources:
- name: hostname
Expand Down Expand Up @@ -912,152 +920,6 @@ applications:
- "python"
- "-m"
- "src.workers.evaluate_model_worker.evaluate_model_worker"
nginx-proxy:
name: nginx-proxy
legacyKey: nginx
features:
- proxy
image:
repository: nginxinc/nginx-unprivileged
tag: latest
commonEnvs:
env:
- name: UPSTREAM_FRONTEND
sources:
- name: frontend
type: service
proto: ""
path: ""
- name: UPSTREAM_API
sources:
- name: api
type: service
proto: ""
path: ""
- name: UPSTREAM_WEAVE_TRACE
sources:
- name: weave-trace
type: service
proto: ""
path: ""
- name: UPSTREAM_WEAVE
sources:
- name: weave
type: service
proto: ""
path: ""
- name: BUCKET_HOST
sources:
- name: default
type: bucket
field: host
- name: BUCKET_PORT
sources:
- name: default
type: bucket
field: port
- name: UPSTREAM_BUCKET
value: "$(BUCKET_HOST):$(BUCKET_PORT)"
files:
- name: envvar.conf.template
mountPath: /etc/nginx/templates
fileName: envvar.conf.template
inline: |
upstream frontend {
server $UPSTREAM_FRONTEND;
}

upstream api {
server $UPSTREAM_API;
}

upstream weave_trace {
server $UPSTREAM_WEAVE_TRACE;
}

upstream weave {
server $UPSTREAM_WEAVE;
}

upstream bucket {
server $UPSTREAM_BUCKET;
}

map $host $bucket{
default $UPSTREAM_BUCKET;
}
- name: nginx.conf
mountPath: /etc/nginx
fileName: nginx.conf
inline: |
worker_processes auto;

error_log /var/log/nginx/error.log notice;
pid /tmp/nginx.pid;

events {
worker_connections 1024;
}

http {

include /etc/nginx/conf.d/envvar.conf;

server {
listen 8080;
proxy_set_header Host $http_host;
client_max_body_size 0;
location / {
proxy_pass http://frontend;
}

location /api {
proxy_pass http://api;
}
location /artifacts {
proxy_pass http://api;
}
location /artifactsV2 {
proxy_pass http://api;
}

location /files {
proxy_pass http://api;
}

location /graphql {
proxy_pass http://api;
}

location /graphql2 {
proxy_pass http://api;
}

location /oidc {
proxy_pass http://api;
}

location /traces {
proxy_pass http://weave_trace;
}

location /weave/ {
proxy_pass http://weave/;
}

location /bucket {
proxy_ssl_verify off;
proxy_set_header Host $bucket;
proxy_pass https://bucket;
}
}
}
service:
type: NodePort
ports:
- name: http
port: 8080
protocol: TCP

migrations:
gorilla:
Expand Down
27 changes: 0 additions & 27 deletions hack/testing-manifests/server-manifest/0.83.0-clickhouse-keeper.1/sizing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,30 +1515,3 @@ applications:
enabled: true
maxReplicas: 8
minReplicas: 4
nginx-proxy:
sizing:
default:
autoscaling:
enabled: true
minReplicas: 2
maxReplicas: 4
resources:
limits:
cpu: "2"
memory: 2Gi
requests:
cpu: "2"
memory: 2Gi
micro:
resources:
limits:
cpu: "1"
memory: 2Gi
requests:
cpu: "1"
memory: 2Gi
autoscaling:
horizontal:
enabled: true
maxReplicas: 2
minReplicas: 1
Loading
Loading