From d3773da27f658dd1ac48a65daad27cc1a2c1669f Mon Sep 17 00:00:00 2001 From: Ioannis Canellos Date: Mon, 21 Feb 2022 11:46:00 +0200 Subject: [PATCH] fix (#23788): Fix typo in OpenshiftConfig --- .../kubernetes/deployment/OpenshiftConfig.java | 6 ++++-- .../it/kubernetes/OpenshiftWithS2iTest.java | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java index 8c05ac9252533..8192bc7ebdd67 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftConfig.java @@ -7,6 +7,8 @@ import static io.quarkus.kubernetes.deployment.Constants.DEPLOYMENT_CONFIG_VERSION; import static io.quarkus.kubernetes.deployment.Constants.DEPLOYMENT_GROUP; import static io.quarkus.kubernetes.deployment.Constants.DEPLOYMENT_VERSION; +import static io.quarkus.kubernetes.deployment.Constants.OPENSHIFT; +import static io.quarkus.kubernetes.deployment.Constants.S2I; import static io.quarkus.kubernetes.deployment.Constants.STATEFULSET; import java.util.List; @@ -510,8 +512,8 @@ public Optional getExposition() { public static boolean isOpenshiftBuildEnabled(ContainerImageConfig containerImageConfig, Capabilities capabilities) { boolean implictlyEnabled = ContainerImageCapabilitiesUtil.getActiveContainerImageCapability(capabilities) - .filter(c -> c.contains("openshift") || c.contains("s2i")).isPresent(); - return containerImageConfig.builder.map(b -> b.equals("openshfit") || b.equals("s2i")).orElse(implictlyEnabled); + .filter(c -> c.contains(OPENSHIFT) || c.contains(S2I)).isPresent(); + return containerImageConfig.builder.map(b -> b.equals(OPENSHIFT) || b.equals(S2I)).orElse(implictlyEnabled); } public DeploymentResourceKind getDeploymentResourceKind() { diff --git a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java index a7c006400f8d9..a3e7a7e394e00 100644 --- a/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java +++ b/integration-tests/kubernetes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java @@ -58,6 +58,20 @@ public void assertGeneratedResources() throws IOException { }); assertThat(openshiftList).filteredOn(h -> "BuildConfig".equals(h.getKind())).hasSize(1); + // Has output image stream + assertThat(openshiftList) + .filteredOn(h -> "ImageStream".equals(h.getKind()) && h.getMetadata().getName().equals("openshift-s2i")) + .hasSize(1); + + // Has builder image stream + assertThat(openshiftList) + .filteredOn(h -> "ImageStream".equals(h.getKind()) && !h.getMetadata().getName().equals("openshift-s2i")) + .singleElement().satisfies(r -> { + assertThat(r).isInstanceOfSatisfying(ImageStream.class, i -> { + assertThat(i.getSpec()).isNotNull(); + assertThat(i.getSpec().getDockerImageRepository()).isNotNull(); + }); + }); assertThat(openshiftList).filteredOn(h -> "DeploymentConfig".equals(h.getKind())).singleElement().satisfies(h -> { assertThat(h.getMetadata()).satisfies(m -> {