fix(kubernetes): fixes autoscaler details, copying autoscaler in clon…

…e stage
spinnaker · Apr 13, 2017 · aa5339a · aa5339a
1 parent f5b331d
commit aa5339a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/app/scripts/modules/kubernetes/cluster/configure/CommandBuilder.js b/app/scripts/modules/kubernetes/cluster/configure/CommandBuilder.js
@@ -53,8 +53,8 @@ module.exports = angular.module('spinnaker.kubernetes.clusterCommandBuilder.serv
         viewState: {
           mode: defaults.mode || 'create',
           disableStrategySelection: true,
+          useAutoscaler: false,
         },
-        useAutoscaler: false,
         capacity: {
           min: 1,
           desired: 1,
@@ -103,6 +103,7 @@ module.exports = angular.module('spinnaker.kubernetes.clusterCommandBuilder.serv
 
       command.viewState = {
         mode: mode,
+        useAutoscaler: !!command.scalingPolicy,
       };
 
       if (!command.capacity) {
@@ -223,6 +224,7 @@ module.exports = angular.module('spinnaker.kubernetes.clusterCommandBuilder.serv
           mode: 'editPipeline',
           submitButtonLabel: 'Done',
           requiresTemplateSelection: true,
+          useAutoscaler: false,
         }
       };
     }
@@ -243,6 +245,7 @@ module.exports = angular.module('spinnaker.kubernetes.clusterCommandBuilder.serv
         mode: 'editPipeline',
         contextImages: contextImages,
         submitButtonLabel: 'Done',
+        useAutoscaler: !!command.scalingPolicy,
       };
 
       if (!_.has(command, 'scalingPolicy.cpuUtilization.target')) {

diff --git a/app/scripts/modules/kubernetes/serverGroup/configure/wizard/Clone.controller.js b/app/scripts/modules/kubernetes/serverGroup/configure/wizard/Clone.controller.js
@@ -76,7 +76,7 @@ module.exports = angular.module('spinnaker.serverGroup.configure.kubernetes.clon
 
       wizardSubFormValidation
         .config({ scope: $scope, form: 'form' })
-        .register({ page: 'location', subForm: 'basicSettings'})
+        .register({page: 'location', subForm: 'basicSettings'})
         .register({page: 'advanced-settings', subForm: 'advancedSettings'});
     }
 

diff --git a/app/scripts/modules/kubernetes/serverGroup/configure/wizard/replicas.html b/app/scripts/modules/kubernetes/serverGroup/configure/wizard/replicas.html
@@ -6,10 +6,10 @@
         <help-field key="kubernetes.serverGroup.autoscaling.enabled"></help-field>
       </div>
       <div class="col-md-2">
-        <input type="checkbox" name="details" ng-model="command.useAutoscaler"/>
+        <input type="checkbox" name="details" ng-model="command.viewState.useAutoscaler"/>
       </div>
     </div>
-    <div ng-show="!command.useAutoscaler">
+    <div ng-show="!command.viewState.useAutoscaler">
       <div class="form-group">
         <div class="col-md-2 col-md-offset-3"></div>
       </div>
@@ -22,7 +22,7 @@
         </div>
       </div>
     </div>
-    <div ng-show="command.useAutoscaler">
+    <div ng-show="command.viewState.useAutoscaler">
       <div class="form-group">
         <div class="col-md-2 col-md-offset-3">Min</div>
         <div class="col-md-2">Max</div>
@@ -53,7 +53,7 @@
         </div>
         <div class="col-md-3">
           <div class="input-group">
-            <!-- Current utilization is based on requested CPU: it can be lager than 100% -->
+            <!-- Current utilization is based on requested CPU: it can be larger than 100% -->
             <input type="number" class="form-control input-sm" name="details" ng-model="command.scalingPolicy.cpuUtilization.target"
                                                                               min="0" />
             <span class="input-group-addon">%</span>

diff --git a/app/scripts/modules/kubernetes/serverGroup/details/details.html b/app/scripts/modules/kubernetes/serverGroup/details/details.html
@@ -139,9 +139,9 @@ <h4 class="text-center" ng-if="serverGroup.isDisabled">[SERVER GROUP IS DISABLED
           <dt>Target CPU</dt>
           <dd>{{serverGroup.deployDescription.scalingPolicy.cpuUtilization.target}}%</dd>
           <dt>Current CPU</dt>
-          <dd>{{serverGroup.autoscalerStatus.currentCpuUtilization}}%</dd>
-          <dt>Latest Rescale</dt>
-          <dd>{{serverGroup.autoscalerStatus.lastScaleTime | relativeTime}}</dd>
+          <dd>{{serverGroup.autoscalerStatus.currentCpuUtilization !== null ? serverGroup.autoscalerStatus.currentCpuUtilization : '- '}}%</dd>
+          <dt ng-if="serverGroup.autoscalerStatus.lastScaleTime">Latest Rescale</dt>
+          <dd ng-if="serverGroup.autoscalerStatus.lastScaleTime">{{serverGroup.autoscalerStatus.lastScaleTime | relativeTime}}</dd>
         </div>
       </dl>
     </collapsible-section>

diff --git a/app/scripts/modules/kubernetes/serverGroup/transformer.js b/app/scripts/modules/kubernetes/serverGroup/transformer.js
@@ -30,7 +30,7 @@ module.exports = angular
         delete array[index].imageId;
       });
 
-      if (!command.useAutoscaler) {
+      if (!base.viewState.useAutoscaler) {
         delete command.scalingPolicy;
         delete command.capacity;
       }