Project import generated by Copybara. (#8)

GitOrigin-RevId: db4057f5e9f52a63062523d23f5e2413714b90b8 Co-authored-by: Copybara Bot <[email protected]>
Exafunction · Apr 28, 2023 · 62440ab · 62440ab
1 parent d441a29
commit 62440ab
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 23 deletions.
diff --git a/charts/exadeploy/README.md b/charts/exadeploy/README.md
@@ -199,6 +199,10 @@ runner:
 | moduleRepository.ingress.host | string | `nil` | Module repository ingress host. |
 | moduleRepository.nodeSelector | object | `{}` | Module repository nodeSelectors. Should be a map from label names to label values. |
 | moduleRepository.port | int | `50051` | Port to expose the module repository on. |
+| moduleRepository.resources.limits.cpu | string | `"1"` | Module repository Kubernetes CPU limit. |
+| moduleRepository.resources.limits.memory | string | `"3.5Gi"` | Module repository Kubernetes memory limit. |
+| moduleRepository.resources.requests.cpu | string | `"1"` | Module repository Kubernetes CPU request. |
+| moduleRepository.resources.requests.memory | string | `"3.5Gi"` | Module repository Kubernetes memory request. |
 | moduleRepository.service.annotations | object | `{"cloud.google.com/load-balancer-type":"Internal","service.beta.kubernetes.io/aws-load-balancer-internal":"true","service.beta.kubernetes.io/azure-load-balancer-internal":"true"}` | Module repository service annotations. |
 | moduleRepository.service.type | string | `"LoadBalancer"` | Module repository service type. |
 | moduleRepository.serviceAccountName | string | `nil` | Optional specific serviceAccountName for the module repository. |
@@ -222,7 +226,6 @@ runner:
 | runner.valueStorePort | int | `50101` | Port to expose value store on. |
 | runner.valueStoreThreads | int | `4` | Number of threads for value store. |
 | scheduler.additionalConfig | string | `""` | Additional scheduler config settings in yaml format. |
-| scheduler.cpuLimit | string | `"2.5"` | Scheduler Kubernetes CPU limit. |
 | scheduler.disableClientsKillingRunners | bool | `false` | Normally, the scheduler will delete runners which clients fail to connect to. This disables that behavior to allow for inspection of the failed runners. |
 | scheduler.extraEnvs | list | `[]` | Extra environment variables for the scheduler. |
 | scheduler.image | string | `nil` | Image path for the scheduler. |
@@ -235,6 +238,10 @@ runner:
 | scheduler.nodeSelector | object | `{}` | Scheduler nodeSelectors. Should be a map from label names to label values. |
 | scheduler.placementGroupDeletionLagSeconds | int | `5` | Number of seconds to wait before deleting unused placement group from runners. |
 | scheduler.port | int | `50050` | Port to expose the scheduler on. |
+| scheduler.resources.limits.cpu | string | `"2.5"` | Scheduler Kubernetes CPU limit. |
+| scheduler.resources.limits.memory | string | `"5Gi"` | Scheduler Kubernetes memory limit. |
+| scheduler.resources.requests.cpu | string | `"2.5"` | Scheduler Kubernetes CPU request. |
+| scheduler.resources.requests.memory | string | `"5Gi"` | Scheduler Kubernetes memory request. |
 | scheduler.runnerCreationTimeoutSeconds | int | `600` | Number of seconds to wait for runner creation. |
 | scheduler.runnerDeletionLagSeconds | int | `5` | Number of seconds to wait before deleting unused runner. |
 | scheduler.service.annotations | object | `{"cloud.google.com/load-balancer-type":"Internal","service.beta.kubernetes.io/aws-load-balancer-internal":"true","service.beta.kubernetes.io/azure-load-balancer-internal":"true"}` | Scheduler service annotations. |

diff --git a/charts/exadeploy/templates/module-repository-deployment.yaml b/charts/exadeploy/templates/module-repository-deployment.yaml
@@ -44,12 +44,10 @@ spec:
         - name: metrics
           containerPort: {{ .Values.prometheus.port }}
           protocol: TCP
+        {{- if .Values.moduleRepository.resources }}
         resources:
-          requests:
-            memory: "3.5Gi"
-            cpu: "1"
-          limits:
-            memory: "3.5Gi"
+          {{- toYaml .Values.moduleRepository.resources | nindent 10 }}
+        {{- end }}
         {{- if eq .Values.moduleRepository.backend.type "remote" }}
         env:
         {{- if eq .Values.moduleRepository.backend.remote.dataBackend "s3"}}

diff --git a/charts/exadeploy/templates/scheduler-deployment.yaml b/charts/exadeploy/templates/scheduler-deployment.yaml
@@ -50,9 +50,10 @@ spec:
         - name: metrics
           containerPort: {{ .Values.prometheus.port }}
           protocol: TCP
+        {{- if .Values.scheduler.resources }}
         resources:
-          limits:
-            cpu: {{ .Values.scheduler.cpuLimit | quote }}
+          {{- toYaml .Values.scheduler.resources | nindent 10 }}
+        {{- end }}
         volumeMounts:
         - name: config
           mountPath: "/etc/config"

diff --git a/charts/exadeploy/values.yaml b/charts/exadeploy/values.yaml
@@ -16,8 +16,6 @@ scheduler:
   image: null
   # -- Port to expose the scheduler on.
   port: 50050
-  # -- Scheduler Kubernetes CPU limit.
-  cpuLimit: "2.5"
   # -- Scheduler nodeSelectors. Should be a map from label names to label values.
   nodeSelector: {}
   # -- Scheduler tolerations. Should be a list of objects with keys [key, operator, value (unnecessary when operator is "Exists"), effect].
@@ -40,6 +38,17 @@ scheduler:
     # -- Scheduler ingress annotations.
     annotations:
       nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
+  resources:
+    requests:
+      # -- Scheduler Kubernetes CPU request.
+      cpu: "2.5"
+      # -- Scheduler Kubernetes memory request.
+      memory: "5Gi"
+    limits:
+      # -- Scheduler Kubernetes CPU limit.
+      cpu: "2.5"
+      # -- Scheduler Kubernetes memory limit.
+      memory: "5Gi"
   # -- Optional specific serviceAccountName for the scheduler.
   serviceAccountName: null
   # -- Extra environment variables for the scheduler.
@@ -86,6 +95,17 @@ moduleRepository:
     # -- Module repository ingress annotations.
     annotations:
       nginx.ingress.kubernetes.io/backend-protocol: GRPC
+  resources:
+    requests:
+      # -- Module repository Kubernetes CPU request.
+      cpu: "1"
+      # -- Module repository Kubernetes memory request.
+      memory: "3.5Gi"
+    limits:
+      # -- Module repository Kubernetes CPU limit.
+      cpu: "1"
+      # -- Module repository Kubernetes memory limit.
+      memory: "3.5Gi"
   backend:
     # -- Module repository backend type. Must be one of [local, remote].
     type: "local"

diff --git a/golden/generated/exadeploy/full_aws/module-repository-deployment.yaml b/golden/generated/exadeploy/full_aws/module-repository-deployment.yaml
@@ -48,11 +48,12 @@ spec:
           containerPort: 21120
           protocol: TCP
         resources:
+          limits:
+            cpu: "1"
+            memory: 3.5Gi
           requests:
-            memory: "3.5Gi"
             cpu: "1"
-          limits:
-            memory: "3.5Gi"
+            memory: 3.5Gi
         env:
         - name: AWS_ACCESS_KEY_ID
           valueFrom:

diff --git a/golden/generated/exadeploy/full_aws/scheduler-deployment.yaml b/golden/generated/exadeploy/full_aws/scheduler-deployment.yaml
@@ -54,7 +54,11 @@ spec:
           protocol: TCP
         resources:
           limits:
-            cpu: "10200m"
+            cpu: 10200m
+            memory: 10Gi
+          requests:
+            cpu: "2.5"
+            memory: 5Gi
         volumeMounts:
         - name: config
           mountPath: "/etc/config"

diff --git a/golden/generated/exadeploy/full_gcp/module-repository-deployment.yaml b/golden/generated/exadeploy/full_gcp/module-repository-deployment.yaml
@@ -48,11 +48,12 @@ spec:
           containerPort: 21120
           protocol: TCP
         resources:
+          limits:
+            cpu: "1"
+            memory: 3.5Gi
           requests:
-            memory: "3.5Gi"
             cpu: "1"
-          limits:
-            memory: "3.5Gi"
+            memory: 3.5Gi
         env:
         - name: GOOGLE_APPLICATION_CREDENTIALS
           value: "/etc/credentials/gcp-credentials.json"

diff --git a/golden/generated/exadeploy/full_gcp/scheduler-deployment.yaml b/golden/generated/exadeploy/full_gcp/scheduler-deployment.yaml
@@ -54,7 +54,11 @@ spec:
           protocol: TCP
         resources:
           limits:
-            cpu: "10200m"
+            cpu: 10200m
+            memory: 10Gi
+          requests:
+            cpu: "2.5"
+            memory: 5Gi
         volumeMounts:
         - name: config
           mountPath: "/etc/config"

diff --git a/golden/generated/exadeploy/simple/module-repository-deployment.yaml b/golden/generated/exadeploy/simple/module-repository-deployment.yaml
@@ -40,11 +40,12 @@ spec:
           containerPort: 2112
           protocol: TCP
         resources:
+          limits:
+            cpu: "1"
+            memory: 3.5Gi
           requests:
-            memory: "3.5Gi"
             cpu: "1"
-          limits:
-            memory: "3.5Gi"
+            memory: 3.5Gi
         volumeMounts:
         - name: config
           mountPath: "/etc/config"

diff --git a/golden/generated/exadeploy/simple/scheduler-deployment.yaml b/golden/generated/exadeploy/simple/scheduler-deployment.yaml
@@ -44,6 +44,10 @@ spec:
         resources:
           limits:
             cpu: "2.5"
+            memory: 5Gi
+          requests:
+            cpu: "2.5"
+            memory: 5Gi
         volumeMounts:
         - name: config
           mountPath: "/etc/config"

diff --git a/golden/values/exadeploy/full_aws.yaml b/golden/values/exadeploy/full_aws.yaml
@@ -10,7 +10,6 @@ exafunction:
 scheduler:
   image: "foo.us-west-1.amazonaws.com/scheduler:bar_1234"
   port: 50
-  cpuLimit: "10200m"
   nodeSelector:
     role: "scheduler"
   tolerations:
@@ -22,6 +21,10 @@ scheduler:
     enabled: true
     className: "nginx"
     host: "scheduler.custom.domain"
+  resources:
+    limits:
+      cpu: "10200m"
+      memory: "10Gi"
   serviceAccountName: "my-scheduler-serviceaccount"
   extraEnvs:
     - name: "EXA_SCHEDULER_EXTRA_ENV"

diff --git a/golden/values/exadeploy/full_gcp.yaml b/golden/values/exadeploy/full_gcp.yaml
@@ -10,7 +10,6 @@ exafunction:
 scheduler:
   image: "gcr.io/foo/scheduler:bar_1234"
   port: 50
-  cpuLimit: "10200m"
   nodeSelector:
     role: "scheduler"
   tolerations:
@@ -22,6 +21,10 @@ scheduler:
     enabled: true
     className: "nginx"
     host: "scheduler.custom.domain"
+  resources:
+    limits:
+      cpu: "10200m"
+      memory: "10Gi"
   serviceAccountName: "my-scheduler-serviceaccount"
   extraEnvs:
     - name: "EXA_SCHEDULER_EXTRA_ENV"