Skip to content

Commit

Permalink
feat(helm/bake): Add additional input fields where we can fill in det…
Browse files Browse the repository at this point in the history
…ails of the APIs versions (#1020)

* security(feature): Change codeql to scan daily instead of weekly

* 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

* 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: Jason McIntosh <jason.mcintosh@armory.io>
  • Loading branch information
ciurescuraul and jasonmcintosh authored Oct 9, 2023
1 parent 028ff01 commit 4a12958
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@
import com.netflix.spinnaker.kork.artifacts.model.Artifact;
import com.netflix.spinnaker.rosco.manifests.BakeManifestRequest;
import java.util.List;
import javax.annotation.Nullable;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@EqualsAndHashCode(callSuper = true)
public class HelmBakeManifestRequest extends BakeManifestRequest {
@Nullable String apiVersions;
@Nullable String kubeVersion;

String namespace;

/**
Expand Down
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
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

0 comments on commit 4a12958

Please sign in to comment.