Remove ClusterMetrics from Deployment and LockedApplication

1 files changed, 1 insertions, 8 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
index 1e032ab25ea..40ae754d051 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
@@ -162,8 +162,7 @@ public class LockedApplication {
                                                   previousDeployment.clusterUtils(),
                                                   previousDeployment.clusterInfo(),
                                                   previousDeployment.metrics().with(warnings),
-                                                  previousDeployment.activity(),
-                                                  previousDeployment.clusterMetrics());
+                                                  previousDeployment.activity());
         return with(newDeployment);
     }
 
@@ -275,12 +274,6 @@ public class LockedApplication {
                                      metrics, pemDeployKey, rotations, rotationStatus, applicationCertificate);
     }
 
-    public LockedApplication with(ZoneId zoneId, List<ClusterMetrics> clusterMetrics) {
-        Deployment deployment = deployments.get(zoneId);
-        if (deployment == null) return this;    // No longer deployed in this zone.
-        return with(deployment.withClusterMetrics(clusterMetrics));
-    }
-
     public LockedApplication withApplicationCertificate(Optional<ApplicationCertificate> applicationCertificate) {
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, deployments,
                                      deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion,