Merge pull request #11933 from geoand/#11917

Fix incorrect ImagePullPolicy forced setting
quarkusio · Sep 7, 2020 · 180b01f · 180b01f
2 parents a5befbe + 9985220
commit 180b01f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 34 deletions.
diff --git a/...t/src/main/java/io/quarkus/container/image/deployment/ContainerImageCapabilitiesUtil.java b/...t/src/main/java/io/quarkus/container/image/deployment/ContainerImageCapabilitiesUtil.java
@@ -30,7 +30,7 @@ public static Optional<String> getActiveContainerImageCapability(Capabilities ca
         if (activeContainerImageCapabilities.size() > 1) {
             throw new IllegalStateException(String.join(" and ", activeContainerImageCapabilities)
                     + " were detected, at most one container-image extension can be present.\n"
-                    + "Either remove the uneeded ones, or select one using the property 'quarkus.container-image-builder=<extension name (without the `container-image-` prefix)>'.");
+                    + "Either remove the unneeded ones, or select one using the property 'quarkus.container-image-builder=<extension name (without the `container-image-` prefix)>'.");
         }
         return activeContainerImageCapabilities.isEmpty() ? Optional.empty()
                 : Optional.of(activeContainerImageCapabilities.iterator().next());

diff --git a/...-image/deployment/src/main/java/io/quarkus/container/image/deployment/util/ImageUtil.java b/...-image/deployment/src/main/java/io/quarkus/container/image/deployment/util/ImageUtil.java
@@ -35,33 +35,6 @@ public static String getImage(Optional<String> registry, String repository, Stri
         return sb.toString();
     }
 
-    /*
-     * Checks if the specified image has a registry part.
-     * 
-     * @param image the image
-     * 
-     * @return true if registry is part of the image, false otherwise
-     */
-    public static boolean hasRegistry(String image) {
-        String r = getRegistry(image);
-        return r != null && !r.isEmpty();
-    }
-
-    /**
-     * Return the registry part of the docker image.
-     * 
-     * @param image The actual docker image.
-     * @return The registry or null, if not registry was found.
-     */
-    public static String getRegistry(String image) {
-        String[] parts = image.split(SLASH);
-        if (parts.length <= 2) {
-            return null;
-        } else {
-            return parts[0];
-        }
-    }
-
     /**
      * Return the docker image repository.
      * 

diff --git a/...vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerImageUtil.java b/...vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/ContainerImageUtil.java
@@ -1,7 +1,5 @@
 package io.quarkus.kubernetes.deployment;
 
-import static io.quarkus.container.image.deployment.util.ImageUtil.hasRegistry;
-
 import java.util.Optional;
 
 import io.quarkus.container.image.deployment.ContainerImageCapabilitiesUtil;
@@ -21,7 +19,7 @@ static boolean isRegistryMissingAndNotS2I(Capabilities capabilities, ContainerIm
             return false;
         }
 
-        return !hasRegistry(containerImageInfo.getImage())
-                && !Capability.CONTAINER_IMAGE_S2I.equals(activeContainerImageCapability.get());
+        return !containerImageInfo.getRegistry().isPresent()
+                && !Capability.CONTAINER_IMAGE_S2I.getName().equals(activeContainerImageCapability.get());
     }
 }
diff --git a/...vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java b/...vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java
@@ -1,7 +1,6 @@
 
 package io.quarkus.kubernetes.deployment;
 
-import static io.quarkus.container.image.deployment.util.ImageUtil.hasRegistry;
 import static io.quarkus.kubernetes.deployment.Constants.KNATIVE;
 import static io.quarkus.kubernetes.deployment.Constants.KUBERNETES;
 import static io.quarkus.kubernetes.deployment.Constants.MINIKUBE;
@@ -150,7 +149,7 @@ private DeploymentTargetEntry determineDeploymentTarget(
             checkForMissingRegistry = false;
         }
 
-        if (checkForMissingRegistry && !hasRegistry(containerImageInfo.getImage())) {
+        if (checkForMissingRegistry && !containerImageInfo.getRegistry().isPresent()) {
             log.warn(
                     "A Kubernetes deployment was requested, but the container image to be built will not be pushed to any registry"
                             + " because \"quarkus.container-image.registry\" has not been set. The Kubernetes deployment will only work properly"