fix(monitoreddeploy): unset pinMinimumCapacity when scaling to 100% (#…

…3294)
spinnaker · Nov 13, 2019 · b923512 · b923512
1 parent df91524
commit b923512
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/...spinnaker/orca/clouddriver/pipeline/servergroup/strategies/MonitoredDeployStrategy.groovy b/...spinnaker/orca/clouddriver/pipeline/servergroup/strategies/MonitoredDeployStrategy.groovy
@@ -194,6 +194,7 @@ class MonitoredDeployStrategy implements Strategy {
         scalePct                     : p,
         pinCapacity                  : p < 100,  // if p < 100, capacity should be pinned (min == max == desired)
         unpinMinimumCapacity         : p == 100, // if p == 100, min capacity should be restored to the original unpinned value from source
+        pinMinimumCapacity           : p < 100,  // pinMinimumCapacity should be false when unpinMinimumCapacity is true
         useNameAsLabel               : true,     // hint to deck that it should _not_ override the name
         targetHealthyDeployPercentage: stage.context.targetHealthyDeployPercentage
       ]

diff --git a/...spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategy.groovy b/...spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategy.groovy
@@ -170,6 +170,7 @@ class RollingRedBlackStrategy implements Strategy, ApplicationContextAware {
         scalePct            : p,
         pinCapacity         : p < 100,  // if p < 100, capacity should be pinned (min == max == desired)
         unpinMinimumCapacity: p == 100, // if p == 100, min capacity should be restored to the original unpinned value from source
+        pinMinimumCapacity  : p < 100,  // pinMinimumCapacity should be false when unpinMinimumCapacity is true
         useNameAsLabel      : true,     // hint to deck that it should _not_ override the name
         targetHealthyDeployPercentage: stage.context.targetHealthyDeployPercentage
       ]