Skip to content

Commit

Permalink
fix(kubernetes): Fix artifact binding in patch manifest stage (#3605)
Browse files Browse the repository at this point in the history
The patch manifest stage was incorrectly setting allArtifacts to
just the required artifacts, which was breaking artifact resolution
in clouddriver. Set this to all of the artifacts (both required and
optional).
  • Loading branch information
ezimanyi committed Apr 15, 2020
1 parent 0ad1592 commit c550856
Showing 1 changed file with 7 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.netflix.spinnaker.orca.clouddriver.tasks.manifest;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.netflix.spinnaker.kork.annotations.NonnullByDefault;
import com.netflix.spinnaker.orca.api.pipeline.Task;
Expand Down Expand Up @@ -51,7 +52,12 @@ private ImmutableMap<String, Object> getOutputs(ManifestEvaluator.Result result)
return new ImmutableMap.Builder<String, Object>()
.put("manifests", result.getManifests())
.put("requiredArtifacts", result.getRequiredArtifacts())
.put("allArtifacts", result.getOptionalArtifacts())
.put(
"allArtifacts",
ImmutableList.builder()
.addAll(result.getRequiredArtifacts())
.addAll(result.getOptionalArtifacts())
.build())
.build();
}
}

0 comments on commit c550856

Please sign in to comment.