Add v2beta1 api warning to Deployment pages & edit Autoscaler page

Author: benjaminapetersen

app/scripts/controllers/edit/autoscaler.js

@@ -78,6 +78,7 @@ angular.module('openshiftConsole')
     var horizontalPodAutoscalerVersion = APIService.getPreferredVersion('horizontalpodautoscalers');
     var limitRangesVersion = APIService.getPreferredVersion('limitranges');
 
+
     ProjectsService
       .get($routeParams.project)
       .then(_.spread(function(project, context) {
@@ -186,6 +187,8 @@ angular.module('openshiftConsole')
                               };
                             });
 
+          $scope.usesV2Metrics = HPAService.usesV2Metrics(resource);
+
           // Are we editing an existing HPA?
           if ($routeParams.kind === "HorizontalPodAutoscaler") {
             $scope.targetKind = _.get(resource, 'spec.scaleTargetRef.kind');

app/scripts/directives/oscAutoscaling.js

@@ -13,10 +13,11 @@ angular.module("openshiftConsole")
       scope: {
         autoscaling: "=model",
         showNameInput: "=?",
-        nameReadOnly: "=?"
+        nameReadOnly: "=?",
+        showRequestInput: "=?"
       },
       templateUrl: 'views/directives/osc-autoscaling.html',
-      link: function(scope) {
+      link: function(scope, elem, attrs) {
         scope.nameValidation = DNS1123_SUBDOMAIN_VALIDATION;
 
         // Prefill a default value if DEFAULT_HPA_CPU_TARGET_PERCENT is set and
@@ -26,6 +27,10 @@ angular.module("openshiftConsole")
         if (_.isNil(targetCPU) && defaultTargetCPU) {
           _.set(scope, 'autoscaling.targetCPU', defaultTargetCPU);
         }
+        // true if not present
+        if( !('showRequestInput' in attrs) ) {
+          scope.showRequestInput = true;
+        }
       }
     };
   });

app/scripts/services/hpa.js

@@ -2,6 +2,9 @@
 
 angular.module("openshiftConsole")
   .factory("HPAService", function($filter, $q, LimitRangesService, MetricsService) {
+
+    var annotation = $filter('annotation');
+
     // Checks if all containers have a value set for the compute resource request or limit.
     //
     // computeResource  - 'cpu' or 'memory'
@@ -99,6 +102,13 @@ angular.module("openshiftConsole")
     };
 
 
+    var hasV2HPAAnnotations = function(hpaResources) {
+      return _.some(hpaResources, function(hpa) {
+        return annotation(hpa, 'autoscaling.alpha.kubernetes.io/metrics');
+      });
+    };
+
+
     var hasCompetingAutoscalersWarning = function(hpaResources) {
       if (_.size(hpaResources) > 1) {
         return {
@@ -146,15 +156,19 @@ angular.module("openshiftConsole")
         return $q.when([]);
       }
       return MetricsService.isAvailable().then(function(metricsAvailable) {
+        var isV2HPA = hasV2HPAAnnotations(hpaResources);
         return _.compact([
           hasMetricsAvailableWarning(metricsAvailable),
-          hasCPURequestWarning(scaleTarget, limitRanges, project),
+          // we don't need to show this warning, but if we have it, we should also
+          // not show the cpuRequestWarning, until we update to the newer API
+          isV2HPA ? false : hasCPURequestWarning(scaleTarget, limitRanges, project),
           hasCompetingAutoscalersWarning(hpaResources),
           hasCompetingDCAndAutoscalerWarning(scaleTarget, hpaResources)
         ]);
       });
     };
 
+
     // Group HPAs by the object they scale.
     //
     // Returns an hpaByResource map with
@@ -185,7 +199,13 @@ angular.module("openshiftConsole")
       return hpaByResource;
     };
 
+    // currently unsupported by the webconsole
+    var usesV2Metrics = function(hpa) {
+      return hasV2HPAAnnotations([hpa]);
+    };
+
     return {
+      usesV2Metrics: usesV2Metrics,
       hasCPURequest: hasCPURequest,
       filterHPA: filterHPA,
       getHPAWarnings: getHPAWarnings,

app/views/directives/osc-autoscaling.html

@@ -99,7 +99,7 @@
       </span>
     </div>
   </div>
-  <div class="form-group">
+  <div ng-show="showRequestInput" class="form-group">
     <label>
       CPU Request Target
     </label>

app/views/edit/autoscaler.html

@@ -38,11 +38,21 @@ <h1>
               <span ng-if="!('cpu' | isRequestCalculated : project)">request.</span>
             </div>
 
+            <!-- Warning: V2Beta1 HPA -->
+            <div ng-if="usesV2Metrics" class="alert alert-warning">
+              <span class="pficon pficon-warning-triangle-o" aria-hidden="true"></span>
+              <span class="sr-only">Warning:</span>
+              This autoscaler uses a newer API, consider editing it with the
+              <a href="command-line" target="_blank">command line tools</a>.
+            </div>
+
+
             <fieldset ng-disabled="disableInputs" class="gutter-top">
               <osc-autoscaling
                   model="autoscaling"
                   show-name-input="true"
-                  name-read-only="kind === 'HorizontalPodAutoscaler'">
+                  name-read-only="kind === 'HorizontalPodAutoscaler'"
+                  show-request-input="autoscaling.targetCPU">
               </osc-autoscaling>
 
               <label-editor

dist/scripts/scripts.js

@@ -3109,40 +3109,44 @@ controller: "SetHomePageModalController"
 }
 };
 } ]), angular.module("openshiftConsole").factory("HPAService", [ "$filter", "$q", "LimitRangesService", "MetricsService", function(e, t, n, r) {
-var a = function(e, t, n) {
+var a = e("annotation"), o = function(e, t, n) {
 return _.every(n, function(n) {
 return _.get(n, [ "resources", t, e ]);
 });
-}, o = function(e, t) {
-return a(e, "requests", t);
 }, i = function(e, t) {
-return a(e, "limits", t);
-}, s = function(e, t, r) {
+return o(e, "requests", t);
+}, s = function(e, t) {
+return o(e, "limits", t);
+}, c = function(e, t, r) {
 return !!n.getEffectiveLimitRange(r, e, "Container")[t];
-}, c = function(e, t) {
-return s(e, "defaultRequest", t);
 }, l = function(e, t) {
-return s(e, "defaultLimit", t);
-}, u = function(e, t, r) {
-return !!n.hasClusterResourceOverrides(r) || (!(!o("cpu", e) && !c("cpu", t)) || !(!i("cpu", e) && !l("cpu", t)));
-}, d = e("humanizeKind"), m = e("hasDeploymentConfig"), p = function(e) {
+return c(e, "defaultRequest", t);
+}, u = function(e, t) {
+return c(e, "defaultLimit", t);
+}, d = function(e, t, r) {
+return !!n.hasClusterResourceOverrides(r) || (!(!i("cpu", e) && !l("cpu", t)) || !(!s("cpu", e) && !u("cpu", t)));
+}, m = e("humanizeKind"), p = e("hasDeploymentConfig"), f = function(e) {
 if (!e) return {
 message: "Metrics might not be configured by your cluster administrator. Metrics are required for autoscaling.",
 reason: "MetricsNotAvailable"
 };
-}, f = function(e, t, n) {
+}, g = function(e, t, n) {
 var r, a = _.get(e, "spec.template.spec.containers", []);
-if (!u(a, t, n)) return r = d(e.kind), {
+if (!d(a, t, n)) return r = m(e.kind), {
 message: "This " + r + " does not have any containers with a CPU request set. Autoscaling will not work without a CPU request.",
 reason: "NoCPURequest"
 };
-}, g = function(e) {
+}, v = function(e) {
+return _.some(e, function(e) {
+return a(e, "autoscaling.alpha.kubernetes.io/metrics");
+});
+}, h = function(e) {
 if (_.size(e) > 1) return {
 message: "More than one autoscaler is scaling this resource. This is not recommended because they might compete with each other. Consider removing all but one autoscaler.",
 reason: "MultipleHPA"
 };
-}, v = function(e, t) {
-if ("ReplicationController" === e.kind && m(e) && _.some(t, function() {
+}, y = function(e, t) {
+if ("ReplicationController" === e.kind && p(e) && _.some(t, function() {
 return _.some(t, function(e) {
 return "ReplicationController" === _.get(e, "spec.scaleTargetRef.kind");
 });
@@ -3152,15 +3156,19 @@ reason: "DeploymentHasHPA"
 };
 };
 return {
-hasCPURequest: u,
+usesV2Metrics: function(e) {
+return v([ e ]);
+},
+hasCPURequest: d,
 filterHPA: function(e, t, n) {
 return _.filter(e, function(e) {
 return e.spec.scaleTargetRef.kind === t && e.spec.scaleTargetRef.name === n;
 });
 },
 getHPAWarnings: function(e, n, a, o) {
 return !e || _.isEmpty(n) ? t.when([]) : r.isAvailable().then(function(t) {
-return _.compact([ p(t), f(e, a, o), g(n), v(e, n) ]);
+var r = v(n);
+return _.compact([ f(t), !r && g(e, a, o), h(n), y(e, n) ]);
 });
 },
 groupHPAs: function(e) {
@@ -7699,7 +7707,7 @@ return {
 name: t,
 value: e
 };
-}), "HorizontalPodAutoscaler" === n.kind) e.targetKind = _.get(a, "spec.scaleTargetRef.kind"), e.targetName = _.get(a, "spec.scaleTargetRef.name"), _.assign(e.autoscaling, {
+}), e.usesV2Metrics = c.usesV2Metrics(a), "HorizontalPodAutoscaler" === n.kind) e.targetKind = _.get(a, "spec.scaleTargetRef.kind"), e.targetName = _.get(a, "spec.scaleTargetRef.name"), _.assign(e.autoscaling, {
 minReplicas: _.get(a, "spec.minReplicas"),
 maxReplicas: _.get(a, "spec.maxReplicas"),
 targetCPU: _.get(a, "spec.targetCPUUtilizationPercentage")
@@ -10259,13 +10267,14 @@ restrict: "E",
 scope: {
 autoscaling: "=model",
 showNameInput: "=?",
-nameReadOnly: "=?"
+nameReadOnly: "=?",
+showRequestInput: "=?"
 },
 templateUrl: "views/directives/osc-autoscaling.html",
-link: function(t) {
+link: function(t, r, a) {
 t.nameValidation = n;
-var r = e.DEFAULT_HPA_CPU_TARGET_PERCENT, a = _.get(t, "autoscaling.targetCPU");
-_.isNil(a) && r && _.set(t, "autoscaling.targetCPU", r);
+var o = e.DEFAULT_HPA_CPU_TARGET_PERCENT, i = _.get(t, "autoscaling.targetCPU");
+_.isNil(i) && o && _.set(t, "autoscaling.targetCPU", o), "showRequestInput" in a || (t.showRequestInput = !0);
 }
 };
 } ]), angular.module("openshiftConsole").directive("oscSecrets", [ "$uibModal", "$filter", "APIService", "DataService", "SecretsService", function(e, t, n, r, a) {

dist/scripts/templates.js

@@ -8086,7 +8086,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<div class=\"form-group\">\n" +
+    "<div ng-show=\"showRequestInput\" class=\"form-group\">\n" +
     "<label>\n" +
     "CPU Request Target\n" +
     "</label>\n" +
@@ -9492,8 +9492,15 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<span ng-if=\"'cpu' | isRequestCalculated : project\">limit.</span>\n" +
     "<span ng-if=\"!('cpu' | isRequestCalculated : project)\">request.</span>\n" +
     "</div>\n" +
+    "\n" +
+    "<div ng-if=\"usesV2Metrics\" class=\"alert alert-warning\">\n" +
+    "<span class=\"pficon pficon-warning-triangle-o\" aria-hidden=\"true\"></span>\n" +
+    "<span class=\"sr-only\">Warning:</span>\n" +
+    "This autoscaler uses a newer API, consider editing it with the\n" +
+    "<a href=\"command-line\" target=\"_blank\">command line tools</a>.\n" +
+    "</div>\n" +
     "<fieldset ng-disabled=\"disableInputs\" class=\"gutter-top\">\n" +
-    "<osc-autoscaling model=\"autoscaling\" show-name-input=\"true\" name-read-only=\"kind === 'HorizontalPodAutoscaler'\">\n" +
+    "<osc-autoscaling model=\"autoscaling\" show-name-input=\"true\" name-read-only=\"kind === 'HorizontalPodAutoscaler'\" show-request-input=\"autoscaling.targetCPU\">\n" +
     "</osc-autoscaling>\n" +
     "<label-editor labels=\"labels\" expand=\"true\" can-toggle=\"false\"></label-editor>\n" +
     "<div class=\"buttons gutter-top gutter-bottom\">\n" +