From 51be9000bbd8ea3c7690186dde954398b4c81205 Mon Sep 17 00:00:00 2001 From: rkuo-danswer Date: Tue, 3 Jun 2025 17:03:01 -0700 Subject: [PATCH] Feature/vespa bump (#4819) * bump cloudformation * update kubernetes * bump helm chart * bump docker compose * update chart.lock * ai accident! * bump vespa helm chart for fix * increase timeout --------- Co-authored-by: Richard Kuo (Onyx) --- ct.yaml | 3 ++- .../services/onyx_vespaengine_service_template.yaml | 6 ++++-- deployment/docker_compose/docker-compose.dev.yml | 4 +++- deployment/docker_compose/docker-compose.gpu-dev.yml | 4 +++- .../docker_compose/docker-compose.multitenant-dev.yml | 4 +++- deployment/docker_compose/docker-compose.prod-cloud.yml | 4 +++- .../docker_compose/docker-compose.prod-no-letsencrypt.yml | 4 +++- deployment/docker_compose/docker-compose.prod.yml | 2 +- .../docker_compose/docker-compose.search-testing.yml | 8 +++++--- deployment/helm/README.md | 5 +++++ deployment/helm/charts/onyx/Chart.lock | 6 +++--- deployment/helm/charts/onyx/Chart.yaml | 6 +++--- deployment/helm/charts/onyx/values.yaml | 2 +- deployment/kubernetes/vespa-service-deployment.yaml | 5 ++++- 14 files changed, 43 insertions(+), 20 deletions(-) diff --git a/ct.yaml b/ct.yaml index cec4478c850..e543c19388f 100644 --- a/ct.yaml +++ b/ct.yaml @@ -9,7 +9,8 @@ chart-repos: - vespa=https://onyx-dot-app.github.io/vespa-helm-charts - postgresql=https://charts.bitnami.com/bitnami -helm-extra-args: --debug --timeout 600s +# have seen postgres take 10 min to pull ... so 15 min seems like a good timeout? +helm-extra-args: --debug --timeout 900s # nginx appears to not work on kind, likely due to lack of loadbalancer support # helm-extra-set-args also only works on the command line, not in this yaml diff --git a/deployment/aws_ecs_fargate/cloudformation/services/onyx_vespaengine_service_template.yaml b/deployment/aws_ecs_fargate/cloudformation/services/onyx_vespaengine_service_template.yaml index 6d5d3ada39f..d5f375ff8f3 100644 --- a/deployment/aws_ecs_fargate/cloudformation/services/onyx_vespaengine_service_template.yaml +++ b/deployment/aws_ecs_fargate/cloudformation/services/onyx_vespaengine_service_template.yaml @@ -131,7 +131,7 @@ Resources: OperatingSystemFamily: LINUX ContainerDefinitions: - Name: vespaengine - Image: vespaengine/vespa:8.277.17 + Image: vespaengine/vespa:8.526.15 Cpu: 0 Essential: true PortMappings: @@ -162,7 +162,9 @@ Resources: awslogs-region: !Ref AWS::Region awslogs-stream-prefix: ecs User: "1000" - Environment: [] + Environment: + - Name: VESPA_SKIP_UPGRADE_CHECK + Value: "true" VolumesFrom: [] SystemControls: [] Volumes: diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml index db0d0e0ebea..a17daf8e3c1 100644 --- a/deployment/docker_compose/docker-compose.dev.yml +++ b/deployment/docker_compose/docker-compose.dev.yml @@ -391,8 +391,10 @@ services: # This container name cannot have an underscore in it due to Vespa expectations of the URL index: - image: vespaengine/vespa:8.277.17 + image: vespaengine/vespa:8.526.15 restart: always + environment: + - VESPA_SKIP_UPGRADE_CHECK=true ports: - "19071:19071" - "8081:8081" diff --git a/deployment/docker_compose/docker-compose.gpu-dev.yml b/deployment/docker_compose/docker-compose.gpu-dev.yml index bf0710e44fd..1ee0c5745e2 100644 --- a/deployment/docker_compose/docker-compose.gpu-dev.yml +++ b/deployment/docker_compose/docker-compose.gpu-dev.yml @@ -337,8 +337,10 @@ services: # This container name cannot have an underscore in it due to Vespa expectations of the URL index: - image: vespaengine/vespa:8.277.17 + image: vespaengine/vespa:8.526.15 restart: always + environment: + - VESPA_SKIP_UPGRADE_CHECK=true ports: - "19071:19071" - "8081:8081" diff --git a/deployment/docker_compose/docker-compose.multitenant-dev.yml b/deployment/docker_compose/docker-compose.multitenant-dev.yml index 8f2b06edb1d..225102599a5 100644 --- a/deployment/docker_compose/docker-compose.multitenant-dev.yml +++ b/deployment/docker_compose/docker-compose.multitenant-dev.yml @@ -364,8 +364,10 @@ services: # This container name cannot have an underscore in it due to Vespa expectations of the URL index: - image: vespaengine/vespa:8.277.17 + image: vespaengine/vespa:8.526.15 restart: always + environment: + - VESPA_SKIP_UPGRADE_CHECK=true ports: - "19071:19071" - "8081:8081" diff --git a/deployment/docker_compose/docker-compose.prod-cloud.yml b/deployment/docker_compose/docker-compose.prod-cloud.yml index 452755d3aef..09c82dc7820 100644 --- a/deployment/docker_compose/docker-compose.prod-cloud.yml +++ b/deployment/docker_compose/docker-compose.prod-cloud.yml @@ -158,8 +158,10 @@ services: # This container name cannot have an underscore in it due to Vespa expectations of the URL index: - image: vespaengine/vespa:8.277.17 + image: vespaengine/vespa:8.526.15 restart: always + environment: + - VESPA_SKIP_UPGRADE_CHECK=true ports: - "19071:19071" - "8081:8081" diff --git a/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml b/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml index 3f7efe88b19..ae9bde2febb 100644 --- a/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml +++ b/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml @@ -182,8 +182,10 @@ services: # This container name cannot have an underscore in it due to Vespa expectations of the URL index: - image: vespaengine/vespa:8.277.17 + image: vespaengine/vespa:8.526.15 restart: always + environment: + - VESPA_SKIP_UPGRADE_CHECK=true ports: - "19071:19071" - "8081:8081" diff --git a/deployment/docker_compose/docker-compose.prod.yml b/deployment/docker_compose/docker-compose.prod.yml index e46319ba1e2..96232b1a2b9 100644 --- a/deployment/docker_compose/docker-compose.prod.yml +++ b/deployment/docker_compose/docker-compose.prod.yml @@ -194,7 +194,7 @@ services: # This container name cannot have an underscore in it due to Vespa expectations of the URL index: - image: vespaengine/vespa:8.524.25 + image: vespaengine/vespa:8.526.15 restart: always environment: - VESPA_SKIP_UPGRADE_CHECK=true diff --git a/deployment/docker_compose/docker-compose.search-testing.yml b/deployment/docker_compose/docker-compose.search-testing.yml index 3a53fbda504..39bc6e42ad9 100644 --- a/deployment/docker_compose/docker-compose.search-testing.yml +++ b/deployment/docker_compose/docker-compose.search-testing.yml @@ -161,11 +161,13 @@ services: # This container name cannot have an underscore in it due to Vespa expectations of the URL index: - image: vespaengine/vespa:8.277.17 + image: vespaengine/vespa:8.526.15 restart: always + environment: + - VESPA_SKIP_UPGRADE_CHECK=true ports: - - "19071" - - "8081" + - "19071:19071" + - "8081:8081" volumes: - vespa_volume:/opt/vespa/var logging: diff --git a/deployment/helm/README.md b/deployment/helm/README.md index fbc08642127..9608f97bdc8 100644 --- a/deployment/helm/README.md +++ b/deployment/helm/README.md @@ -1,3 +1,8 @@ +# Dependency updates (when subchart versions are bumped) +* If updating subcharts, you need to run this before committing! +* cd charts/onyx +* helm dependency update . + # Local testing ## One time setup diff --git a/deployment/helm/charts/onyx/Chart.lock b/deployment/helm/charts/onyx/Chart.lock index 2b4a99bf8c6..1c995f5bfc7 100644 --- a/deployment/helm/charts/onyx/Chart.lock +++ b/deployment/helm/charts/onyx/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://onyx-dot-app.github.io/vespa-helm-charts - version: 0.2.20 + version: 0.2.23 - name: nginx repository: oci://registry-1.docker.io/bitnamicharts version: 15.14.0 - name: redis repository: https://charts.bitnami.com/bitnami version: 20.1.0 -digest: sha256:4615c033064a987e3f66a48f4744d2e88bd1cc932c79453c4928455695a72778 -generated: "2025-02-04T11:45:05.39228-08:00" +digest: sha256:28a9f2bb1c85822679a6583e03eb5885a9a0dfb11d03d969b7d783436604c43d +generated: "2025-06-03T15:21:29.377034-07:00" diff --git a/deployment/helm/charts/onyx/Chart.yaml b/deployment/helm/charts/onyx/Chart.yaml index 7575fb57aab..1a487c3606a 100644 --- a/deployment/helm/charts/onyx/Chart.yaml +++ b/deployment/helm/charts/onyx/Chart.yaml @@ -5,7 +5,7 @@ home: https://www.onyx.app/ sources: - "https://github.com/onyx-dot-app/onyx" type: application -version: 0.2.1 +version: 0.2.2 appVersion: latest annotations: category: Productivity @@ -16,14 +16,14 @@ annotations: - name: background image: docker.io/onyxdotapp/onyx-backend:latest - name: vespa - image: vespaengine/vespa:8.277.17 + image: vespaengine/vespa:8.526.15 dependencies: - name: postgresql version: 14.3.1 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.20 + version: 0.2.23 repository: https://onyx-dot-app.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx diff --git a/deployment/helm/charts/onyx/values.yaml b/deployment/helm/charts/onyx/values.yaml index bf0c69da404..b2c7e4c5a33 100644 --- a/deployment/helm/charts/onyx/values.yaml +++ b/deployment/helm/charts/onyx/values.yaml @@ -36,7 +36,7 @@ vespa: image: repository: vespa pullPolicy: IfNotPresent - tag: "8.277.17" + tag: "8.526.15" podAnnotations: {} podLabels: app: vespa diff --git a/deployment/kubernetes/vespa-service-deployment.yaml b/deployment/kubernetes/vespa-service-deployment.yaml index b3fcbe03666..76c354c13b9 100644 --- a/deployment/kubernetes/vespa-service-deployment.yaml +++ b/deployment/kubernetes/vespa-service-deployment.yaml @@ -35,7 +35,7 @@ spec: spec: containers: - name: vespa - image: vespaengine/vespa:8.277.17 + image: vespaengine/vespa:8.526.15 imagePullPolicy: IfNotPresent securityContext: privileged: true @@ -51,6 +51,9 @@ spec: volumeMounts: - name: vespa-volume mountPath: /opt/vespa/var/ + env: + - name: VESPA_SKIP_UPGRADE_CHECK + value: "true" volumeClaimTemplates: - metadata: name: vespa-volume