Skip to content

Commit 8e60370

Browse files
ciurescuraulovidiupopa07
authored andcommitted
feat(helm/bake): Add additional input fields where we can fill in details of the APIs versions (#4546)
* feat(helm/bake): Add additional input fields where we can fill in details of the APIs versions - These input fields will not be pre-populated with versions of the target cluster available in the environment. - They will become part of the bake result. - Added API_VERSIONS_ENABLED env variable flag * feat(helm/bake): Add additional input fields where we can fill in details of the APIs versions - These input fields will not be pre-populated with versions of the target cluster available in the environment. - They will become part of the bake result. - Added API_VERSIONS_ENABLED env variable flag --------- Co-authored-by: ovidiupopa07 <105648914+ovidiupopa07@users.noreply.github.com> (cherry picked from commit cd9781f)
1 parent eccc5c0 commit 8e60370

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

orca-bakery/src/main/java/com/netflix/spinnaker/orca/bakery/api/manifests/helm/HelmBakeManifestRequest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@
2929
@Data
3030
@EqualsAndHashCode(callSuper = true)
3131
public class HelmBakeManifestRequest extends BakeManifestRequest {
32+
33+
@JsonProperty("apiVersions")
34+
private String apiVersions;
35+
36+
@JsonProperty("kubeVersion")
37+
private String kubeVersion;
38+
3239
@JsonProperty("namespace")
3340
private String namespace;
3441

@@ -59,6 +66,8 @@ public HelmBakeManifestRequest(
5966
outputArtifactName,
6067
bakeManifestContext.getOutputName());
6168
this.setOverrides(overrides);
69+
this.setApiVersions(bakeManifestContext.getApiVersions());
70+
this.setKubeVersion(bakeManifestContext.getKubeVersion());
6271
this.setNamespace(bakeManifestContext.getNamespace());
6372
this.setInputArtifacts(inputArtifacts);
6473
this.setRawOverrides(bakeManifestContext.getRawOverrides());

orca-bakery/src/main/java/com/netflix/spinnaker/orca/bakery/tasks/manifests/BakeManifestContext.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public class BakeManifestContext {
3333
private final Boolean evaluateOverrideExpressions;
3434
private final String templateRenderer;
3535
private final String outputName;
36+
private final String apiVersions;
37+
private final String kubeVersion;
3638
private final String namespace;
3739
private final Boolean rawOverrides;
3840
private final Boolean includeCRDs;
@@ -49,6 +51,8 @@ public BakeManifestContext(
4951
@JsonProperty("evaluateOverrideExpressions") Boolean evaluateOverrideExpressions,
5052
@JsonProperty("templateRenderer") String templateRenderer,
5153
@JsonProperty("outputName") String outputName,
54+
@Nullable @JsonProperty("apiVersions") String apiVersions,
55+
@Nullable @JsonProperty("kubeVersion") String kubeVersion,
5256
@JsonProperty("namespace") String namespace,
5357
@Nullable @JsonProperty("inputArtifact") CreateBakeManifestTask.InputArtifact inputArtifact,
5458
@Nullable @JsonProperty("kustomizeFilePath") String kustomizeFilePath,
@@ -65,6 +69,8 @@ public BakeManifestContext(
6569
this.evaluateOverrideExpressions = evaluateOverrideExpressions;
6670
this.templateRenderer = templateRenderer;
6771
this.outputName = outputName;
72+
this.apiVersions = apiVersions;
73+
this.kubeVersion = kubeVersion;
6874
this.namespace = namespace;
6975
this.kustomizeFilePath = kustomizeFilePath;
7076
this.helmChartFilePath = helmChartFilePath;

0 commit comments

Comments
 (0)