provider/kubernetes: Job stage implemented & tested (spinnaker#954)

tanelso2 · Aug 26, 2016 · f10508e · f10508e
1 parent b8848fd
commit f10508e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 219 deletions.
diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/OortService.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/OortService.groovy
@@ -58,11 +58,12 @@ interface OortService {
                                             @Path("summaryType") String summaryType,
                                             @Query("onlyEnabled") String onlyEnabled)
 
-  @GET("/applications/{app}/jobs/{account}/{region}/{id}")
-  Response getJob(@Path("app") String app,
-                  @Path("account") String account,
-                  @Path("region") String region,
-                  @Path("id") String id)
+  @POST("/applications/{app}/jobs/{account}/{region}/{id}")
+  Response collectJob(@Path("app") String app,
+                      @Path("account") String account,
+                      @Path("region") String region,
+                      @Path("id") String id,
+                      @Body String details)
 
   @GET("/search")
   Response getSearchResults(@Query("q") String searchTerm,

diff --git a/...er/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/job/RunJobStage.groovy b/...er/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/job/RunJobStage.groovy
@@ -17,7 +17,6 @@
 package com.netflix.spinnaker.orca.clouddriver.pipeline.job
 
 import com.netflix.spinnaker.orca.clouddriver.tasks.MonitorKatoTask
-import com.netflix.spinnaker.orca.clouddriver.tasks.job.RunJobForceCacheRefreshTask
 import com.netflix.spinnaker.orca.clouddriver.tasks.job.RunJobTask
 import com.netflix.spinnaker.orca.clouddriver.tasks.job.WaitOnJobCompletion
 import com.netflix.spinnaker.orca.pipeline.LinearStage
@@ -36,10 +35,9 @@ class RunJobStage extends LinearStage {
   @Override
   List<Step> buildSteps(Stage stage) {
     [
-        buildStep(stage, "runJob", RunJobTask),
-        buildStep(stage, "monitorDeploy", MonitorKatoTask),
-        buildStep(stage, "forceCacheRefresh", RunJobForceCacheRefreshTask),
-        buildStep(stage, "waitOnJobCompletion", WaitOnJobCompletion),
+      buildStep(stage, "runJob", RunJobTask),
+      buildStep(stage, "monitorDeploy", MonitorKatoTask),
+      buildStep(stage, "waitOnJobCompletion", WaitOnJobCompletion),
     ]
   }
 }
diff --git a/...roovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/RunJobForceCacheRefreshTask.groovy b/...roovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/RunJobForceCacheRefreshTask.groovy
diff --git a/...c/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletion.groovy b/...c/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/job/WaitOnJobCompletion.groovy
@@ -54,24 +54,26 @@ public class WaitOnJobCompletion extends AbstractCloudProviderAwareTask implemen
       throw new IllegalStateException("No jobs in stage context.")
     }
 
+    Map<String, Object> outputs = [:]
     jobs.each { location, names ->
       if (!names) {
         return
       }
 
-      Map job = objectMapper.readValue(oortService.getJob("*", account, location, names[0]).body.in(), new TypeReference<Map>() {})
-
+      Map job = objectMapper.readValue(oortService.collectJob("*", account, location, names[0], "delete").body.in(), new TypeReference<Map>() {})
       switch ((String)job.jobState) {
         case "Succeeded":
           status = ExecutionStatus.SUCCEEDED
+          outputs = job.completionDetails
           return
 
         case "Failed":
           status = ExecutionStatus.TERMINAL
+          outputs = job.completionDetails
           return
       }
     }
 
-    new DefaultTaskResult(status)
+    new DefaultTaskResult(status, outputs)
   }
 }
diff --git a/...ix/spinnaker/orca/clouddriver/tasks/providers/kubernetes/KubernetesContainerFinder.groovy b/...ix/spinnaker/orca/clouddriver/tasks/providers/kubernetes/KubernetesContainerFinder.groovy
@@ -26,6 +26,10 @@ class KubernetesContainerFinder {
 
     def containers = (List<Map<String, Object>>) operation.containers
 
+    if (!containers) {
+      containers = [operation.container]
+    }
+
     containers.forEach { container ->
       if (container.imageDescription.fromContext) {
         def image = deploymentDetails.find {

diff --git a/...iver/src/main/groovy/com/netflix/spinnaker/orca/kato/pipeline/ParallelRunJobsStage.groovy b/...iver/src/main/groovy/com/netflix/spinnaker/orca/kato/pipeline/ParallelRunJobsStage.groovy