Add resource specs for all RHODS components (#105)

anishasthana · harshad16 · Chad Roberts · commit 8c13be6fb377 · 2021-06-03T09:03:57.000-04:00
* Add limits and requests for all notebook image builds

Signed-off-by: Anish Asthana &lt;anishasthana1@gmail.com&gt;

* Add limits and requests for all Jupyterhub objects and builds

Signed-off-by: Anish Asthana &lt;anishasthana1@gmail.com&gt;

* Fix Jupyterhub-db build config name

Signed-off-by: Anish Asthana &lt;anishasthana1@gmail.com&gt;

* Add limits and requests to the anaconda-ce validator

Signed-off-by: Anish Asthana &lt;anishasthana1@gmail.com&gt;

* Increase Elyra buildconfig resources

Co-authored-by: Harshad Reddy Nalla &lt;harshadreddy16@gmail.com&gt;

Co-authored-by: Harshad Reddy Nalla &lt;harshadreddy16@gmail.com&gt;
diff --git a/jupyterhub/jupyterhub/base/jupyterhub-db-dc.yaml b/jupyterhub/jupyterhub/base/jupyterhub-db-dc.yaml
@@ -50,6 +50,10 @@ spec:
               'SELECT 1'
         resources:
           limits:
+            cpu: "1"
+            memory: 1Gi
+          requests:
+            cpu: "1"
             memory: 1Gi
         volumeMounts:
         - mountPath: /var/lib/pgsql/data
diff --git a/jupyterhub/jupyterhub/base/jupyterhub-dc.yaml b/jupyterhub/jupyterhub/base/jupyterhub-dc.yaml
@@ -93,6 +93,10 @@ spec:
           protocol: TCP
         resources:
           limits:
+            cpu: "1"
+            memory: 1Gi
+          requests:
+            cpu: "1"
             memory: 1Gi
         volumeMounts:
         - mountPath: /opt/app-root/configs
@@ -112,6 +116,10 @@ spec:
         name: wait-for-database
         resources:
           limits:
+            cpu: "1"
+            memory: 1Gi
+          requests:
+            cpu: "1"
             memory: 1Gi
       serviceAccountName: jupyterhub-hub
       imagePullSecrets:
diff --git a/jupyterhub/jupyterhub/overlays/build/jupyterhub-buildconfig.yaml b/jupyterhub/jupyterhub/overlays/build/jupyterhub-buildconfig.yaml
@@ -10,6 +10,13 @@ spec:
     to:
       kind: ImageStreamTag
       name: jupyterhub:latest
+  resources:
+    limits:
+      cpu: "2"
+      memory: 4Gi
+    requests:
+      cpu: "1"
+      memory: 2Gi
   source:
     git:
       ref: v3.5.1
diff --git a/jupyterhub/jupyterhub/overlays/build/jupyterhub-db-buildconfig.yaml b/jupyterhub/jupyterhub/overlays/build/jupyterhub-db-buildconfig.yaml
@@ -9,6 +9,13 @@ spec:
     to:
       kind: ImageStreamTag
       name: jupyterhub-img:latest
+  resources:
+    limits:
+      cpu: "2"
+      memory: 4Gi
+    requests:
+      cpu: "1"
+      memory: 2Gi
   source:
     git:
       uri: https://github.com/opendatahub-io/jupyterhub-odh
diff --git a/jupyterhub/jupyterhub/overlays/build/kustomization.yaml b/jupyterhub/jupyterhub/overlays/build/kustomization.yaml
@@ -5,7 +5,7 @@ bases:
 resources:
 - jupyterhub-imagestream.yaml
 - jupyterhub-buildconfig.yaml
-- jupyterhub-dh-buildconfig.yaml
+- jupyterhub-db-buildconfig.yaml
 
 commonLabels:
   opendatahub.io/component: "true"
diff --git a/jupyterhub/notebook-images/overlays/build/elyra-notebook-buildconfig.yaml b/jupyterhub/notebook-images/overlays/build/elyra-notebook-buildconfig.yaml
@@ -9,6 +9,13 @@ spec:
     to:
       kind: ImageStreamTag
       name: s2i-lab-elyra:v0.0.7
+  resources:
+    limits:
+      cpu: "2"
+      memory: 8Gi
+    requests:
+      cpu: "1"
+      memory: 6Gi
   source:
     git:
       uri: https://github.com/opendatahub-io/s2i-lab-elyra
diff --git a/jupyterhub/notebook-images/overlays/build/generic-data-science-notebook-buildconfig.yaml b/jupyterhub/notebook-images/overlays/build/generic-data-science-notebook-buildconfig.yaml
@@ -9,6 +9,13 @@ spec:
     to:
       kind: ImageStreamTag
       name: s2i-generic-data-science-notebook:local-build
+  resources:
+    limits:
+      cpu: "2"
+      memory: 4Gi
+    requests:
+      cpu: "1"
+      memory: 2Gi
   source:
     git:
       uri: https://github.com/thoth-station/s2i-generic-data-science-notebook
diff --git a/jupyterhub/notebook-images/overlays/build/minimal-notebook-buildconfig.yaml b/jupyterhub/notebook-images/overlays/build/minimal-notebook-buildconfig.yaml
@@ -9,6 +9,13 @@ spec:
     to:
       kind: ImageStreamTag
       name: s2i-minimal-notebook:local-build
+  resources:
+    limits:
+      cpu: "2"
+      memory: 4Gi
+    requests:
+      cpu: "1"
+      memory: 2Gi
   source:
     git:
       uri: https://github.com/thoth-station/s2i-minimal-notebook
diff --git a/jupyterhub/notebook-images/overlays/build/scipy-notebook-buildconfig.yaml b/jupyterhub/notebook-images/overlays/build/scipy-notebook-buildconfig.yaml
@@ -9,6 +9,13 @@ spec:
     to:
       kind: ImageStreamTag
       name: s2i-scipy-notebook:local-build
+  resources:
+    limits:
+      cpu: "2"
+      memory: 4Gi
+    requests:
+      cpu: "1"
+      memory: 2Gi
   source:
     git:
       uri: https://github.com/thoth-station/s2i-scipy-notebook
diff --git a/jupyterhub/notebook-images/overlays/build/spark-minimal-notebook-buildconfig.yaml b/jupyterhub/notebook-images/overlays/build/spark-minimal-notebook-buildconfig.yaml
@@ -9,6 +9,13 @@ spec:
     to:
       kind: ImageStreamTag
       name: s2i-spark-minimal-notebook:local-build
+  resources:
+    limits:
+      cpu: "2"
+      memory: 4Gi
+    requests:
+      cpu: "1"
+      memory: 2Gi
   source:
     git:
       uri: https://github.com/thoth-station/s2i-minimal-notebook
diff --git a/jupyterhub/notebook-images/overlays/build/spark-scipy-notebook-buildconfig.yaml b/jupyterhub/notebook-images/overlays/build/spark-scipy-notebook-buildconfig.yaml
@@ -9,6 +9,13 @@ spec:
     to:
       kind: ImageStreamTag
       name: s2i-spark-scipy-notebook:local-build
+  resources:
+    limits:
+      cpu: "2"
+      memory: 4Gi
+    requests:
+      cpu: "1"
+      memory: 2Gi
   source:
     git:
       uri: https://github.com/thoth-station/s2i-scipy-notebook
diff --git a/jupyterhub/notebook-images/overlays/build/tensorflow-notebook-buildconfig.yaml b/jupyterhub/notebook-images/overlays/build/tensorflow-notebook-buildconfig.yaml
@@ -9,6 +9,13 @@ spec:
     to:
       kind: ImageStreamTag
       name: s2i-tensorflow-notebook:local-build
+  resources:
+    limits:
+      cpu: "2"
+      memory: 4Gi
+    requests:
+      cpu: "1"
+      memory: 2Gi
   source:
     git:
       uri: https://github.com/thoth-station/s2i-tensorflow-notebook
diff --git a/jupyterhub/notebook-images/overlays/cuda-11.0.3/cuda-ubi8-build-chain.yaml b/jupyterhub/notebook-images/overlays/cuda-11.0.3/cuda-ubi8-build-chain.yaml
@@ -83,7 +83,13 @@ items:
       to:
         kind: ImageStreamTag
         name: '$(cuda_version)-cuda-s2i-core-ubi8:latest'
-    resources: {}
+    resources:
+      limits:
+        cpu: "2"
+        memory: 4Gi
+      requests:
+        cpu: "1"
+        memory: 2Gi
     completionDeadlineSeconds: 1800
     successfulBuildsHistoryLimit: 1
     failedBuildsHistoryLimit: 1
@@ -116,7 +122,13 @@ items:
       to:
         kind: ImageStreamTag
         name: '$(cuda_version)-cuda-s2i-base-ubi8:latest'
-    resources: {}
+    resources:
+      limits:
+        cpu: "2"
+        memory: 4Gi
+      requests:
+        cpu: "1"
+        memory: 2Gi
     completionDeadlineSeconds: 1800
     successfulBuildsHistoryLimit: 1
     failedBuildsHistoryLimit: 1
@@ -149,7 +161,13 @@ items:
       to:
         kind: ImageStreamTag
         name: '$(cuda_version)-cuda-s2i-py38-ubi8:latest'
-    resources: {}
+    resources:
+      limits:
+        cpu: "2"
+        memory: 4Gi
+      requests:
+        cpu: "1"
+        memory: 2Gi
     completionDeadlineSeconds: 1800
     successfulBuildsHistoryLimit: 1
     failedBuildsHistoryLimit: 1
@@ -182,7 +200,13 @@ items:
       to:
         kind: ImageStreamTag
         name: '$(cuda_version)-cuda-s2i-thoth-ubi8-py38:latest'
-    resources: {}
+    resources:
+      limits:
+        cpu: "2"
+        memory: 4Gi
+      requests:
+        cpu: "1"
+        memory: 2Gi
     completionDeadlineSeconds: 1800
     successfulBuildsHistoryLimit: 1
     failedBuildsHistoryLimit: 1
diff --git a/jupyterhub/notebook-images/overlays/cuda-11.0.3/gpu-notebook.yaml b/jupyterhub/notebook-images/overlays/cuda-11.0.3/gpu-notebook.yaml
@@ -78,7 +78,11 @@ items:
         kind: ImageStreamTag
         name: 'minimal-gpu:py3.8-cuda-$(cuda_version)'
     resources:
+      limits:
+        cpu: "4"
+        memory: 8Gi
       requests:
+        cpu: "2"
         memory: 4Gi
     completionDeadlineSeconds: 1800
     successfulBuildsHistoryLimit: 1
@@ -113,8 +117,10 @@ items:
         name: 'tensorflow-gpu:py3.8-cuda-$(cuda_version)'
     resources:
       limits:
+        cpu: "4"
         memory: 8Gi
       requests:
+        cpu: "2"
         memory: 6Gi
     completionDeadlineSeconds: 1800
     successfulBuildsHistoryLimit: 1
@@ -147,8 +153,10 @@ items:
         name: 'pytorch-gpu:py3.8-cuda-$(cuda_version)'
     resources:
       limits:
+        cpu: "4"
         memory: 8Gi
       requests:
+        cpu: "2"
         memory: 6Gi
     completionDeadlineSeconds: 1800
     successfulBuildsHistoryLimit: 1
diff --git a/jupyterhub/notebook-images/overlays/cuda/tensorflow-gpu-notebook.yaml b/jupyterhub/notebook-images/overlays/cuda/tensorflow-gpu-notebook.yaml
@@ -23,7 +23,11 @@ items:
         name: s2i-minimal-notebook-gpu:3.6
     resources:
       limits:
-        memory: 3Gi
+        cpu: "2"
+        memory: 4Gi
+      requests:
+        cpu: "1"
+        memory: 2Gi
     source:
       git:
         ref: v0.0.7
diff --git a/partners/anaconda/base/anaconda-ce-validator-cron.yaml b/partners/anaconda/base/anaconda-ce-validator-cron.yaml
@@ -27,6 +27,13 @@ spec:
                 - name: secret-volume
                   mountPath: /etc/secret-volume
                   readOnly: true
+            resources:
+              limits:
+                cpu: 100m
+                memory: 256Mi
+              requests:
+                cpu: 100m
+                memory: 256Mi
           volumes:
             - name: secret-volume
               secret:
