GPU image takes precedence over tenant image

1 files changed, 2 insertions, 4 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java
index 8553172cef3..59dbb0b3241 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ContainerImages.java
@@ -41,12 +41,10 @@ public class ContainerImages {
         if (requestedImage.isPresent()) {
             image = requestedImage.get();
         } else if (nodeType == NodeType.tenant) {
-            if (tenantImage.isPresent()) {
-                image = tenantImage.get();
-            } else if (!node.resources().gpuResources().isZero()) {
+            if (!node.resources().gpuResources().isZero()) {
                 image = tenantGpuImage.orElseThrow(() -> new IllegalArgumentException(node + " has GPU resources, but there is no GPU container image available"));
             } else {
-                image = defaultImage;
+                image = tenantImage.orElse(defaultImage);
             }
         } else {
             image = defaultImage;