-
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.
fix: use istag from other ns when internal reg is used
- Loading branch information
Showing
6 changed files
with
138 additions
and
8 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
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
88 changes: 88 additions & 0 deletions
88
...rc/test/java/io/quarkus/it/kubernetes/OpenshiftWithBaseImageFromInternalRegistryTest.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,88 @@ | ||
| package io.quarkus.it.kubernetes; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| 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.Container; | ||
| import io.fabric8.kubernetes.api.model.HasMetadata; | ||
| import io.fabric8.openshift.api.model.BuildConfig; | ||
| import io.fabric8.openshift.api.model.DeploymentConfig; | ||
| import io.fabric8.openshift.api.model.DeploymentTriggerImageChangeParams; | ||
| 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; | ||
|
|
||
| public class OpenshiftWithBaseImageFromInternalRegistryTest { | ||
|
|
||
| private static final String APP_NAME = "openshift-with-base-image-stream"; | ||
|
|
||
| @RegisterExtension | ||
| static final QuarkusProdModeTest config = new QuarkusProdModeTest() | ||
| .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) | ||
| .setApplicationName(APP_NAME) | ||
| .setApplicationVersion("0.1-SNAPSHOT") | ||
| .overrideConfigKey("quarkus.openshift.base-jvm-image", | ||
| "image-registry.openshift-image-registry.svc:5000/myns/myimage:1.0") | ||
| .setForcedDependencies(List.of(Dependency.of("io.quarkus", "quarkus-openshift", Version.getVersion()))); | ||
|
|
||
| @ProdBuildResults | ||
| private ProdModeTestResults prodModeTestResults; | ||
|
|
||
| @Test | ||
| public void assertGeneratedResources() throws IOException { | ||
| Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes"); | ||
|
|
||
| assertThat(kubernetesDir).isDirectoryContaining(p -> p.getFileName().endsWith("openshift.json")) | ||
| .isDirectoryContaining(p -> p.getFileName().endsWith("openshift.yml")); | ||
| List<HasMetadata> openshiftList = DeserializationUtil.deserializeAsList(kubernetesDir.resolve("openshift.yml")); | ||
|
|
||
| assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> { | ||
| assertThat(h.getMetadata()).satisfies(m -> { | ||
| assertThat(m.getName()).isEqualTo(APP_NAME); | ||
| }); | ||
| assertThat(h).isInstanceOfSatisfying(DeploymentConfig.class, d -> { | ||
| Container container = d.getSpec().getTemplate().getSpec().getContainers().get(0); | ||
| assertThat(container.getImage()).endsWith(APP_NAME + ":0.1-SNAPSHOT"); | ||
|
|
||
| DeploymentTriggerImageChangeParams imageTriggerParams = d.getSpec().getTriggers().get(0).getImageChangeParams(); | ||
| assertThat(imageTriggerParams.getFrom().getKind()).isEqualTo("ImageStreamTag"); | ||
| assertThat(imageTriggerParams.getFrom().getName()).isEqualTo(APP_NAME + ":0.1-SNAPSHOT"); | ||
| }); | ||
| }); | ||
|
|
||
| assertThat(openshiftList).filteredOn(h -> "BuildConfig".equals(h.getKind())).singleElement().satisfies(h -> { | ||
| assertThat(h.getMetadata()).satisfies(m -> { | ||
| assertThat(m.getName()).isEqualTo(APP_NAME); | ||
| }); | ||
| assertThat(h).isInstanceOfSatisfying(BuildConfig.class, b -> { | ||
| assertThat(b.getSpec().getStrategy().getSourceStrategy().getFrom()).satisfies(f -> { | ||
| assertThat(f.getKind()).isEqualTo("ImageStreamTag"); | ||
| assertThat(f.getNamespace()).isEqualTo("myns"); | ||
| assertThat(f.getName()).isEqualTo("myimage:1.0"); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| //Verify that we only got one Image | ||
| assertThat(openshiftList).filteredOn(h -> "ImageStream".equals(h.getKind())).singleElement() | ||
| .satisfies(h -> { | ||
| assertThat(h.getMetadata()).satisfies(m -> { | ||
| assertThat(m.getName()).isEqualTo(APP_NAME); | ||
| }); | ||
|
|
||
| assertThat(h).isInstanceOfSatisfying(ImageStream.class, i -> { | ||
| assertThat(i.getSpec().getDockerImageRepository()).isNull(); | ||
| }); | ||
| }); | ||
|
|
||
| } | ||
| } |