Skip to content

Commit

Permalink
Fixup renames (#714)
Browse files Browse the repository at this point in the history
* Fix argocd updater

* Update appset.yaml

* rename preview to loculus

* update
  • Loading branch information
theosanderson authored Jan 4, 2024
1 parent 5fcd001 commit eca8f83
Show file tree
Hide file tree
Showing 36 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e-k3d.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-argocd-metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Checkout External Repository
uses: actions/checkout@v4
with:
repository: 'loculus/argocd_metadata'
repository: 'pathoplexus/argocd_metadata'
token: ${{ secrets.ARGOCD_METADATA_PAT }}

- name: Modify config.json
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion generate_local_test_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 | \
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/appset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
generators:
- pullRequest:
github:
owner: loculus
owner: pathoplexus
labels:
- preview
repo: loculus
Expand All @@ -32,7 +32,7 @@ spec:
namespace: 'preview-{{ (printf "%.25s" .branch) | replace "_" "-" | trimSuffix "-" | lower }}'
project: default
source:
path: 'kubernetes/preview/'
path: 'kubernetes/loculus/'
repoURL: 'https://github.com/pathoplexus/loculus.git'
targetRevision: '{{.branch}}'
helm:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit eca8f83

Please sign in to comment.