fix(kubernetes/rollback) Pass cloudProvider to tasks so it doesn't de…

…fault to aws (spinnaker#1810)
lwander · Nov 17, 2017 · 500f9ed · 500f9ed
1 parent 52823d6
commit 500f9ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.../netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollback.groovy b/.../netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollback.groovy
@@ -118,8 +118,9 @@ class ExplicitRollback implements Rollback {
   Stage buildApplySourceServerGroupCapacityStage(Stage parentStage,
                                                  ResizeStrategy.Source source) {
     Map applySourceServerGroupCapacityContext = [
-      credentials: source.credentials,
-      target     : [
+      credentials  : source.credentials,
+      cloudProvider: source.cloudProvider,
+      target       : [
         asgName        : restoreServerGroupName,
         serverGroupName: restoreServerGroupName,
         region         : source.region,

diff --git a/...flix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollbackSpec.groovy b/...flix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollbackSpec.groovy
@@ -108,7 +108,8 @@ class ExplicitRollbackSpec extends Specification {
       serverGroupName: "servergroup-v002"
     ]
     afterStages[4].context == [
-      target     : [
+      cloudProvider: "aws",
+      target       : [
         asgName        : "servergroup-v001",
         serverGroupName: "servergroup-v001",
         region         : "us-west-1",