diff --git a/app/scripts/modules/kubernetes/cluster/configure/CommandBuilder.js b/app/scripts/modules/kubernetes/cluster/configure/CommandBuilder.js index c44d678cbf6..43699bdb846 100644 --- 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 index 787bdcb9984..e69fa2b1e34 100644 --- 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 index 6dbefda0c95..bde5e6b92f1 100644 --- a/app/scripts/modules/kubernetes/serverGroup/configure/wizard/replicas.html +++ b/app/scripts/modules/kubernetes/serverGroup/configure/wizard/replicas.html @@ -6,10 +6,10 @@
- +
-
+
@@ -22,7 +22,7 @@
-
+
Min
Max
@@ -53,7 +53,7 @@
- + % diff --git a/app/scripts/modules/kubernetes/serverGroup/details/details.html b/app/scripts/modules/kubernetes/serverGroup/details/details.html index e1179d8a84e..b3031ca8a14 100644 --- a/app/scripts/modules/kubernetes/serverGroup/details/details.html +++ b/app/scripts/modules/kubernetes/serverGroup/details/details.html @@ -139,9 +139,9 @@

[SERVER GROUP IS DISABLED
Target CPU
{{serverGroup.deployDescription.scalingPolicy.cpuUtilization.target}}%
Current CPU
-
{{serverGroup.autoscalerStatus.currentCpuUtilization}}%
-
Latest Rescale
-
{{serverGroup.autoscalerStatus.lastScaleTime | relativeTime}}
+
{{serverGroup.autoscalerStatus.currentCpuUtilization !== null ? serverGroup.autoscalerStatus.currentCpuUtilization : '- '}}%
+
Latest Rescale
+
{{serverGroup.autoscalerStatus.lastScaleTime | relativeTime}}

diff --git a/app/scripts/modules/kubernetes/serverGroup/transformer.js b/app/scripts/modules/kubernetes/serverGroup/transformer.js index e7f2674064b..24be61d0fd5 100644 --- 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; }