Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(helm/bake): Add additional input fields where we can fill in details of the APIs versions (backport #4546) #4563

Merged
merged 1 commit into from
Oct 18, 2023
Merged

feat(helm/bake): Add additional input fields where we can fill in details of the APIs versions (backport #4546) #4563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...in/java/com/netflix/spinnaker/orca/bakery/api/manifests/helm/HelmBakeManifestRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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());
Expand Down
6 changes: 6 additions & 0 deletions .../src/main/java/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand All @@ -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;
Expand Down
Loading