From df830cc4cdc35c35f457fc9f07656ec0775f45fc Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Wed, 3 Jan 2024 17:07:15 +0000 Subject: [PATCH] update --- .github/workflows/e2e-k3d.yml | 2 +- README.md | 2 +- deploy.py | 2 +- generate_local_test_config.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e-k3d.yml b/.github/workflows/e2e-k3d.yml index 598dc01aa..c8ad69a0d 100644 --- a/.github/workflows/e2e-k3d.yml +++ b/.github/workflows/e2e-k3d.yml @@ -32,7 +32,7 @@ jobs: - name: Test helm template uses: WyriHaximus/github-action-helm3@v3 with: - exec: helm template does-not-matter ./kubernetes/preview > defaultTemplate.yaml + exec: helm template does-not-matter ./kubernetes/loculus > defaultTemplate.yaml - name: Upload default helm template uses: actions/upload-artifact@v4 diff --git a/README.md b/README.md index 56ec19c3b..3776cbf31 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Detailed documentation is available in each folder's README. This file contains - Sequence and metadata processing pipeline is in [`preprocessing`](/preprocessing) folder, see [`preprocessing/specification.md`](/preprocessing/specification.md) - Deployment code is in `kubernetes`, see [`kubernetes/README.md`](/kubernetes/README.md). Check this for local development setup instructions. -- Authorization is performed by our own keycloak instance. see config in [`keycloak-image`](kubernetes/preview/templates/keycloak-deployment.yaml) and [`realm-config`](kubernetes/preview/templates/keycloak-config-map.yaml) +- Authorization is performed by our own keycloak instance. see config in [`keycloak-image`](kubernetes/loculus/templates/keycloak-deployment.yaml) and [`realm-config`](kubernetes/loculus/templates/keycloak-config-map.yaml) ## GitHub Actions diff --git a/deploy.py b/deploy.py index a14a87830..e8f3ee0a4 100755 --- a/deploy.py +++ b/deploy.py @@ -10,7 +10,7 @@ CLUSTER_NAME = 'testCluster' HELM_RELEASE_NAME = 'preview' -HELM_CHART_DIR = ROOT_DIR / 'kubernetes' / 'preview' +HELM_CHART_DIR = ROOT_DIR / 'kubernetes' / 'loculus' WEBSITE_PORT_MAPPING = '-p 3000:30081@agent:0' BACKEND_PORT_MAPPING = '-p 8079:30082@agent:0' diff --git a/generate_local_test_config.sh b/generate_local_test_config.sh index ef0c7d239..412d5cb4f 100755 --- a/generate_local_test_config.sh +++ b/generate_local_test_config.sh @@ -3,7 +3,7 @@ set -e root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -helmChart="$root"/kubernetes/preview +helmChart="$root"/kubernetes/loculus backend_config="$root"/website/tests/config/backend_config.json helm template name-does-not-matter "$helmChart" --show-only templates/loculus-backend-config.yaml | \