diff --git a/orca-bakery/src/main/java/com/netflix/spinnaker/orca/bakery/api/manifests/helm/HelmBakeManifestRequest.java b/orca-bakery/src/main/java/com/netflix/spinnaker/orca/bakery/api/manifests/helm/HelmBakeManifestRequest.java index 5c0ca5057f..77ab748db4 100644 --- a/orca-bakery/src/main/java/com/netflix/spinnaker/orca/bakery/api/manifests/helm/HelmBakeManifestRequest.java +++ b/orca-bakery/src/main/java/com/netflix/spinnaker/orca/bakery/api/manifests/helm/HelmBakeManifestRequest.java @@ -29,6 +29,13 @@ @Data @EqualsAndHashCode(callSuper = true) public class HelmBakeManifestRequest extends BakeManifestRequest { + + @JsonProperty("apiVersions") + private String apiVersions; + + @JsonProperty("kubeVersion") + private String kubeVersion; + @JsonProperty("namespace") private String namespace; @@ -59,6 +66,8 @@ public HelmBakeManifestRequest( outputArtifactName, bakeManifestContext.getOutputName()); this.setOverrides(overrides); + this.setApiVersions(bakeManifestContext.getApiVersions()); + this.setKubeVersion(bakeManifestContext.getKubeVersion()); this.setNamespace(bakeManifestContext.getNamespace()); this.setInputArtifacts(inputArtifacts); this.setRawOverrides(bakeManifestContext.getRawOverrides()); diff --git a/orca-bakery/src/main/java/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java b/orca-bakery/src/main/java/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java index 942fab4611..c81a72a841 100644 --- a/orca-bakery/src/main/java/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java +++ b/orca-bakery/src/main/java/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java @@ -33,6 +33,8 @@ public class BakeManifestContext { private final Boolean evaluateOverrideExpressions; private final String templateRenderer; private final String outputName; + private final String apiVersions; + private final String kubeVersion; private final String namespace; private final Boolean rawOverrides; private final Boolean includeCRDs; @@ -49,6 +51,8 @@ public BakeManifestContext( @JsonProperty("evaluateOverrideExpressions") Boolean evaluateOverrideExpressions, @JsonProperty("templateRenderer") String templateRenderer, @JsonProperty("outputName") String outputName, + @Nullable @JsonProperty("apiVersions") String apiVersions, + @Nullable @JsonProperty("kubeVersion") String kubeVersion, @JsonProperty("namespace") String namespace, @Nullable @JsonProperty("inputArtifact") CreateBakeManifestTask.InputArtifact inputArtifact, @Nullable @JsonProperty("kustomizeFilePath") String kustomizeFilePath, @@ -65,6 +69,8 @@ public BakeManifestContext( this.evaluateOverrideExpressions = evaluateOverrideExpressions; this.templateRenderer = templateRenderer; this.outputName = outputName; + this.apiVersions = apiVersions; + this.kubeVersion = kubeVersion; this.namespace = namespace; this.kustomizeFilePath = kustomizeFilePath; this.helmChartFilePath = helmChartFilePath;