CAN-1628 static multinode sidecar resources (#1290)

intel · Mar 5, 2019 · cca02d9 · cca02d9
1 parent 6c137fa
commit cca02d9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/applications/cli/cli_text_consts.py b/applications/cli/cli_text_consts.py
@@ -532,7 +532,7 @@ class ExperimentViewCmdTexts:
     EXPERIMENT_NAME - is a name of experiment whose details should be displayed.
     """
     HELP_T = "If given, then exposes a tensorboard's instance with experiment's data."
-    CONTAINER_DETAILS_MSG = "- Name: {name}\n- Status: {status}\n- Volumes:\n  {volumes}\n- Resources:  {resources}"
+    CONTAINER_DETAILS_MSG = "\n- Name: {name}\n- Status: {status}\n- Volumes:\n  {volumes}\n- Resources:  {resources}"
     EXPERIMENT_NOT_FOUND_ERROR_MSG = "Experiment \"{experiment_name}\" not found."
     PODS_PARTICIPATING_LIST_HEADER = "\nPods participating in the execution:\n"
     PODS_TABLE_HEADERS = ["Name", "Uid", "Pod Conditions", "Container Details"]

diff --git a/applications/cli/draft/packs/multinode-tf-training-tfjob-py2/charts/templates/tfjob.yaml b/applications/cli/draft/packs/multinode-tf-training-tfjob-py2/charts/templates/tfjob.yaml
@@ -162,8 +162,11 @@ spec:
                 privileged: true
               resources:
                 requests:
-                  cpu: {{ default .Values.sidecar_resources.requests.cpu .Values.sidecar_cpu}}
+                  cpu: {{ default .Values.sidecar_resources.requests.cpu .Values.sidecar_cpu }}
                   memory: {{ default .Values.sidecar_resources.requests.memory .Values.sidecar_memory }}
+                limits:
+                  cpu: {{ default .Values.sidecar_resources.limits.cpu .Values.sidecar_cpu }}
+                  memory: {{ default .Values.sidecar_resources.limits.memory .Values.sidecar_memory }}
           volumes:
             - name: input-home
               persistentVolumeClaim:

diff --git a/applications/cli/draft/packs/multinode-tf-training-tfjob-py2/charts/values.yaml b/applications/cli/draft/packs/multinode-tf-training-tfjob-py2/charts/values.yaml
@@ -43,7 +43,10 @@ ps_memory: null
 sidecar_resources:
   requests:
     cpu: 0.01
-    memory: 1Gi
+    memory: 100Mi
+  limits:
+    cpu: 0.01
+    memory: 100Mi
 
 sidecar_cpu: null
 sidecar_memory: null

diff --git a/applications/cli/draft/packs/multinode-tf-training-tfjob/charts/templates/tfjob.yaml b/applications/cli/draft/packs/multinode-tf-training-tfjob/charts/templates/tfjob.yaml
@@ -162,8 +162,11 @@ spec:
                 privileged: true
               resources:
                 requests:
-                  cpu: {{ default .Values.sidecar_resources.requests.cpu .Values.sidecar_cpu}}
+                  cpu: {{ default .Values.sidecar_resources.requests.cpu .Values.sidecar_cpu }}
                   memory: {{ default .Values.sidecar_resources.requests.memory .Values.sidecar_memory }}
+                limits:
+                    cpu: {{ default .Values.sidecar_resources.limits.cpu .Values.sidecar_cpu }}
+                    memory: {{ default .Values.sidecar_resources.limits.memory .Values.sidecar_memory }}
           volumes:
             - name: input-home
               persistentVolumeClaim:

diff --git a/applications/cli/draft/packs/multinode-tf-training-tfjob/charts/values.yaml b/applications/cli/draft/packs/multinode-tf-training-tfjob/charts/values.yaml
@@ -43,7 +43,10 @@ ps_memory: null
 sidecar_resources:
   requests:
     cpu: 0.01
-    memory: 1Gi
+    memory: 100Mi
+  limits:
+    cpu: 0.01
+    memory: 100Mi
 
 sidecar_cpu: null
 sidecar_memory: null