Drop setting quarkus.http.host from Jib and S2I

There is no need to set these to 0.0.0.0 as that value is the default. Furthermore setting them in such a way means that if the property is set in application.properties, it will have no effect when running the container image Fixes: quarkusio#11911
gsmet · Sep 8, 2020 · 6c9de91 · 6c9de91
1 parent 6a2914f
commit 6c9de91
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/...age-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java b/...age-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java
@@ -26,14 +26,14 @@ public class JibConfig {
     /**
      * Additional JVM arguments to pass to the JVM when starting the application
      */
-    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0,-Djava.util.logging.manager=org.jboss.logmanager.LogManager")
+    @ConfigItem(defaultValue = "-Djava.util.logging.manager=org.jboss.logmanager.LogManager")
     public List<String> jvmArguments;
 
     /**
      * Additional arguments to pass when starting the native application
      */
-    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0")
-    public List<String> nativeArguments;
+    @ConfigItem
+    public Optional<List<String>> nativeArguments;
 
     /**
      * If this is set, then it will be used as the entry point of the container image.

diff --git a/...-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java b/...-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
@@ -340,9 +340,10 @@ private JibContainerBuilder createContainerBuilderFromNative(ContainerImageConfi
         if (jibConfig.nativeEntrypoint.isPresent()) {
             entrypoint = jibConfig.nativeEntrypoint.get();
         } else {
-            entrypoint = new ArrayList<>(jibConfig.nativeArguments.size() + 1);
+            List<String> nativeArguments = jibConfig.nativeArguments.orElse(Collections.emptyList());
+            entrypoint = new ArrayList<>(nativeArguments.size() + 1);
             entrypoint.add("./" + BINARY_NAME_IN_CONTAINER);
-            entrypoint.addAll(jibConfig.nativeArguments);
+            entrypoint.addAll(nativeArguments);
         }
         try {
             AbsoluteUnixPath workDirInContainer = AbsoluteUnixPath.get("/work");

diff --git a/...age-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iConfig.java b/...age-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iConfig.java
@@ -30,14 +30,14 @@ public class S2iConfig {
     /**
      * Additional JVM arguments to pass to the JVM when starting the application
      */
-    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0,-Djava.util.logging.manager=org.jboss.logmanager.LogManager")
+    @ConfigItem(defaultValue = "-Djava.util.logging.manager=org.jboss.logmanager.LogManager")
     public List<String> jvmArguments;
 
     /**
      * Additional arguments to pass when starting the native application
      */
-    @ConfigItem(defaultValue = "-Dquarkus.http.host=0.0.0.0")
-    public List<String> nativeArguments;
+    @ConfigItem
+    public Optional<List<String>> nativeArguments;
 
     /**
      * The directory where the jar is added during the assemble phase.

diff --git a/...-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java b/...-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java
@@ -134,17 +134,17 @@ public void s2iRequirementsNative(S2iConfig s2iConfig,
 
         builderImageProducer.produce(new BaseImageInfoBuildItem(s2iConfig.baseNativeImage));
         Optional<S2iBaseNativeImage> baseImage = S2iBaseNativeImage.findMatching(s2iConfig.baseNativeImage);
+        List<String> nativeArguments = s2iConfig.nativeArguments.orElse(Collections.emptyList());
         baseImage.ifPresent(b -> {
             envProducer.produce(
                     KubernetesEnvBuildItem.createSimpleVar(b.getHomeDirEnvVar(), s2iConfig.nativeBinaryDirectory, OPENSHIFT));
             envProducer.produce(
-                    KubernetesEnvBuildItem.createSimpleVar(b.getOptsEnvVar(), String.join(" ", s2iConfig.nativeArguments),
+                    KubernetesEnvBuildItem.createSimpleVar(b.getOptsEnvVar(), String.join(" ", nativeArguments),
                             OPENSHIFT));
         });
 
         if (!baseImage.isPresent()) {
-            commandProducer.produce(new KubernetesCommandBuildItem(pathToNativeBinary,
-                    s2iConfig.nativeArguments.toArray(new String[s2iConfig.nativeArguments.size()])));
+            commandProducer.produce(new KubernetesCommandBuildItem(pathToNativeBinary, nativeArguments.toArray(new String[0])));
         }
     }
 

diff --git a/...tes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java b/...tes/quarkus-standard-way/src/test/java/io/quarkus/it/kubernetes/OpenshiftWithS2iTest.java
@@ -86,7 +86,6 @@ public void assertGeneratedResources() throws IOException {
                             });
                             assertThat(envVars).anySatisfy(envVar -> {
                                 assertThat(envVar.getName()).isEqualTo("JAVA_OPTIONS");
-                                assertThat(envVar.getValue()).contains("-Dquarkus.http.host=0.0.0.0");
                                 assertThat(envVar.getValue())
                                         .contains("-Djava.util.logging.manager=org.jboss.logmanager.LogManager");
                             });