From 7b9ac51b58f10a50c73b129d30c20f01e647acbe Mon Sep 17 00:00:00 2001 From: andrewbackes Date: Fri, 17 Nov 2017 13:26:09 -0800 Subject: [PATCH] fix(kubernetes/rollback) Pass cloudProvider to tasks so it doesn't default to aws --- .../pipeline/servergroup/rollback/ExplicitRollback.groovy | 5 +++-- .../servergroup/rollback/ExplicitRollbackSpec.groovy | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollback.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollback.groovy index f7cbd39633..4e4981599a 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollback.groovy +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollback.groovy @@ -116,8 +116,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/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollbackSpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollbackSpec.groovy index ea2a4ae449..95dcfb8f24 100644 --- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollbackSpec.groovy +++ b/orca-clouddriver/src/test/groovy/com/netflix/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",