Merge pull request #32166 from iocanel/fix-probe-scheme-32135

ApplyHttpGetActionPortDecorator now also sets scheme
quarkusio · Mar 28, 2023 · 6b6f562 · 6b6f562
2 parents cd66e78 + da7857b
commit 6b6f562
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...yment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java b/...yment/src/main/java/io/quarkus/kubernetes/deployment/ApplyHttpGetActionPortDecorator.java
@@ -20,6 +20,7 @@ public class ApplyHttpGetActionPortDecorator extends Decorator<HTTPGetActionFlue
     private final String deployment;
     private final String container;
     private final Integer port;
+    private final String scheme;
     private final String probeKind;
 
     public ApplyHttpGetActionPortDecorator(Integer port) {
@@ -43,10 +44,15 @@ public ApplyHttpGetActionPortDecorator(String deployment, String container, Inte
     }
 
     public ApplyHttpGetActionPortDecorator(String deployment, String container, Integer port, String probeKind) {
+        this(deployment, container, port, probeKind, port != null && (port == 443 || port == 8443) ? "HTTPS" : "HTTP"); // this is the original convention coming from dekorate
+    }
+
+    public ApplyHttpGetActionPortDecorator(String deployment, String container, Integer port, String probeKind, String scheme) {
         this.deployment = deployment;
         this.container = container;
         this.port = port;
         this.probeKind = probeKind;
+        this.scheme = scheme;
     }
 
     @Override
@@ -90,6 +96,12 @@ public void visit(HTTPGetActionFluent<?> action) {
         } else {
             action.withNewPort(port);
         }
+
+        if (scheme == null) {
+            action.withScheme((String) null);
+        } else {
+            action.withScheme(scheme);
+        }
     }
 
     @Override

diff --git a/...rkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithProbePortTest.java b/...rkus-standard-way/src/test/java/io/quarkus/it/kubernetes/KubernetesWithProbePortTest.java
@@ -55,6 +55,7 @@ public void assertGeneratedResources() throws IOException {
                                 .satisfies(container -> {
                                     assertThat(container.getReadinessProbe()).isNotNull().satisfies(p -> {
                                         assertEquals(p.getHttpGet().getPort().getIntVal(), 9191);
+                                        assertEquals(p.getHttpGet().getScheme(), "HTTP");
                                     });
                                 });
                     });