feat(kubernetes): Skip loading events for manifest retrieval in WaitF… (

#2997) * feat(kubernetes): Skip loading events for manifest retrieval in WaitForManifestStableTask * Account for changes from spinnaker/clouddriver#3796
spinnaker · Jun 20, 2019 · 39c4dbe · 39c4dbe
1 parent 2f0e25f
commit 39c4dbe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/...ddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/DelegatingOortService.java b/...ddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/DelegatingOortService.java
@@ -37,15 +37,15 @@ public Response getCluster(String app, String account, String cluster, String cl
   }
 
   @Override
-  public Manifest getManifest(String account, String name) {
-    return getService().getManifest(account, name);
+  public Manifest getManifest(String account, String name, boolean includeEvents) {
+    return getService().getManifest(account, name, includeEvents);
   }
 
   @Override
-  public Manifest getManifest(String account, String location, String name) {
+  public Manifest getManifest(String account, String location, String name, boolean includeEvents) {
     return StringUtils.isEmpty(location)
-        ? getService().getManifest(account, name)
-        : getService().getManifest(account, location, name);
+        ? getService().getManifest(account, name, includeEvents)
+        : getService().getManifest(account, location, name, includeEvents);
   }
 
   @Override

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
@@ -47,12 +47,14 @@ interface OortService {
 
   @GET("/manifests/{account}/_/{manifest}")
   Manifest getManifest(@Path("account") String account,
-                       @Path("manifest") String manifest)
+                       @Path("manifest") String manifest,
+                       @Query("includeEvents") boolean includeEvents)
 
   @GET("/manifests/{account}/{location}/{manifest}")
   Manifest getManifest(@Path("account") String account,
                        @Path("location") String location,
-                       @Path("manifest") String manifest)
+                       @Path("manifest") String manifest,
+                       @Query("includeEvents") boolean includeEvents)
 
   @GET("/manifests/{account}/{location}/{kind}/cluster/{app}/{clusterName}/dynamic/{criteria}")
   Manifest getDynamicManifest(@Path("account") String account,

diff --git a/...com/netflix/spinnaker/orca/clouddriver/tasks/artifacts/FindArtifactsFromResourceTask.java b/...com/netflix/spinnaker/orca/clouddriver/tasks/artifacts/FindArtifactsFromResourceTask.java
@@ -49,7 +49,8 @@ public TaskResult execute(@Nonnull Stage stage) {
 
     Manifest manifest =
         retrySupport.retry(
-            () -> oortService.getManifest(account, stageData.location, stageData.manifestName),
+            () ->
+                oortService.getManifest(account, stageData.location, stageData.manifestName, false),
             5,
             1000,
             true);

diff --git a/...oovy/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/WaitForManifestStableTask.java b/...oovy/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/WaitForManifestStableTask.java
@@ -78,7 +78,7 @@ public TaskResult execute(@Nonnull Stage stage) {
         String identifier = readableIdentifier(account, location, name);
         Manifest manifest;
         try {
-          manifest = oortService.getManifest(account, location, name);
+          manifest = oortService.getManifest(account, location, name, false);
         } catch (RetrofitError e) {
           log.warn("Unable to read manifest {}", identifier, e);
           return TaskResult.builder(ExecutionStatus.RUNNING)