fix(bakery): Include cloudProvider in CompleteBakeTask output results (…

…spinnaker#3312)
fkyc · Nov 22, 2019 · 59ca44d · 59ca44d
1 parent 40a0155
commit 59ca44d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/CompletedBakeTask.groovy b/orca-bakery/src/main/groovy/com/netflix/spinnaker/orca/bakery/tasks/CompletedBakeTask.groovy
@@ -44,6 +44,9 @@ class CompletedBakeTask implements Task {
       imageId: bake.ami ?: bake.imageName,
       artifacts: bake.artifact ? [bake.artifact] : []
     ]
+    if (stage.context.cloudProvider) {
+      results.cloudProvider = stage.context.cloudProvider
+    }
     /**
      * TODO:
      * It would be good to standardize on the key here. "imageId" works for all providers.

diff --git a/...main/groovy/com/netflix/spinnaker/orca/bakery/tasks/manifests/CreateBakeManifestTask.java b/...main/groovy/com/netflix/spinnaker/orca/bakery/tasks/manifests/CreateBakeManifestTask.java
@@ -142,6 +142,7 @@ public TaskResult execute(@Nonnull Stage stage) {
 
     Map<String, Object> outputs = new HashMap<>();
     outputs.put("artifacts", Collections.singleton(result));
+    outputs.put("cloudProvider", "kubernetes"); // Needed for stat collection.
 
     return TaskResult.builder(ExecutionStatus.SUCCEEDED).context(outputs).outputs(outputs).build();
   }