Calculate effective limit min in UI for request/limit ratio

Author: spadgett

app/scripts/controllers/setLimits.js

@@ -65,11 +65,6 @@ angular.module('openshiftConsole')
         // Update project breadcrumb with display name.
         $scope.breadcrumbs[0].title = $filter('displayName')(project);
 
-        // Check if requests or limits are calculated. Memory limit is never calculated.
-        $scope.cpuRequestCalculated = LimitRangesService.isRequestCalculated('cpu', project);
-        $scope.cpuLimitCalculated = LimitRangesService.isLimitCalculated('cpu', project);
-        $scope.memoryRequestCalculated = LimitRangesService.isRequestCalculated('memory', project);
-
         DataService.get(type, $scope.name, context).then(
           function(result) {
             var resource = angular.copy(result);

app/scripts/directives/editRequestLimit.js

@@ -175,13 +175,15 @@ angular.module('openshiftConsole')
         // 'cpu' or 'memory'
         type: '@',
         limitRanges: '=',
-        requestCalculated: '=',
-        limitCalculated: '=?'
+        // The project, needed to determine if request is calculated from limit.
+        project: '='
       },
       templateUrl: 'views/_edit-request-limit.html',
       link: function(scope) {
         scope.$watch('limitRanges', function() {
-          scope.limits = LimitRangesService.getEffectiveLimitRange(scope.limitRanges, scope.type, 'Container');
+          scope.limits = LimitRangesService.getEffectiveLimitRange(scope.limitRanges, scope.type, 'Container', scope.project);
+          scope.requestCalculated = LimitRangesService.isRequestCalculated(scope.type, scope.project);
+          scope.limitCalculated = LimitRangesService.isLimitCalculated(scope.type, scope.project);
         }, true);
       }
     };

app/scripts/services/hpa.js

@@ -66,17 +66,17 @@ angular.module("openshiftConsole")
     // computeResource  - 'cpu' or 'memory'
     // defaultType      - 'defaultRequest' or 'defaultLimit'
     // limitRanges     - collection of LimitRange objects (hash or array)
-    var hasDefault = function(computeResource, defaultType, limitRanges) {
-      var effectiveLimits = LimitRangesService.getEffectiveLimitRange(limitRanges, computeResource, 'Container');
+    var hasDefault = function(computeResource, defaultType, limitRanges, project) {
+      var effectiveLimits = LimitRangesService.getEffectiveLimitRange(limitRanges, computeResource, 'Container', project);
       return !!effectiveLimits[defaultType];
     };
 
-    var hasDefaultRequest = function(computeResource, limitRanges) {
-      return hasDefault(computeResource, 'defaultRequest', limitRanges);
+    var hasDefaultRequest = function(computeResource, limitRanges, project) {
+      return hasDefault(computeResource, 'defaultRequest', limitRanges, project);
     };
 
-    var hasDefaultLimit = function(computeResource, limitRanges) {
-      return hasDefault(computeResource, 'defaultLimit', limitRanges);
+    var hasDefaultLimit = function(computeResource, limitRanges, project) {
+      return hasDefault(computeResource, 'defaultLimit', limitRanges, project);
     };
 
     // Is the corresponding limit value set to calculate a request?
@@ -91,7 +91,7 @@ angular.module("openshiftConsole")
 
       // Check if the corresponding limit is set or defaulted.
       return hasLimitSet(limitComputeResource, containers) ||
-             hasDefaultLimit(limitComputeResource, limitRanges);
+             hasDefaultLimit(limitComputeResource, limitRanges, project);
     };
 
     // Checks if a CPU request is currently set or will be defaulted for any
@@ -105,7 +105,7 @@ angular.module("openshiftConsole")
         return true;
       }
 
-      if (hasDefaultRequest('cpu', limitRanges)) {
+      if (hasDefaultRequest('cpu', limitRanges, project)) {
         return true;
       }
 

app/scripts/services/limits.js

@@ -4,6 +4,7 @@ angular.module("openshiftConsole")
   .factory("LimitRangesService", function($filter, LIMIT_REQUEST_OVERRIDES) {
     var usageValue = $filter('usageValue');
     var usageWithUnits = $filter('usageWithUnits');
+    var amountAndUnit = $filter('amountAndUnit');
 
     var isSmaller = function(candidate, previous) {
       if (!candidate) {
@@ -89,7 +90,7 @@ angular.module("openshiftConsole")
     //   max: "2",
     // }
 
-    var getEffectiveLimitRange = function(limitRanges, computeResource, resourceType) {
+    var getEffectiveLimitRange = function(limitRanges, computeResource, resourceType, project) {
       var effectiveRange = {};
       angular.forEach(limitRanges, function(limitRange) {
         angular.forEach(limitRange.spec.limits, function(limit) {
@@ -126,6 +127,21 @@ angular.module("openshiftConsole")
         });
       });
 
+      // If request is calculated from limit, adjust the effective min.  The
+      // effective min needs to be large enough so that the calculated request
+      // value validates.
+      var requestToLimitPercent, minAmountAndUnit, minAmount, minUnit;
+      if (effectiveRange.min) {
+        requestToLimitPercent = getRequestToLimitPercent(computeResource, project);
+        if (requestToLimitPercent) {
+          // Apply the ratio, making sure to keep the same unit.
+          minAmountAndUnit = amountAndUnit(effectiveRange.min);
+          minAmount = Math.ceil(minAmountAndUnit[0] / (requestToLimitPercent / 100));
+          minUnit = minAmountAndUnit[1] || '';
+          effectiveRange.min = '' + minAmount + minUnit;
+        }
+      }
+
       return effectiveRange;
     };
 
@@ -137,8 +153,8 @@ angular.module("openshiftConsole")
         return [];
       }
 
-      var podLimits = getEffectiveLimitRange(limitRanges, computeResource, 'Pod');
-      var containerLimits = getEffectiveLimitRange(limitRanges, computeResource, 'Container');
+      var podLimits = getEffectiveLimitRange(limitRanges, computeResource, 'Pod', project);
+      var containerLimits = getEffectiveLimitRange(limitRanges, computeResource, 'Container', project);
 
       // Use usageValue to normalize units.
       var requestTotal = 0,

app/views/create/fromimage.html

@@ -325,14 +325,13 @@ <h3>Environment Variables (Runtime only) <span class="help action-inline">
                                   resources="container.resources"
                                   type="cpu"
                                   limit-ranges="limitRanges"
-                                  request-calculated="cpuRequestCalculated"
-                                  limit-calculated="cpuLimitCalculated">
+                                  project="project">
                               </edit-request-limit>
                               <edit-request-limit
                                   resources="container.resources"
                                   type="memory"
                                   limit-ranges="limitRanges"
-                                  request-calculated="memoryRequestCalculated">
+                                  project="project">
                               </edit-request-limit>
                               <div ng-repeat="problem in cpuProblems" class="has-error">
                                 <span class="help-block">{{problem}}</span>

app/views/set-limits.html

@@ -34,14 +34,13 @@ <h2 ng-if="containers.length > 1">Container {{container.name}}</h2>
                           resources="container.resources"
                           type="cpu"
                           limit-ranges="limitRanges"
-                          request-calculated="cpuRequestCalculated"
-                          limit-calculated="cpuLimitCalculated">
+                          project="project">
                       </edit-request-limit>
                       <edit-request-limit
                           resources="container.resources"
                           type="memory"
                           limit-ranges="limitRanges"
-                          request-calculated="memoryRequestCalculated">
+                          project="project">
                       </edit-request-limit>
                     </div>
                     <div ng-repeat="problem in cpuProblems" class="has-error">