From 2331a26394a0d818e4cc423a20f8c026cb60e902 Mon Sep 17 00:00:00 2001 From: Fabian Engelniederhammer Date: Wed, 22 May 2024 16:03:33 +0200 Subject: [PATCH 1/2] chore(website): delete forgotten comment --- website/src/services/lapisClient.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/website/src/services/lapisClient.ts b/website/src/services/lapisClient.ts index 7011d324e..096e59cb2 100644 --- a/website/src/services/lapisClient.ts +++ b/website/src/services/lapisClient.ts @@ -49,7 +49,6 @@ export class LapisClient extends ZodiosWrapperClient { public getSequenceEntryVersionDetails(accessionVersion: string) { return this.call('details', { - // why? [this.schema.primaryKey]: accessionVersion, }); } From 79cbfe718bd507e250f17f4759fbb85f3267e828 Mon Sep 17 00:00:00 2001 From: Theo Sanderson Date: Wed, 22 May 2024 16:33:29 +0100 Subject: [PATCH 2/2] feat(deployment): allow reducing resource usage for previews (#2016) * allow reducing resource usage for previews * update * add to preview values --- kubernetes/loculus/templates/_resources.tpl | 1 + kubernetes/loculus/templates/ingest-deployment.yaml | 4 ++-- .../loculus/templates/keycloak-database-deployment.yaml | 2 +- kubernetes/loculus/templates/loculus-backend.yaml | 2 +- kubernetes/loculus/templates/loculus-database-standin.yaml | 2 +- .../loculus/templates/loculus-preprocessing-deployment.yaml | 2 +- kubernetes/loculus/templates/loculus-website.yaml | 2 +- kubernetes/loculus/values_e2e_and_dev.yaml | 1 + kubernetes/loculus/values_preview_server.yaml | 1 + 9 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 kubernetes/loculus/templates/_resources.tpl diff --git a/kubernetes/loculus/templates/_resources.tpl b/kubernetes/loculus/templates/_resources.tpl new file mode 100644 index 000000000..fd1e38e47 --- /dev/null +++ b/kubernetes/loculus/templates/_resources.tpl @@ -0,0 +1 @@ +{{- define "loculus.standardCPURequest" }}{{- if $.Values.reduceResourceRequest }}cpu: "10m"{{- else }}cpu: "100m"{{- end }}{{- end }} \ No newline at end of file diff --git a/kubernetes/loculus/templates/ingest-deployment.yaml b/kubernetes/loculus/templates/ingest-deployment.yaml index 21ec157d4..1d05f22e3 100644 --- a/kubernetes/loculus/templates/ingest-deployment.yaml +++ b/kubernetes/loculus/templates/ingest-deployment.yaml @@ -29,7 +29,7 @@ spec: resources: requests: memory: "500Mi" - cpu: "100m" + {{ include "loculus.standardCPURequest" $ }} limits: memory: "10Gi" env: @@ -83,7 +83,7 @@ spec: resources: requests: memory: "1Gi" - cpu: "100m" + {{ include "loculus.standardCPURequest" $ }} limits: memory: "10Gi" env: diff --git a/kubernetes/loculus/templates/keycloak-database-deployment.yaml b/kubernetes/loculus/templates/keycloak-database-deployment.yaml index 7300e596a..0fdc077be 100644 --- a/kubernetes/loculus/templates/keycloak-database-deployment.yaml +++ b/kubernetes/loculus/templates/keycloak-database-deployment.yaml @@ -25,7 +25,7 @@ spec: resources: requests: memory: "100Mi" - cpu: "100m" + {{ include "loculus.standardCPURequest" $ }} limits: memory: "100Mi" ports: diff --git a/kubernetes/loculus/templates/loculus-backend.yaml b/kubernetes/loculus/templates/loculus-backend.yaml index 4a54bf3d2..d6fe999c4 100644 --- a/kubernetes/loculus/templates/loculus-backend.yaml +++ b/kubernetes/loculus/templates/loculus-backend.yaml @@ -29,7 +29,7 @@ spec: resources: requests: memory: "640Mi" - cpu: "100m" + {{ include "loculus.standardCPURequest" $ }} limits: memory: "3Gi" # Backend requires at least 635741K of memory livenessProbe: diff --git a/kubernetes/loculus/templates/loculus-database-standin.yaml b/kubernetes/loculus/templates/loculus-database-standin.yaml index 9e70d3f60..4a4824469 100644 --- a/kubernetes/loculus/templates/loculus-database-standin.yaml +++ b/kubernetes/loculus/templates/loculus-database-standin.yaml @@ -24,7 +24,7 @@ spec: resources: requests: memory: "200Mi" - cpu: "100m" + {{ include "loculus.standardCPURequest" $ }} limits: memory: "2Gi" ports: diff --git a/kubernetes/loculus/templates/loculus-preprocessing-deployment.yaml b/kubernetes/loculus/templates/loculus-preprocessing-deployment.yaml index fa70a9981..fe780f1ca 100644 --- a/kubernetes/loculus/templates/loculus-preprocessing-deployment.yaml +++ b/kubernetes/loculus/templates/loculus-preprocessing-deployment.yaml @@ -37,7 +37,7 @@ spec: resources: requests: memory: "40Mi" - cpu: "100m" + {{ include "loculus.standardCPURequest" $ }} limits: memory: "3Gi" env: diff --git a/kubernetes/loculus/templates/loculus-website.yaml b/kubernetes/loculus/templates/loculus-website.yaml index 94b76650d..6134d55f0 100644 --- a/kubernetes/loculus/templates/loculus-website.yaml +++ b/kubernetes/loculus/templates/loculus-website.yaml @@ -29,7 +29,7 @@ spec: resources: requests: memory: "200Mi" - cpu: "100m" + {{ include "loculus.standardCPURequest" $ }} limits: memory: "1Gi" ports: diff --git a/kubernetes/loculus/values_e2e_and_dev.yaml b/kubernetes/loculus/values_e2e_and_dev.yaml index af5d37cf0..f815ca464 100644 --- a/kubernetes/loculus/values_e2e_and_dev.yaml +++ b/kubernetes/loculus/values_e2e_and_dev.yaml @@ -9,3 +9,4 @@ secrets: createTestAccounts: true backendExtraArgs: - "--loculus.debug-mode=true" +reduceResourceRequest: true \ No newline at end of file diff --git a/kubernetes/loculus/values_preview_server.yaml b/kubernetes/loculus/values_preview_server.yaml index fdc1d3dd1..4391d3e94 100644 --- a/kubernetes/loculus/values_preview_server.yaml +++ b/kubernetes/loculus/values_preview_server.yaml @@ -10,3 +10,4 @@ secrets: clusterWide: "true" data: orcidSecret: AgBwVSGo2Y9TPdkGd78BikI/Nm+4SI3TS5AHQu+h4s0qb5Ydc1m7MJLd5ZwoXhkvWWfm2kt8K0Tj5eoAsFSVktA5EIZMWZOR7DugU5Z5GLgGJogpgrzN+dR7AEsyxwfXGzF2RISqsBDjRBzzfiF0ZhpyjUOCab2fn9iH3HmJ9qPK6xpzOcS47jjfg+5ofv8BxdGPAKiOpLUgFAZO1xTKZXTnbdVvyRUORJVZJffwiZ3RG3EO+eUKgHIf5YeG0b52OzDPfCzgNDGV/ryY+jPix6c+T1/g2qnUpLzECYdaqc5R6ZWtNt42VELxU3kpmwNyswraec+3IxkufXZTyTpSxikpHDKK9Zcz9woh/+R4BUKjjO1zpHWFPV5jY+hzY+rxfHTP8VX0txyMsBVEafDRL0R3YYz8rUBzXC4C6IFJLK0QmJKD7GHQM2Ue6SjGkr49k1ZPSGCGAJ16IZCe3l3lVhzncobpEBPx4qYJhD8oo+ZIt7YIZ/Egmkza+DFAAWmtSCEztL85Y3pNN5g3SVn6urSKZbNUeI6rC4JqwS6Uk2370VrvEEufml9fXOdE5ATO5C+zHj3AWd0zancDsk4nQegbE5fjLblGfQ1g/ID2OHCFaw7FMBItrE+R5VkTwN5nuszAnWXc191T7PS3mWrYBDrjbqHOr/P1X6BZWT0Q7bqR8y5d2JUX5qNaHI4s4WN43Z/m0oPRMZC0WHn/ebtPPukoKRWnMWqN8MTwnB9oHV/84egrHUY= +reduceResourceRequest: true \ No newline at end of file