From 92a7f6f3960452188175557a9a1f13f27f1100a5 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 13 Feb 2025 11:59:00 +0000 Subject: [PATCH 1/5] skip schema validation for dev --- deploy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy.py b/deploy.py index f20054a4e2..c00ccaadd5 100755 --- a/deploy.py +++ b/deploy.py @@ -63,7 +63,7 @@ cluster_parser.add_argument( "--dev", action="store_true", - help="Set up a development environment for running the website and the backend locally", + help="Set up a development environment for running the website and the backend locally, skip schema validation", ) cluster_parser.add_argument("--delete", action="store_true", help="Delete the cluster") @@ -91,7 +91,7 @@ help="Just template and print out the YAML produced", action="store_true", ) -helm_parser.add_argument("--for-e2e", action="store_true", help="Use the E2E values file") +helm_parser.add_argument("--for-e2e", action="store_true", help="Use the E2E values file, skip schema validation") upgrade_parser = subparsers.add_parser("upgrade", help="Upgrade helm installation") @@ -217,6 +217,7 @@ def handle_helm(): if args.for_e2e or args.dev: parameters += ["-f", HELM_CHART_DIR / "values_e2e_and_dev.yaml"] + parameters += ["--skip-schema-validation"] if args.sha: parameters += ["--set", f"sha={args.sha[:7]}"] From f00de53920eedb820df5e8865cbe648db9abe69f Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 13 Feb 2025 12:00:33 +0000 Subject: [PATCH 2/5] update --- kubernetes/loculus/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/kubernetes/loculus/values.yaml b/kubernetes/loculus/values.yaml index 4ad3a1161c..67a9d02bd7 100644 --- a/kubernetes/loculus/values.yaml +++ b/kubernetes/loculus/values.yaml @@ -1762,3 +1762,4 @@ defaultResources: cpu: "20m" ingest: ncbiGatewayUrl: null +nonExistentTest: test \ No newline at end of file From 319d205693b30a1bd520a69acd03e5c5c3237345 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 13 Feb 2025 12:03:55 +0000 Subject: [PATCH 3/5] update --- .github/workflows/e2e-k3d.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-k3d.yml b/.github/workflows/e2e-k3d.yml index 704cea4f1b..09b448e671 100644 --- a/.github/workflows/e2e-k3d.yml +++ b/.github/workflows/e2e-k3d.yml @@ -53,7 +53,7 @@ jobs: - name: Default template with helm uses: WyriHaximus/github-action-helm3@v4 with: - exec: helm template loculus kubernetes/loculus + exec: helm template loculus kubernetes/loculus --skip-schema-validation - name: E2E Template with helm uses: WyriHaximus/github-action-helm3@v4 with: From 625514ba9cf1dcca7c251629c1b5711dbc303867 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 13 Feb 2025 12:05:12 +0000 Subject: [PATCH 4/5] fix more --- deploy.py | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy.py b/deploy.py index c00ccaadd5..d90a588f50 100755 --- a/deploy.py +++ b/deploy.py @@ -367,6 +367,7 @@ def generate_config( helm_chart, "--show-only", template, + "--skip-schema-validation" ] if not output_path: From 8397208642d6ba0a03e117a29d41ebc20b0253cc Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Thu, 13 Feb 2025 12:54:02 +0000 Subject: [PATCH 5/5] revert --- kubernetes/loculus/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/kubernetes/loculus/values.yaml b/kubernetes/loculus/values.yaml index 67a9d02bd7..4ad3a1161c 100644 --- a/kubernetes/loculus/values.yaml +++ b/kubernetes/loculus/values.yaml @@ -1762,4 +1762,3 @@ defaultResources: cpu: "20m" ingest: ncbiGatewayUrl: null -nonExistentTest: test \ No newline at end of file