fix(netflix): do not allow users to specify useSourceCapacity for can…

…aries
spinnaker · May 12, 2017 · ff00b68 · ff00b68
1 parent 797970a
commit ff00b68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...ipts/modules/amazon/serverGroup/configure/wizard/capacity/capacitySelector.directive.html b/...ipts/modules/amazon/serverGroup/configure/wizard/capacity/capacitySelector.directive.html
@@ -6,7 +6,7 @@
     </div>
   </div>
 
-  <div class="form-group">
+  <div class="form-group" ng-if="!vm.command.viewState.readOnlyFields.useSourceCapacity">
     <div class="col-md-3 sm-label-right">Capacity</div>
     <div class="col-md-9 radio">
       <label>

diff --git a/app/scripts/modules/netflix/pipeline/stage/canary/canaryStage.js b/app/scripts/modules/netflix/pipeline/stage/canary/canaryStage.js
@@ -367,7 +367,7 @@ module.exports = angular.module('spinnaker.netflix.pipeline.stage.canaryStage',
     function configureServerGroupCommandForEditing(command) {
       command.viewState.disableStrategySelection = true;
       command.viewState.hideClusterNamePreview = true;
-      command.viewState.readOnlyFields = { credentials: true, region: true, subnet: true };
+      command.viewState.readOnlyFields = { credentials: true, region: true, subnet: true, useSourceCapacity: true };
       delete command.strategy;
     }
 
@@ -393,7 +393,8 @@ module.exports = angular.module('spinnaker.netflix.pipeline.stage.canaryStage',
                   command.viewState.overrides = {
                     capacity: {
                       min: 1, max: 1, desired: 1,
-                    }
+                    },
+                    useSourceCapacity: false,
                   };
                   command.viewState.disableNoTemplateSelection = true;
                   command.viewState.customTemplateMessage = 'Select a template to configure the canary and baseline ' +