Merge branch 'main' into pagination

loculus-project · May 22, 2024 · e8b3b72 · e8b3b72
2 parents 1f72c80 + 79cbfe7
commit e8b3b72
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 8 deletions.
diff --git a/kubernetes/loculus/templates/_resources.tpl b/kubernetes/loculus/templates/_resources.tpl
@@ -0,0 +1 @@
+{{- define "loculus.standardCPURequest" }}{{- if $.Values.reduceResourceRequest }}cpu: "10m"{{- else }}cpu: "100m"{{- end }}{{- end }}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,3 +9,4 @@ secrets:
 createTestAccounts: true
 backendExtraArgs:
   - "--loculus.debug-mode=true"
+reduceResourceRequest: true
diff --git 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
diff --git a/website/src/services/lapisClient.ts b/website/src/services/lapisClient.ts
@@ -49,7 +49,6 @@ export class LapisClient extends ZodiosWrapperClient<typeof lapisApi> {
 
     public getSequenceEntryVersionDetails(accessionVersion: string) {
         return this.call('details', {
-            // why?
             [this.schema.primaryKey]: accessionVersion,
         });
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{{- define "loculus.standardCPURequest" }}{{- if $.Values.reduceResourceRequest }}cpu: "10m"{{- else }}cpu: "100m"{{- end }}{{- end }}
-Original file line number
+Diff line change
@@ Expand Up @@
         public getSequenceEntryVersionDetails(accessionVersion: string) {
             return this.call('details', {
-                // why?
                 [this.schema.primaryKey]: accessionVersion,
             });
         }
@@ Expand Down @@