-
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 property "http-action-port-name" is ignored by Kubernetes
When binding a new port: ``` quarkus.kubernetes.ports.custom.container-port=8888 ``` The new port name is `custom` which port `8888`. Then, if we configure any probe to use the port name `custom`: ``` quarkus.kubernetes.readiness-probe.http-action-port-name=custom ``` The generated probe wrongly kept using the port name `http`.
- Loading branch information
Showing
3 changed files
with
122 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
69 changes: 69 additions & 0 deletions
69
...tandard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithProbePortByNameTest.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,69 @@ | ||
| package io.quarkus.it.kubernetes; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| 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.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 KubernetesWithProbePortByNameTest { | ||
|
|
||
| private static final String NAME = "kubernetes-with-probe-port-by-name"; | ||
|
|
||
| @RegisterExtension | ||
| static final QuarkusProdModeTest config = new QuarkusProdModeTest() | ||
| .withApplicationRoot((jar) -> jar.addClasses(GreetingResource.class)) | ||
| .setApplicationName(NAME) | ||
| .setApplicationVersion("0.1-SNAPSHOT") | ||
| .overrideConfigKey("quarkus.kubernetes.ports.custom.container-port", "8888") | ||
| .overrideConfigKey("quarkus.kubernetes.readiness-probe.http-action-port-name", "custom") | ||
| .setLogFileName("k8s.log") | ||
| .setForcedDependencies(List.of( | ||
| Dependency.of("io.quarkus", "quarkus-kubernetes", Version.getVersion()), | ||
| Dependency.of("io.quarkus", "quarkus-smallrye-health", 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("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 -> { | ||
| assertEquals(p.getHttpGet().getPort().getIntVal(), 8888); | ||
| assertEquals(p.getHttpGet().getScheme(), "HTTP"); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| } | ||
| } |