Only deploy supported infrastructure applications

2 files changed, 10 insertions, 0 deletions

diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java
index 2477c77bdad..c9cd4528bec 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java
@@ -17,6 +17,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -94,6 +95,11 @@ public class DuperModelManager implements DuperModelInfraApi {
         return new ArrayList<>(supportedInfraApplications.values());
     }
 
+    @Override
+    public Optional<InfraApplicationApi> getInfraApplication(ApplicationId applicationId) {
+        return Optional.ofNullable(supportedInfraApplications.get(applicationId));
+    }
+
     /**
      * Returns true if application is considered an infrastructure application by the DuperModel.
      *
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/DuperModelInfraApi.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/DuperModelInfraApi.java
index c5c96921fa1..d08bba2bd3d 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/DuperModelInfraApi.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/DuperModelInfraApi.java
@@ -5,6 +5,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.HostName;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * The DuperModel's API for infrastructure applications.
@@ -15,6 +16,9 @@ public interface DuperModelInfraApi {
     /** Returns the list of supported infrastructure applications. */
     List<InfraApplicationApi> getSupportedInfraApplications();
 
+    /** Returns a supported infrastructure with the given application id or empty if not found */
+    Optional<InfraApplicationApi> getInfraApplication(ApplicationId applicationId);
+
     /** Returns true if the DuperModel has registered the infrastructure application as active. */
     boolean infraApplicationIsActive(ApplicationId applicationId);