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 #1020

Merged
merged 13 commits into from
Oct 9, 2023
Merged

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

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ea6662b
security(feature): Change codeql to scan daily instead of weekly
jasonmcintosh Oct 29, 2021
47d9b05
Merge branch 'master' of github.com:spinnaker/rosco
jasonmcintosh Nov 3, 2021
86464e0
Merge branch 'master' of github.com:spinnaker/rosco
jasonmcintosh Dec 8, 2022
b0cc7d7
Merge branch 'master' of github.com:spinnaker/rosco
jasonmcintosh Sep 28, 2023
1475c75
feat(helm/bake): Add additional input fields where we can fill in det…
ciurescuraul Sep 29, 2023
beb6378
Merge branch 'master' into CDSH-342
ciurescuraul Sep 29, 2023
2cbd719
Merge branch 'master' into CDSH-342
ciurescuraul Oct 2, 2023
b575561
feat(helm/bake): Add additional input fields where we can fill in det…
ciurescuraul Oct 2, 2023
3252481
Merge remote-tracking branch 'origin/CDSH-342' into CDSH-342
ciurescuraul Oct 2, 2023
cb7d7ae
Merge branch 'master' into CDSH-342
ciurescuraul Oct 4, 2023
b89063f
Merge branch 'master' into CDSH-342
ciurescuraul Oct 4, 2023
554e205
feat(helm/bake): Add additional input fields where we can fill in det…
ciurescuraul Oct 6, 2023
6f59f45
Merge remote-tracking branch 'origin/CDSH-342' into CDSH-342
ciurescuraul Oct 6, 2023
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
5 changes: 5 additions & 0 deletions ...sts/src/main/java/com/netflix/spinnaker/rosco/manifests/helm/HelmBakeManifestRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
@Data
@EqualsAndHashCode(callSuper = true)
public class HelmBakeManifestRequest extends BakeManifestRequest {

jasonmcintosh marked this conversation as resolved.
Show resolved Hide resolved
String apiVersions;

String kubeVersion;

String namespace;

/**
Expand Down
13 changes: 13 additions & 0 deletions ...manifests/src/main/java/com/netflix/spinnaker/rosco/manifests/helm/HelmTemplateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;

@Component
@Slf4j
Expand Down Expand Up @@ -88,6 +89,18 @@ public BakeRecipe buildCommand(
command.add("--include-crds");
}

String apiVersions = request.getApiVersions();
if (StringUtils.hasText(apiVersions)) {
command.add("--api-versions");
command.add(apiVersions);
}

String kubeVersion = request.getKubeVersion();
if (StringUtils.hasText(kubeVersion)) {
command.add("--kube-version");
command.add(kubeVersion);
}

Map<String, Object> overrides = request.getOverrides();
if (overrides != null && !overrides.isEmpty()) {
List<String> overrideList = new ArrayList<>();
Expand Down
50 changes: 50 additions & 0 deletions ...fests/src/test/java/com/netflix/spinnaker/rosco/manifests/helm/HelmTemplateUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,56 @@ public void buildBakeRecipeWithGitRepoArtifactUsingHelmChartFilePath(@TempDir Pa
}
}

@Test
public void buildBakeRecipeIncludingHelmVersionsOptionsWithHelm3() throws IOException {
ArtifactDownloader artifactDownloader = mock(ArtifactDownloader.class);
RoscoHelmConfigurationProperties helmConfigurationProperties =
new RoscoHelmConfigurationProperties();
HelmTemplateUtils helmTemplateUtils =
new HelmTemplateUtils(artifactDownloader, helmConfigurationProperties);

HelmBakeManifestRequest request = new HelmBakeManifestRequest();
Artifact artifact = Artifact.builder().build();
request.setTemplateRenderer(BakeManifestRequest.TemplateRenderer.HELM3);
request.setApiVersions("customApiVersion");
request.setKubeVersion("customKubernetesVersion");
request.setInputArtifacts(Collections.singletonList(artifact));
request.setOverrides(Collections.emptyMap());

try (BakeManifestEnvironment env = BakeManifestEnvironment.create()) {
BakeRecipe bakeRecipe = helmTemplateUtils.buildBakeRecipe(env, request);
assertTrue(bakeRecipe.getCommand().contains("--api-versions"));
assertTrue(bakeRecipe.getCommand().indexOf("--api-versions") > 3);
assertTrue(bakeRecipe.getCommand().contains("--kube-version"));
assertTrue(bakeRecipe.getCommand().indexOf("--kube-version") > 5);
}
}

@Test
public void buildBakeRecipeIncludingHelmVersionsOptionsWithHelm2() throws IOException {
ArtifactDownloader artifactDownloader = mock(ArtifactDownloader.class);
RoscoHelmConfigurationProperties helmConfigurationProperties =
new RoscoHelmConfigurationProperties();
HelmTemplateUtils helmTemplateUtils =
new HelmTemplateUtils(artifactDownloader, helmConfigurationProperties);

HelmBakeManifestRequest request = new HelmBakeManifestRequest();
Artifact artifact = Artifact.builder().build();
request.setTemplateRenderer(BakeManifestRequest.TemplateRenderer.HELM2);
request.setApiVersions("customApiVersion");
request.setKubeVersion("customKubernetesVersion");
request.setInputArtifacts(Collections.singletonList(artifact));
request.setOverrides(Collections.emptyMap());

try (BakeManifestEnvironment env = BakeManifestEnvironment.create()) {
BakeRecipe bakeRecipe = helmTemplateUtils.buildBakeRecipe(env, request);
assertTrue(bakeRecipe.getCommand().contains("--api-versions"));
assertTrue(bakeRecipe.getCommand().indexOf("--api-versions") > 3);
assertTrue(bakeRecipe.getCommand().contains("--kube-version"));
assertTrue(bakeRecipe.getCommand().indexOf("--kube-version") > 5);
}
}

@Test
public void buildBakeRecipeIncludingCRDsWithHelm3() throws IOException {
ArtifactDownloader artifactDownloader = mock(ArtifactDownloader.class);
Expand Down