From b15d7de9cf66aea5e4fadf66440b3cb0fb0f716f Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Mon, 4 Nov 2024 20:49:01 -0800 Subject: [PATCH 01/34] re-enable helm --- ...m-chart-testing.yml.disabled.txt => pr-helm-chart-testing.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{pr-helm-chart-testing.yml.disabled.txt => pr-helm-chart-testing.yml} (100%) diff --git a/.github/workflows/pr-helm-chart-testing.yml.disabled.txt b/.github/workflows/pr-helm-chart-testing.yml similarity index 100% rename from .github/workflows/pr-helm-chart-testing.yml.disabled.txt rename to .github/workflows/pr-helm-chart-testing.yml From bf9943d879de6e4fc75f707b799e62ca2ab8e7a0 Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Mon, 4 Nov 2024 21:29:57 -0800 Subject: [PATCH 02/34] allow manual triggering --- .github/workflows/pr-helm-chart-testing.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-helm-chart-testing.yml b/.github/workflows/pr-helm-chart-testing.yml index eeb1715b1c2..c7797764447 100644 --- a/.github/workflows/pr-helm-chart-testing.yml +++ b/.github/workflows/pr-helm-chart-testing.yml @@ -9,7 +9,8 @@ on: merge_group: pull_request: branches: [ main ] - + workflow_dispatch: # Allows manual triggering + jobs: lint-test: # See https://runs-on.com/runners/linux/ @@ -18,7 +19,7 @@ jobs: # fetch-depth 0 is required for helm/chart-testing-action steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 From 3be519531411fac272fe4951737bf30188919f60 Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Mon, 4 Nov 2024 21:30:10 -0800 Subject: [PATCH 03/34] change vespa host --- deployment/helm/charts/danswer/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/helm/charts/danswer/templates/configmap.yaml b/deployment/helm/charts/danswer/templates/configmap.yaml index 6236e1b62a4..89a85301103 100755 --- a/deployment/helm/charts/danswer/templates/configmap.yaml +++ b/deployment/helm/charts/danswer/templates/configmap.yaml @@ -7,7 +7,7 @@ metadata: data: INTERNAL_URL: "http://{{ include "danswer-stack.fullname" . }}-api-service:{{ .Values.api.service.port | default 8080 }}" POSTGRES_HOST: {{ .Release.Name }}-postgresql - VESPA_HOST: "document-index-service" + VESPA_HOST: {{ .Release.Name }}-vespa REDIS_HOST: {{ .Release.Name }}-redis-master MODEL_SERVER_HOST: "{{ include "danswer-stack.fullname" . }}-inference-model-service" INDEXING_MODEL_SERVER_HOST: "{{ include "danswer-stack.fullname" . }}-indexing-model-service" From b025287b108d8261a3a77b788bcf94d67a99b7f4 Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Tue, 5 Nov 2024 00:18:13 -0800 Subject: [PATCH 04/34] change vespa chart location --- deployment/helm/charts/danswer/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index 4205546c6c3..237979a9988 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,8 +23,8 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.3 - repository: https://unoplat.github.io/vespa-helm-charts + version: 0.2.4 + repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx version: 15.14.0 From 022afb088eeb14916ce50d7ed4888540ced5abdd Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Tue, 5 Nov 2024 01:21:45 -0800 Subject: [PATCH 05/34] update Chart.lock --- deployment/helm/charts/danswer/Chart.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index db7b18539ed..3d1b320aa0f 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -3,13 +3,13 @@ dependencies: repository: https://charts.bitnami.com/bitnami version: 14.3.1 - name: vespa - repository: https://unoplat.github.io/vespa-helm-charts - version: 0.2.3 + repository: https://danswer-ai.github.io/vespa-helm-charts + version: 0.2.4 - 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:fb42426c1d13667a4929d0d6a7d681bf08120e4a4eb1d15437e4ec70920be3f8 -generated: "2024-09-11T09:16:03.312328-07:00" +digest: sha256:23f5596ed01b507f399cb909207100734348fa0524fc95a51bf8adec591409dd +generated: "2024-11-05T01:21:06.779605-08:00" From 11645d1e326b43b0386638b5877950597dafa01a Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Tue, 5 Nov 2024 09:43:55 -0800 Subject: [PATCH 06/34] update ct.yaml with new vespa chart repo --- ct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct.yaml b/ct.yaml index 14c557d8f3f..08470bd8d26 100644 --- a/ct.yaml +++ b/ct.yaml @@ -4,7 +4,7 @@ chart-dirs: - deployment/helm/charts chart-repos: - - vespa=https://unoplat.github.io/vespa-helm-charts + - vespa=https://danswer-ai.github.io/vespa-helm-charts - postgresql=https://charts.bitnami.com/bitnami helm-extra-args: --timeout 600s From aa3df641591246140289bdd2c67b38a78b3d05d0 Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Tue, 5 Nov 2024 18:02:46 -0800 Subject: [PATCH 07/34] bump vespa to 0.2.5 --- deployment/helm/charts/danswer/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index 237979a9988..a857ee69024 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.4 + version: 0.2.5 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx From 34a317eba85f396afabad84e072e0449878667db Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Tue, 5 Nov 2024 18:24:47 -0800 Subject: [PATCH 08/34] update Chart.lock --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index 3d1b320aa0f..48595bb09b8 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.4 + version: 0.2.5 - 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:23f5596ed01b507f399cb909207100734348fa0524fc95a51bf8adec591409dd -generated: "2024-11-05T01:21:06.779605-08:00" +digest: sha256:752fe626e4b98c5f9448f3bb8122b0534a7aa7b2617cddfbbd0a34bfb089b879 +generated: "2024-11-05T18:24:28.818745-08:00" From 0c13ab2e4526c7743ea9ec621ae97273ff00a20d Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Tue, 5 Nov 2024 20:04:52 -0800 Subject: [PATCH 09/34] update to vespa 0.2.6 --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- deployment/helm/charts/danswer/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index 48595bb09b8..02409ef28aa 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.5 + version: 0.2.6 - 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:752fe626e4b98c5f9448f3bb8122b0534a7aa7b2617cddfbbd0a34bfb089b879 -generated: "2024-11-05T18:24:28.818745-08:00" +digest: sha256:ab51db95bcef59739360783b0f680533ab58f478a024bec058f764218361ec46 +generated: "2024-11-05T20:04:25.696329-08:00" diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index a857ee69024..5bff725f5e3 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.5 + version: 0.2.6 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx From 1c5ab824f4c303604a257add5772c2dc7f4b1754 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Tue, 5 Nov 2024 21:18:27 -0800 Subject: [PATCH 10/34] bump vespa to 0.2.7 --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- deployment/helm/charts/danswer/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index 02409ef28aa..a08545433d9 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.6 + version: 0.2.7 - 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:ab51db95bcef59739360783b0f680533ab58f478a024bec058f764218361ec46 -generated: "2024-11-05T20:04:25.696329-08:00" +digest: sha256:2894595ceb5ebd5ca0e24edcf75b60b80514356162757b77308581e3d6ab692f +generated: "2024-11-05T21:17:48.815911-08:00" diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index 5bff725f5e3..9e931544333 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.6 + version: 0.2.7 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx From 8b3d16f868f604bdc499e718303e671c5b1a5f3a Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Tue, 5 Nov 2024 22:03:23 -0800 Subject: [PATCH 11/34] bump to 0.2.8 --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- deployment/helm/charts/danswer/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index a08545433d9..c14b36d3133 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.7 + version: 0.2.8 - 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:2894595ceb5ebd5ca0e24edcf75b60b80514356162757b77308581e3d6ab692f -generated: "2024-11-05T21:17:48.815911-08:00" +digest: sha256:7fef354e9e3bf529933b77475171c955b717a45b8dc6e2d0a4eb6d693e446cff +generated: "2024-11-05T22:03:02.743594-08:00" diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index 9e931544333..4eebb92d410 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.7 + version: 0.2.8 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx From 9e224b86f046c8b90ef2a81ce72c4f8eb4656dc7 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 12:30:32 -0800 Subject: [PATCH 12/34] bump version --- deployment/helm/charts/danswer/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index 4eebb92d410..82b0f35f154 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -5,7 +5,7 @@ home: https://www.danswer.ai/ sources: - "https://github.com/danswer-ai/danswer" type: application -version: 0.2.0 +version: 0.2.1 appVersion: "latest" annotations: category: Productivity From d0a0959e23aedfed43eb5a0abfd218dc3063954a Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 13:10:05 -0800 Subject: [PATCH 13/34] try appending the ordinal --- deployment/helm/charts/danswer/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/helm/charts/danswer/templates/configmap.yaml b/deployment/helm/charts/danswer/templates/configmap.yaml index 89a85301103..b00ddfbe2e3 100755 --- a/deployment/helm/charts/danswer/templates/configmap.yaml +++ b/deployment/helm/charts/danswer/templates/configmap.yaml @@ -7,7 +7,7 @@ metadata: data: INTERNAL_URL: "http://{{ include "danswer-stack.fullname" . }}-api-service:{{ .Values.api.service.port | default 8080 }}" POSTGRES_HOST: {{ .Release.Name }}-postgresql - VESPA_HOST: {{ .Release.Name }}-vespa + VESPA_HOST: {{ .Release.Name }}-vespa-0 REDIS_HOST: {{ .Release.Name }}-redis-master MODEL_SERVER_HOST: "{{ include "danswer-stack.fullname" . }}-inference-model-service" INDEXING_MODEL_SERVER_HOST: "{{ include "danswer-stack.fullname" . }}-indexing-model-service" From 5ae7844bb3f1828ef416ed772f072700a7a4b1a1 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 14:21:35 -0800 Subject: [PATCH 14/34] try new configmap --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- deployment/helm/charts/danswer/Chart.yaml | 2 +- deployment/helm/charts/danswer/templates/configmap.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index c14b36d3133..bf3c7c147ee 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.8 + version: 0.2.9 - 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:7fef354e9e3bf529933b77475171c955b717a45b8dc6e2d0a4eb6d693e446cff -generated: "2024-11-05T22:03:02.743594-08:00" +digest: sha256:435a2c3a811202049bdc10051cfb93730376e4e26f802bef12ed41a7147c25b0 +generated: "2024-11-06T14:21:18.44095-08:00" diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index 82b0f35f154..a1182d34d33 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.8 + version: 0.2.9 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx diff --git a/deployment/helm/charts/danswer/templates/configmap.yaml b/deployment/helm/charts/danswer/templates/configmap.yaml index b00ddfbe2e3..e3cbf9d4c41 100755 --- a/deployment/helm/charts/danswer/templates/configmap.yaml +++ b/deployment/helm/charts/danswer/templates/configmap.yaml @@ -7,7 +7,7 @@ metadata: data: INTERNAL_URL: "http://{{ include "danswer-stack.fullname" . }}-api-service:{{ .Values.api.service.port | default 8080 }}" POSTGRES_HOST: {{ .Release.Name }}-postgresql - VESPA_HOST: {{ .Release.Name }}-vespa-0 + VESPA_HOST: da-vespa-0.vespa-service REDIS_HOST: {{ .Release.Name }}-redis-master MODEL_SERVER_HOST: "{{ include "danswer-stack.fullname" . }}-inference-model-service" INDEXING_MODEL_SERVER_HOST: "{{ include "danswer-stack.fullname" . }}-indexing-model-service" From e5a7e62a63cf60390571c41a20f3df579a591f56 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 14:41:55 -0800 Subject: [PATCH 15/34] bump vespa --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- deployment/helm/charts/danswer/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index bf3c7c147ee..437a3efcfa0 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.9 + version: 0.2.10 - 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:435a2c3a811202049bdc10051cfb93730376e4e26f802bef12ed41a7147c25b0 -generated: "2024-11-06T14:21:18.44095-08:00" +digest: sha256:5358b2b8c43ff3564ee48cd496f419737450e24a9f23bc2025ca679365211b0c +generated: "2024-11-06T14:41:35.468321-08:00" diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index a1182d34d33..18e32b2ad52 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.9 + version: 0.2.10 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx From e5ed57bc4dbb6ab373e467a4d45cd39b9ce9a2c3 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 15:03:31 -0800 Subject: [PATCH 16/34] bump vespa --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- deployment/helm/charts/danswer/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index 437a3efcfa0..2bc8abb3a9d 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.10 + version: 0.2.11 - 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:5358b2b8c43ff3564ee48cd496f419737450e24a9f23bc2025ca679365211b0c -generated: "2024-11-06T14:41:35.468321-08:00" +digest: sha256:c8a8222bfd0b125f60684aa2afd4b70d37469c1ef8846900ca07457c51dc3620 +generated: "2024-11-06T15:03:11.829708-08:00" diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index 18e32b2ad52..b32b78c94c6 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.10 + version: 0.2.11 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx From 7de79e5847dae8090bf3847a5f414b038fa69e35 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 15:52:47 -0800 Subject: [PATCH 17/34] add debug to see if we can figure out what ct install thinks is failing --- .github/workflows/pr-helm-chart-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-helm-chart-testing.yml b/.github/workflows/pr-helm-chart-testing.yml index c7797764447..c652ef6fe2d 100644 --- a/.github/workflows/pr-helm-chart-testing.yml +++ b/.github/workflows/pr-helm-chart-testing.yml @@ -64,6 +64,6 @@ jobs: - name: Run chart-testing (install) # if: steps.list-changed.outputs.changed == 'true' - run: ct install --all --config ct.yaml + run: ct install --all --debug --config ct.yaml # run: ct install --target-branch ${{ github.event.repository.default_branch }} \ No newline at end of file From fba2f64bbee2c9a6470253e68a06b81098323dfa Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 16:25:19 -0800 Subject: [PATCH 18/34] add debug flag to helm --- ct.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ct.yaml b/ct.yaml index 08470bd8d26..849247deb13 100644 --- a/ct.yaml +++ b/ct.yaml @@ -3,10 +3,11 @@ chart-dirs: - deployment/helm/charts +# must be kept in sync with Chart.yaml chart-repos: - vespa=https://danswer-ai.github.io/vespa-helm-charts - postgresql=https://charts.bitnami.com/bitnami -helm-extra-args: --timeout 600s +helm-extra-args: --debug --timeout 600s validate-maintainers: false From 7f3277368900a18c224a04eafffacb93cdf3caa9 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 17:00:42 -0800 Subject: [PATCH 19/34] try disabling nginx because of KinD --- ct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct.yaml b/ct.yaml index 849247deb13..69b5ca49f74 100644 --- a/ct.yaml +++ b/ct.yaml @@ -8,6 +8,6 @@ chart-repos: - vespa=https://danswer-ai.github.io/vespa-helm-charts - postgresql=https://charts.bitnami.com/bitnami -helm-extra-args: --debug --timeout 600s +helm-extra-args: --set nginx.enabled=false --debug --timeout 600s validate-maintainers: false From 9876e44c9eaebf23dfd3b36acec8d0b9f930926d Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 17:38:34 -0800 Subject: [PATCH 20/34] use helm-extra-set-args --- ct.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ct.yaml b/ct.yaml index 69b5ca49f74..9f7add5e437 100644 --- a/ct.yaml +++ b/ct.yaml @@ -8,6 +8,9 @@ chart-repos: - vespa=https://danswer-ai.github.io/vespa-helm-charts - postgresql=https://charts.bitnami.com/bitnami -helm-extra-args: --set nginx.enabled=false --debug --timeout 600s +helm-extra-args: --debug --timeout 600s + +# nginx appears to not work on kind, likely due to lack of loadbalancer support +helm-extra-set-args: --set nginx.enabled=false validate-maintainers: false From 4f0f613829acfc907ed199c5437243c6ec70c65a Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 18:02:10 -0800 Subject: [PATCH 21/34] try command line --- .github/workflows/pr-helm-chart-testing.yml | 2 +- ct.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-helm-chart-testing.yml b/.github/workflows/pr-helm-chart-testing.yml index c652ef6fe2d..29b1b6bf29c 100644 --- a/.github/workflows/pr-helm-chart-testing.yml +++ b/.github/workflows/pr-helm-chart-testing.yml @@ -64,6 +64,6 @@ jobs: - name: Run chart-testing (install) # if: steps.list-changed.outputs.changed == 'true' - run: ct install --all --debug --config ct.yaml + run: ct install --all --helm-extra-set-args="--set=nginx.enabled=false" --debug --config ct.yaml # run: ct install --target-branch ${{ github.event.repository.default_branch }} \ No newline at end of file diff --git a/ct.yaml b/ct.yaml index 9f7add5e437..626c5173acd 100644 --- a/ct.yaml +++ b/ct.yaml @@ -11,6 +11,6 @@ chart-repos: helm-extra-args: --debug --timeout 600s # nginx appears to not work on kind, likely due to lack of loadbalancer support -helm-extra-set-args: --set nginx.enabled=false +# helm-extra-set-args: --set=nginx.enabled=false validate-maintainers: false From 1ad3a29b31ee588799df7873a43a67ccbbe909b1 Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Wed, 6 Nov 2024 22:22:25 -0800 Subject: [PATCH 22/34] try pointing test connection to the correct service name --- .../helm/charts/danswer/templates/tests/test-connection.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/helm/charts/danswer/templates/tests/test-connection.yaml b/deployment/helm/charts/danswer/templates/tests/test-connection.yaml index 60fbd1054c1..d3b57dd4354 100644 --- a/deployment/helm/charts/danswer/templates/tests/test-connection.yaml +++ b/deployment/helm/charts/danswer/templates/tests/test-connection.yaml @@ -11,5 +11,5 @@ spec: - name: wget image: busybox command: ['wget'] - args: ['{{ include "danswer-stack.fullname" . }}:{{ .Values.webserver.service.port }}'] + args: ['{{ include "danswer-stack.fullname" . }}-webserver:{{ .Values.webserver.service.port }}'] restartPolicy: Never From b01fd21667b4930e498782c78fe52b76a0c51512 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 23:39:03 -0800 Subject: [PATCH 23/34] bump vespa to 0.2.12 --- deployment/helm/charts/danswer/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index b32b78c94c6..a6cbc833672 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.11 + version: 0.2.12 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx From 16f17f552eab999832f93257fa4f7ce75091547a Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Wed, 6 Nov 2024 23:47:38 -0800 Subject: [PATCH 24/34] update chart.lock --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index 2bc8abb3a9d..e66d32c2925 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.11 + version: 0.2.12 - 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:c8a8222bfd0b125f60684aa2afd4b70d37469c1ef8846900ca07457c51dc3620 -generated: "2024-11-06T15:03:11.829708-08:00" +digest: sha256:3cc51055773fa0ad442cffca59267d7a7f8466a81383351f8590d74c7ae8463d +generated: "2024-11-06T23:47:16.449766-08:00" From c2a94339cfe57d02eb303c15462449aa65f8ee5f Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Thu, 7 Nov 2024 00:09:54 -0800 Subject: [PATCH 25/34] bump vespa to 0.2.13 --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- deployment/helm/charts/danswer/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index e66d32c2925..ab1c9ed2174 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.12 + version: 0.2.13 - 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:3cc51055773fa0ad442cffca59267d7a7f8466a81383351f8590d74c7ae8463d -generated: "2024-11-06T23:47:16.449766-08:00" +digest: sha256:0855b601fae1e4205133896c4b87587c761f380cc919cfdd8c7ff8834a75a0a1 +generated: "2024-11-07T00:09:22.986412-08:00" diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index a6cbc833672..d5ef4e6d855 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.12 + version: 0.2.13 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx From 600fcffc9bcafce338b91c430faf281d50d78747 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Thu, 7 Nov 2024 00:40:17 -0800 Subject: [PATCH 26/34] bump vespa to 0.2.14 --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- deployment/helm/charts/danswer/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index ab1c9ed2174..0d4ce922aab 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.13 + version: 0.2.14 - 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:0855b601fae1e4205133896c4b87587c761f380cc919cfdd8c7ff8834a75a0a1 -generated: "2024-11-07T00:09:22.986412-08:00" +digest: sha256:1d67711f6b1a76d6f82e8d11f3ceb5d82daf5a639f4ef8a730a2f3704b09c495 +generated: "2024-11-07T00:39:48.882765-08:00" diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index d5ef4e6d855..846de0856f0 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.13 + version: 0.2.14 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx From d0702ba414776e06731ef6e952208b7b10040bbb Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Thu, 7 Nov 2024 02:45:22 -0800 Subject: [PATCH 27/34] bump vespa --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- deployment/helm/charts/danswer/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index 0d4ce922aab..e681220f49d 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.14 + version: 0.2.15 - 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:1d67711f6b1a76d6f82e8d11f3ceb5d82daf5a639f4ef8a730a2f3704b09c495 -generated: "2024-11-07T00:39:48.882765-08:00" +digest: sha256:487df53d31c6e07cbded67eea680d046940e338e9785348b325e63c60e6f8f98 +generated: "2024-11-07T02:45:07.102865-08:00" diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index 846de0856f0..0ff9837138a 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.14 + version: 0.2.15 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx From 4892cb0c286e208e3089cd42aa1f237a81ae6a63 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Thu, 7 Nov 2024 09:40:04 -0800 Subject: [PATCH 28/34] bump vespa --- deployment/helm/charts/danswer/Chart.lock | 6 +++--- deployment/helm/charts/danswer/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/helm/charts/danswer/Chart.lock b/deployment/helm/charts/danswer/Chart.lock index e681220f49d..26cc24e4494 100644 --- a/deployment/helm/charts/danswer/Chart.lock +++ b/deployment/helm/charts/danswer/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 14.3.1 - name: vespa repository: https://danswer-ai.github.io/vespa-helm-charts - version: 0.2.15 + version: 0.2.16 - 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:487df53d31c6e07cbded67eea680d046940e338e9785348b325e63c60e6f8f98 -generated: "2024-11-07T02:45:07.102865-08:00" +digest: sha256:711bbb76ba6ab604a36c9bf1839ab6faa5610afb21e535afd933c78f2d102232 +generated: "2024-11-07T09:39:30.17171-08:00" diff --git a/deployment/helm/charts/danswer/Chart.yaml b/deployment/helm/charts/danswer/Chart.yaml index 0ff9837138a..8cda8e8ba2e 100644 --- a/deployment/helm/charts/danswer/Chart.yaml +++ b/deployment/helm/charts/danswer/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: vespa - version: 0.2.15 + version: 0.2.16 repository: https://danswer-ai.github.io/vespa-helm-charts condition: vespa.enabled - name: nginx From 89b149e39102681fc901da7e37fd965f2b7d1deb Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Fri, 8 Nov 2024 16:52:57 -0800 Subject: [PATCH 29/34] re-enable chart testing only on changes --- .github/workflows/pr-helm-chart-testing.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pr-helm-chart-testing.yml b/.github/workflows/pr-helm-chart-testing.yml index 29b1b6bf29c..d3258f8b2ce 100644 --- a/.github/workflows/pr-helm-chart-testing.yml +++ b/.github/workflows/pr-helm-chart-testing.yml @@ -29,7 +29,7 @@ jobs: version: v3.14.4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' cache: 'pip' @@ -54,16 +54,20 @@ jobs: echo "changed=true" >> "$GITHUB_OUTPUT" fi + # lint all charts if any changes were detected - name: Run chart-testing (lint) -# if: steps.list-changed.outputs.changed == 'true' - run: ct lint --all --config ct.yaml --target-branch ${{ github.event.repository.default_branch }} + if: steps.list-changed.outputs.changed == 'true' + run: ct lint --config ct.yaml --all + # the following would lint only changed charts, but linting isn't expensive + # run: ct lint --config ct.yaml --target-branch ${{ github.event.repository.default_branch }} - name: Create kind cluster -# if: steps.list-changed.outputs.changed == 'true' + if: steps.list-changed.outputs.changed == 'true' uses: helm/kind-action@v1.10.0 - name: Run chart-testing (install) -# if: steps.list-changed.outputs.changed == 'true' + if: steps.list-changed.outputs.changed == 'true' run: ct install --all --helm-extra-set-args="--set=nginx.enabled=false" --debug --config ct.yaml -# run: ct install --target-branch ${{ github.event.repository.default_branch }} - \ No newline at end of file + # the following would install only changed charts, but we only have one chart so + # don't worry about that for now + # run: ct install --target-branch ${{ github.event.repository.default_branch }} From 7521042b2816446228d4115631a30d334eb78890 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Fri, 8 Nov 2024 17:03:29 -0800 Subject: [PATCH 30/34] name the check more specifically than "lint-test" --- .github/workflows/pr-helm-chart-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-helm-chart-testing.yml b/.github/workflows/pr-helm-chart-testing.yml index d3258f8b2ce..024e5f3b5e6 100644 --- a/.github/workflows/pr-helm-chart-testing.yml +++ b/.github/workflows/pr-helm-chart-testing.yml @@ -12,7 +12,7 @@ on: workflow_dispatch: # Allows manual triggering jobs: - lint-test: + helm-chart-check: # See https://runs-on.com/runners/linux/ runs-on: [runs-on,runner=8cpu-linux-x64,hdd=256,"run-id=${{ github.run_id }}"] From cd6e93cc769673ee60b51b2279424a954b4f1d6a Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Danswer)" Date: Fri, 8 Nov 2024 17:30:32 -0800 Subject: [PATCH 31/34] add some debugging --- .github/workflows/pr-helm-chart-testing.yml | 7 ++----- ct.yaml | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-helm-chart-testing.yml b/.github/workflows/pr-helm-chart-testing.yml index 024e5f3b5e6..5a79f55502c 100644 --- a/.github/workflows/pr-helm-chart-testing.yml +++ b/.github/workflows/pr-helm-chart-testing.yml @@ -1,8 +1,3 @@ -# This workflow is intentionally disabled while we're still working on it -# It's close to ready, but a race condition needs to be fixed with -# API server and Vespa startup, and it needs to have a way to build/test against -# local containers - name: Helm - Lint and Test Charts on: @@ -49,7 +44,9 @@ jobs: - name: Run chart-testing (list-changed) id: list-changed run: | + echo "default_branch: ${{ github.event.repository.default_branch }}" changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) + echo "list-changed output: $changed" if [[ -n "$changed" ]]; then echo "changed=true" >> "$GITHUB_OUTPUT" fi diff --git a/ct.yaml b/ct.yaml index 626c5173acd..dec8c418ad5 100644 --- a/ct.yaml +++ b/ct.yaml @@ -11,6 +11,7 @@ chart-repos: helm-extra-args: --debug --timeout 600s # 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 # helm-extra-set-args: --set=nginx.enabled=false validate-maintainers: false From 45a6d5f38ded0df4098bb6bc897e973907763c36 Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Fri, 8 Nov 2024 18:00:09 -0800 Subject: [PATCH 32/34] try setting remote --- .github/workflows/pr-helm-chart-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-helm-chart-testing.yml b/.github/workflows/pr-helm-chart-testing.yml index 5a79f55502c..f4d04202c49 100644 --- a/.github/workflows/pr-helm-chart-testing.yml +++ b/.github/workflows/pr-helm-chart-testing.yml @@ -45,7 +45,7 @@ jobs: id: list-changed run: | echo "default_branch: ${{ github.event.repository.default_branch }}" - changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) + changed=$(ct list-changed --remote origin --target-branch ${{ github.event.repository.default_branch }}) echo "list-changed output: $changed" if [[ -n "$changed" ]]; then echo "changed=true" >> "$GITHUB_OUTPUT" From 3d3860ced6e8a319e9a5d7859201da1f88476aaf Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Fri, 8 Nov 2024 18:05:17 -0800 Subject: [PATCH 33/34] might have to specify chart dirs directly --- .github/workflows/pr-helm-chart-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-helm-chart-testing.yml b/.github/workflows/pr-helm-chart-testing.yml index f4d04202c49..f388b7b711b 100644 --- a/.github/workflows/pr-helm-chart-testing.yml +++ b/.github/workflows/pr-helm-chart-testing.yml @@ -45,7 +45,7 @@ jobs: id: list-changed run: | echo "default_branch: ${{ github.event.repository.default_branch }}" - changed=$(ct list-changed --remote origin --target-branch ${{ github.event.repository.default_branch }}) + changed=$(ct list-changed --remote origin --target-branch ${{ github.event.repository.default_branch }} --chart-dirs deployment/helm/charts) echo "list-changed output: $changed" if [[ -n "$changed" ]]; then echo "changed=true" >> "$GITHUB_OUTPUT" From adc5ace80a1fb97c3388d33f6696c96b0a9b1300 Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Fri, 8 Nov 2024 18:22:59 -0800 Subject: [PATCH 34/34] add comments --- .github/workflows/pr-helm-chart-testing.yml | 1 + ct.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/pr-helm-chart-testing.yml b/.github/workflows/pr-helm-chart-testing.yml index f388b7b711b..5b00303010d 100644 --- a/.github/workflows/pr-helm-chart-testing.yml +++ b/.github/workflows/pr-helm-chart-testing.yml @@ -41,6 +41,7 @@ jobs: - name: Set up chart-testing uses: helm/chart-testing-action@v2.6.1 + # even though we specify chart-dirs in ct.yaml, it isn't used by ct for the list-changed command... - name: Run chart-testing (list-changed) id: list-changed run: | diff --git a/ct.yaml b/ct.yaml index dec8c418ad5..f568ef5d52b 100644 --- a/ct.yaml +++ b/ct.yaml @@ -1,5 +1,6 @@ # See https://github.com/helm/chart-testing#configuration +# still have to specify this on the command line for list-changed chart-dirs: - deployment/helm/charts