forked from quarkusio/quarkus
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix K8s/OpenShift deployment when using management interface+https
Note that these changes will move the management ssl configuration to built-time configuration. Moreover, the logic to select the HTTPS schema mimics to the logic in VertxHttpRecorder.initializeMainHttpServer method. Fix quarkusio#32225
- Loading branch information
Showing
12 changed files
with
183 additions
and
20 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
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
111 changes: 111 additions & 0 deletions
111
...ava/io/quarkus/it/kubernetes/KubernetesWithHealthUsingSecuredManagementInterfaceTest.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,111 @@ | ||
| package io.quarkus.it.kubernetes; | ||
|
|
||
| import static io.restassured.RestAssured.given; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.hamcrest.Matchers.is; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Path; | ||
| import java.util.Collections; | ||
| 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.Probe; | ||
| import io.fabric8.kubernetes.api.model.apps.Deployment; | ||
| import io.quarkus.builder.Version; | ||
| import io.quarkus.kubernetes.spi.CustomProjectRootBuildItem; | ||
| import io.quarkus.maven.dependency.Dependency; | ||
| import io.quarkus.test.LogFile; | ||
| import io.quarkus.test.ProdBuildResults; | ||
| import io.quarkus.test.ProdModeTestResults; | ||
| import io.quarkus.test.QuarkusProdModeTest; | ||
|
|
||
| public class KubernetesWithHealthUsingSecuredManagementInterfaceTest { | ||
|
|
||
| private static final String NAME = "kubernetes-with-health-and-secured-management"; | ||
|
|
||
| @RegisterExtension | ||
| static final QuarkusProdModeTest config = new QuarkusProdModeTest() | ||
| .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) | ||
| .setApplicationName(NAME) | ||
| .setApplicationVersion("0.1-SNAPSHOT") | ||
| .addCustomResourceEntry(Path.of("src", "main", "resources", "META-INF", "server.keystore"), | ||
| "manifests/" + NAME + "/server.keystore") | ||
| .setLogFileName("k8s.log") | ||
| .setRun(true) | ||
| .withConfigurationResource(NAME + ".properties") | ||
| .setForcedDependencies(List.of( | ||
| Dependency.of("io.quarkus", "quarkus-smallrye-health", Version.getVersion()))) | ||
| .addBuildChainCustomizerEntries( | ||
| new QuarkusProdModeTest.BuildChainCustomizerEntry( | ||
| OpenshiftWithCommonResourcesTest.CustomProjectRootBuildItemProducerProdMode.class, | ||
| Collections.singletonList(CustomProjectRootBuildItem.class), Collections.emptyList())); | ||
|
|
||
| @ProdBuildResults | ||
| private ProdModeTestResults prodModeTestResults; | ||
|
|
||
| @LogFile | ||
| private Path logfile; | ||
|
|
||
| @Test | ||
| public void assertApplicationRuns() { | ||
| assertThat(logfile).isRegularFile().hasFileName("k8s.log"); | ||
| TestUtil.assertLogFileContents(logfile, "kubernetes", "health"); | ||
| given() | ||
| .when().get("/greeting") | ||
| .then() | ||
| .statusCode(200) | ||
| .body(is("hello")); | ||
| } | ||
|
|
||
| @Test | ||
| public void assertGeneratedResources() throws IOException { | ||
| final Path kubernetesDir = prodModeTestResults.getBuildDir().resolve("kubernetes"); | ||
| assertThat(kubernetesDir) | ||
| .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.json")) | ||
| .isDirectoryContaining(p -> p.getFileName().endsWith("kubernetes.yml")); | ||
| List<HasMetadata> kubernetesList = DeserializationUtil | ||
| .deserializeAsList(kubernetesDir.resolve("kubernetes.yml")); | ||
| assertThat(kubernetesList.get(0)).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.getSpec()).satisfies(podSpec -> { | ||
| assertThat(podSpec.getContainers()).singleElement().satisfies(container -> { | ||
| assertThat(container.getReadinessProbe()).isNotNull().satisfies(p -> { | ||
| assertThat(p.getInitialDelaySeconds()).isEqualTo(5); | ||
| assertProbePath(p, "/q/health/ready"); | ||
|
|
||
| assertNotNull(p.getHttpGet()); | ||
| assertEquals("HTTPS", p.getHttpGet().getScheme()); | ||
| assertEquals(9000, p.getHttpGet().getPort().getIntVal()); | ||
| }); | ||
| assertThat(container.getLivenessProbe()).isNotNull().satisfies(p -> { | ||
| assertThat(p.getInitialDelaySeconds()).isEqualTo(20); | ||
| assertProbePath(p, "/liveness"); | ||
|
|
||
| assertNotNull(p.getHttpGet()); | ||
| assertEquals("HTTPS", p.getHttpGet().getScheme()); | ||
| assertEquals(9000, p.getHttpGet().getPort().getIntVal()); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| private void assertProbePath(Probe p, String expectedPath) { | ||
| assertThat(p.getHttpGet()).satisfies(h -> { | ||
| assertThat(h.getPath()).isEqualTo(expectedPath); | ||
| }); | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
...-standard-way/src/test/resources/kubernetes-with-health-and-secured-management.properties
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,6 @@ | ||
| quarkus.http.port=9090 | ||
| quarkus.management.enabled=true | ||
| quarkus.management.ssl.certificate.key-store-file=META-INF/server.keystore | ||
| quarkus.management.ssl.certificate.key-store-password=password | ||
| quarkus.kubernetes.liveness-probe.initial-delay=20s | ||
| quarkus.smallrye-health.liveness-path=/liveness |
Binary file added
BIN
+2.35 KB
...rc/test/resources/manifests/kubernetes-with-health-and-secured-management/server.keystore
Binary file not shown.