Merge pull request #125 from screwdriver-cd/cpu_and_ram

fix: CPU and RAM can be configured separately
screwdriver-cd · Nov 28, 2017 · da579f1 · da579f1
2 parents 6adb729 + 287a7e4
commit da579f1
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/docs/user-guide/configuration/index.md b/docs/user-guide/configuration/index.md
@@ -28,7 +28,8 @@ You can access information about properties by hovering over the property name.
     <a href="#annotations"><span class="key">annotations</span>:
     <span class="key">beta.screwdriver.cd/my-cluster-annotation</span>: <span class="value">my-data</span></a>
         <a href="#executor"><span class="key">beta.screwdriver.cd/executor</span>: <span class="value">k8s-vm</span></a>
-        <a href="#resource"><span class="key">beta.screwdriver.cd/resource</span>: <span class="value">HIGH</span></a>
+        <a href="#cpu"><span class="key">beta.screwdriver.cd/cpu</span>: <span class="value">HIGH</span></a>
+        <a href="#ram"><span class="key">beta.screwdriver.cd/ram</span>: <span class="value">LOW</span></a>
 <a href="#jobs"><span class="key">jobs</span>:</a>
       <span class="key">main</span>:
         <a href="#requires"><span class="key">requires</span>: <span class="value">[~pr, ~commit, ~sd@123:main]</span></a>
@@ -89,9 +90,13 @@ You can access information about properties by hovering over the property name.
             <h4>Executor annotation</h4>
             <p>Used to designate a non-default executor to run the build. Some available executors are `jenkins`, `k8s-vm`</p>
         </div>
-        <div id="resource" class="hidden">
-            <h4>Resource annotation</h4>
-            <p>CPU and RAM allocated for the VM if using `k8s-vm` executor. `LOW` is configured by default, and indicates 2CPU and 2GB memory. `HIGH` means 6CPU and 12GB memory.</p>
+        <div id="cpu" class="hidden">
+            <h4>CPU annotation</h4>
+            <p>CPU allocated for the VM if using `k8s-vm` executor. `LOW` is configured by default, and indicates 2CPU memory. `HIGH` means 6CPU.</p>
+        </div>
+        <div id="ram" class="hidden">
+            <h4>RAM annotation</h4>
+            <p>RAM allocated for the VM if using `k8s-vm` executor. `LOW` is configured by default, and indicates 2GB memory. `HIGH` means 12GB memory.</p>
         </div>
         <div id="email" class="hidden">
             <h4>Email</h4>