-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34962 from iocanel/single-segment-images-34748
Request single segment images when using local lookup ImageStreams
- Loading branch information
Showing
7 changed files
with
182 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
...i/src/main/java/io/quarkus/container/spi/SingleSegmentContainerImageRequestBuildItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package io.quarkus.container.spi; | ||
|
|
||
| import io.quarkus.builder.item.SimpleBuildItem; | ||
|
|
||
| /** | ||
| * There are cases where a single segment image (an image without group) is preferred. | ||
| * This build item is used to express this preferrence. | ||
| **/ | ||
| public final class SingleSegmentContainerImageRequestBuildItem extends SimpleBuildItem { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
...test/java/io/quarkus/it/kubernetes/OpenshiftWithDeploymentResourceAndLocalLookupTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
|
|
||
| package io.quarkus.it.kubernetes; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.Assertions.entry; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Path; | ||
| import java.util.List; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
|
||
| import io.fabric8.kubernetes.api.model.HasMetadata; | ||
| import io.fabric8.kubernetes.api.model.apps.Deployment; | ||
| import io.fabric8.openshift.api.model.ImageStream; | ||
| import io.quarkus.builder.Version; | ||
| import io.quarkus.maven.dependency.Dependency; | ||
| import io.quarkus.test.ProdBuildResults; | ||
| import io.quarkus.test.ProdModeTestResults; | ||
| import io.quarkus.test.QuarkusProdModeTest; | ||
|
|
||
| // | ||
| // The purpose of this test is to assert that | ||
| // When: | ||
| // - We run an in-cluster container builds targeting Openshift (and `Deployment` is used). | ||
| // - No group / image is explicitly specified | ||
| // | ||
| // Then: | ||
| // - A BuildConfg is generated. | ||
| // - Two ImageStream are generated (one named after the app). | ||
| // - A Deployment resource was created | ||
| // - local lookup is enabled | ||
| // - single segement image is requested | ||
| // | ||
| public class OpenshiftWithDeploymentResourceAndLocalLookupTest { | ||
|
|
||
| private static final String NAME = "openshift-with-deployment-resource-and-local-lookup"; | ||
|
|
||
| @RegisterExtension | ||
| static final QuarkusProdModeTest config = new QuarkusProdModeTest() | ||
| .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) | ||
| .setApplicationName(NAME) | ||
| .setApplicationVersion("0.1-SNAPSHOT") | ||
| .overrideConfigKey("quarkus.openshift.deployment-kind", "Deployment") | ||
| .setLogFileName("k8s.log") | ||
| .setForcedDependencies(List.of(Dependency.of("io.quarkus", "quarkus-openshift", Version.getVersion()))); | ||
|
|
||
| @ProdBuildResults | ||
| private ProdModeTestResults prodModeTestResults; | ||
|
|
||
| @Test | ||
| public void assertGeneratedResources() throws IOException { | ||
| final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes"); | ||
| assertThat(kubernetesDir) | ||
| .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.json")) | ||
| .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.yml")); | ||
| List<HasMetadata> kubernetesList = DeserializationUtil | ||
| .deserializeAsList(kubernetesDir.resolve("openshift.yml")); | ||
|
|
||
| assertThat(kubernetesList).filteredOn(h -> "BuildConfig".equals(h.getKind())).hasSize(1); | ||
| assertThat(kubernetesList).filteredOn(h -> "ImageStream".equals(h.getKind())).hasSize(2); | ||
| assertThat(kubernetesList).filteredOn(h -> "ImageStream".equals(h.getKind()) | ||
| && h.getMetadata().getName().equals(NAME)).hasSize(1); | ||
|
|
||
| assertThat(kubernetesList).filteredOn(i -> i instanceof Deployment).singleElement().satisfies(i -> { | ||
| assertThat(i).isInstanceOfSatisfying(Deployment.class, d -> { | ||
| assertThat(d.getMetadata()).satisfies(m -> { | ||
| assertThat(m.getName()).isEqualTo(NAME); | ||
| }); | ||
|
|
||
| assertThat(d.getSpec()).satisfies(deploymentSpec -> { | ||
| assertThat(deploymentSpec.getTemplate()).satisfies(t -> { | ||
| assertThat(t.getMetadata()).satisfies(metadata -> assertThat(metadata.getLabels()).containsAnyOf( | ||
| entry("app.kubernetes.io/name", NAME), | ||
| entry("app.kubernetes.io/version", "0.1-SNAPSHOT"))); | ||
|
|
||
| assertThat(t.getSpec()).satisfies(podSpec -> { | ||
| assertThat(podSpec.getContainers()).singleElement().satisfies(container -> { | ||
| assertThat(container.getImage()) | ||
| .isEqualTo("openshift-with-deployment-resource-and-local-lookup:0.1-SNAPSHOT"); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| assertThat(kubernetesList).filteredOn(r -> r instanceof ImageStream && r.getMetadata().getName().equals(NAME)) | ||
| .singleElement().satisfies(r -> { | ||
| assertThat(r).isInstanceOfSatisfying(ImageStream.class, i -> { | ||
| assertThat(i.getSpec()).satisfies(spec -> { | ||
| assertThat(spec.getLookupPolicy().getLocal()).isEqualTo(true); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| } | ||
| } |