Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(k8s): check if backendExtraArgs is set, add test for default template #2010

Merged
merged 3 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/e2e-k3d.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ jobs:
run: |
./deploy.py --verbose cluster

- name: Template with helm
- name: Default template with helm
uses: WyriHaximus/github-action-helm3@v4
with:
exec: helm template loculus kubernetes/loculus

- name: E2E Template with helm
uses: WyriHaximus/github-action-helm3@v4
with:
exec: ./deploy.py --verbose helm --branch ${{ github.ref_name }} --sha ${{ env.sha }} --for-e2e --template > /tmp/helm_template.yaml
Expand All @@ -71,6 +76,7 @@ jobs:
with:
name: helm-template
path: /tmp/helm_template.yaml

- name: Deploy with helm
run: |
./deploy.py --verbose helm --branch ${{ github.ref_name }} --sha ${{ env.sha }} --for-e2e
Expand Down
4 changes: 3 additions & 1 deletion kubernetes/loculus/templates/loculus-backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ spec:
- "--spring.datasource.username=$(DB_USERNAME)"
- "--spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://loculus-keycloak-service:8083/realms/loculus/protocol/openid-connect/certs"
- "--loculus.cleanup.task.reset-stale-in-processing-after-seconds={{- .Values.preprocessingTimeout | default 120 }}"
{{ .Values.backendExtraArgs | toYaml | nindent 12 }}
{{- if .Values.backendExtraArgs }}
{{- .Values.backendExtraArgs | toYaml | nindent 12 }}
{{- end }}
env:
- name: JVM_OPTS
value: -XX:+UseContainerSupport -XX:+UseG1GC -XX:MaxHeapFreeRatio=5 -XX:MinHeapFreeRatio=2
Expand Down
Loading