Remove redundant tags wiring

12 files changed, 12 insertions, 92 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 4dccebb98b9..b11355df689 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -23,7 +23,6 @@ import com.yahoo.config.provision.InfraDeployer;
 import com.yahoo.config.provision.Provisioner;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.config.provision.exception.ActivationConflictException;
@@ -364,7 +363,6 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
 
     private PrepareResult deploy(File applicationDir, PrepareParams prepareParams, DeployHandlerLogger logger) {
         long sessionId = createSession(prepareParams.getApplicationId(),
-                                       prepareParams.tags(),
                                        prepareParams.getTimeoutBudget(),
                                        applicationDir,
                                        logger);
@@ -861,21 +859,21 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         return sessionRepository.createSessionFromExisting(fromSession, internalRedeploy, timeoutBudget, deployLogger).getSessionId();
     }
 
-    public long createSession(ApplicationId applicationId, Tags tags, TimeoutBudget timeoutBudget, InputStream in,
+    public long createSession(ApplicationId applicationId, TimeoutBudget timeoutBudget, InputStream in,
                               String contentType, DeployLogger logger) {
         File tempDir = uncheck(() -> Files.createTempDirectory("deploy")).toFile();
         long sessionId;
         try {
-            sessionId = createSession(applicationId, tags, timeoutBudget, decompressApplication(in, contentType, tempDir), logger);
+            sessionId = createSession(applicationId, timeoutBudget, decompressApplication(in, contentType, tempDir), logger);
         } finally {
             cleanupTempDirectory(tempDir, logger);
         }
         return sessionId;
     }
 
-    public long createSession(ApplicationId applicationId, Tags tags, TimeoutBudget timeoutBudget, File applicationDirectory, DeployLogger deployLogger) {
+    public long createSession(ApplicationId applicationId, TimeoutBudget timeoutBudget, File applicationDirectory, DeployLogger deployLogger) {
         SessionRepository sessionRepository = getTenant(applicationId).getSessionRepository();
-        Session session = sessionRepository.createSessionFromApplicationPackage(applicationDirectory, applicationId, tags, timeoutBudget, deployLogger);
+        Session session = sessionRepository.createSessionFromApplicationPackage(applicationDirectory, applicationId, timeoutBudget, deployLogger);
         return session.getSessionId();
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
index 71702e2926c..72f22aff7e2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
@@ -6,7 +6,6 @@ import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.InstanceName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
@@ -64,7 +63,6 @@ public class SessionCreateHandler extends SessionHandler {
             // TODO: Avoid using application id here at all
             ApplicationId applicationId = ApplicationId.from(tenantName, ApplicationName.defaultName(), InstanceName.defaultName());
             sessionId = applicationRepository.createSession(applicationId,
-                                                            Tags.empty(),
                                                             timeoutBudget,
                                                             request.getData(),
                                                             request.getHeader(ApplicationApiHandler.contentTypeHeader),
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
index a7a22393771..239026249e5 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
@@ -10,7 +10,6 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.AthenzDomain;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.DockerImage;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.security.X509CertificateUtils;
@@ -42,7 +41,6 @@ public final class PrepareParams {
 
     static final String APPLICATION_NAME_PARAM_NAME = "applicationName";
     static final String INSTANCE_PARAM_NAME = "instance";
-    static final String TAGS_PARAM_NAME = "tags";
     static final String IGNORE_VALIDATION_PARAM_NAME = "ignoreValidationErrors";
     static final String DRY_RUN_PARAM_NAME = "dryRun";
     static final String VERBOSE_PARAM_NAME = "verbose";
@@ -59,7 +57,6 @@ public final class PrepareParams {
     static final String CLOUD_ACCOUNT = "cloudAccount";
 
     private final ApplicationId applicationId;
-    private final Tags tags;
     private final TimeoutBudget timeoutBudget;
     private final boolean ignoreValidationErrors;
     private final boolean dryRun;
@@ -78,7 +75,6 @@ public final class PrepareParams {
     private final Optional<CloudAccount> cloudAccount;
 
     private PrepareParams(ApplicationId applicationId,
-                          Tags tags,
                           TimeoutBudget timeoutBudget,
                           boolean ignoreValidationErrors,
                           boolean dryRun,
@@ -97,7 +93,6 @@ public final class PrepareParams {
                           Optional<CloudAccount> cloudAccount) {
         this.timeoutBudget = timeoutBudget;
         this.applicationId = Objects.requireNonNull(applicationId);
-        this.tags = tags;
         this.ignoreValidationErrors = ignoreValidationErrors;
         this.dryRun = dryRun;
         this.verbose = verbose;
@@ -124,7 +119,6 @@ public final class PrepareParams {
         private boolean force = false;
         private boolean waitForResourcesInPrepare = false;
         private ApplicationId applicationId = null;
-        private Tags tags = Tags.empty();
         private TimeoutBudget timeoutBudget = new TimeoutBudget(Clock.systemUTC(), Duration.ofSeconds(60));
         private Optional<Version> vespaVersion = Optional.empty();
         private List<ContainerEndpoint> containerEndpoints = null;
@@ -143,11 +137,6 @@ public final class PrepareParams {
             return this;
         }
 
-        public Builder tags(Tags tags) {
-            this.tags = tags;
-            return this;
-        }
-
         public Builder ignoreValidationErrors(boolean ignoreValidationErrors) {
             this.ignoreValidationErrors = ignoreValidationErrors;
             return this;
@@ -279,7 +268,6 @@ public final class PrepareParams {
 
         public PrepareParams build() {
             return new PrepareParams(applicationId,
-                                     tags,
                                      timeoutBudget,
                                      ignoreValidationErrors,
                                      dryRun,
@@ -306,7 +294,6 @@ public final class PrepareParams {
                             .verbose(request.getBooleanProperty(VERBOSE_PARAM_NAME))
                             .timeoutBudget(SessionHandler.getTimeoutBudget(request, barrierTimeout))
                             .applicationId(createApplicationId(request, tenant))
-                            .tags(Tags.fromString(request.getProperty(TAGS_PARAM_NAME)))
                             .vespaVersion(request.getProperty(VESPA_VERSION_PARAM_NAME))
                             .containerEndpoints(request.getProperty(CONTAINER_ENDPOINTS_PARAM_NAME))
                             .endpointCertificateMetadata(request.getProperty(ENDPOINT_CERTIFICATE_METADATA_PARAM_NAME))
@@ -329,7 +316,6 @@ public final class PrepareParams {
                 .verbose(booleanValue(params, VERBOSE_PARAM_NAME))
                 .timeoutBudget(SessionHandler.getTimeoutBudget(getTimeout(params, barrierTimeout)))
                 .applicationId(createApplicationId(params, tenant))
-                .tags(Tags.fromString(params.field(TAGS_PARAM_NAME).asString()))
                 .vespaVersion(SlimeUtils.optionalString(params.field(VESPA_VERSION_PARAM_NAME)).orElse(null))
                 .containerEndpointList(deserialize(params.field(CONTAINER_ENDPOINTS_PARAM_NAME), ContainerEndpointSerializer::endpointListFromSlime, List.of()))
                 .endpointCertificateMetadata(deserialize(params.field(ENDPOINT_CERTIFICATE_METADATA_PARAM_NAME), EndpointCertificateMetadataSerializer::fromSlime))
@@ -404,8 +390,6 @@ public final class PrepareParams {
 
     public ApplicationId getApplicationId() { return applicationId; }
 
-    public Tags tags() { return tags; }
-
     /** Returns the Vespa version the nodes running the prepared system should have, or empty to use the system version */
     public Optional<Version> vespaVersion() { return vespaVersion; }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
index 835381b316d..94b3bd96620 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
@@ -13,7 +13,6 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.AthenzDomain;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.DockerImage;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.path.Path;
 import com.yahoo.transaction.Transaction;
@@ -120,10 +119,6 @@ public abstract class Session implements Comparable<Session>  {
         sessionZooKeeperClient.writeApplicationId(applicationId);
     }
 
-    public void setTags(Tags tags) {
-        sessionZooKeeperClient.writeTags(tags);
-    }
-
     void setApplicationPackageReference(FileReference applicationPackageReference) {
         sessionZooKeeperClient.writeApplicationPackageReference(Optional.ofNullable(applicationPackageReference));
     }
@@ -159,10 +154,6 @@ public abstract class Session implements Comparable<Session>  {
     /** Returns application id read from ZooKeeper. Will throw RuntimeException if not found */
     public ApplicationId getApplicationId() { return sessionZooKeeperClient.readApplicationId(); }
 
-    public Tags getTags() {
-        return sessionZooKeeperClient.readTags();
-    }
-
     /** Returns application id read from ZooKeeper. Will return Optional.empty() if not found */
     public Optional<ApplicationId> getOptionalApplicationId() {
         try {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 7629fdd8bfd..17a019067a3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -159,7 +159,6 @@ public class SessionPreparer {
         final PrepareParams params;
 
         final ApplicationId applicationId;
-        final Tags tags;
 
         /** The repository part of docker image to be used for this deployment */
         final Optional<DockerImage> dockerImageRepository;
@@ -191,7 +190,6 @@ public class SessionPreparer {
             this.applicationPackage = applicationPackage;
             this.sessionZooKeeperClient = sessionZooKeeperClient;
             this.applicationId = params.getApplicationId();
-            this.tags = params.tags();
             this.dockerImageRepository = params.dockerImageRepository();
             this.vespaVersion = params.vespaVersion().orElse(Vtag.currentVersion);
             this.containerEndpointsCache = new ContainerEndpointsCache(tenantPath, curator);
@@ -357,7 +355,6 @@ public class SessionPreparer {
             writeStateToZooKeeper(sessionZooKeeperClient,
                                   preprocessedApplicationPackage,
                                   applicationId,
-                                  tags,
                                   filereference,
                                   dockerImageRepository,
                                   vespaVersion,
@@ -399,7 +396,6 @@ public class SessionPreparer {
     private void writeStateToZooKeeper(SessionZooKeeperClient zooKeeperClient,
                                        ApplicationPackage applicationPackage,
                                        ApplicationId applicationId,
-                                       Tags tags,
                                        FileReference fileReference,
                                        Optional<DockerImage> dockerImageRepository,
                                        Version vespaVersion,
@@ -416,7 +412,6 @@ public class SessionPreparer {
             zkDeployer.deploy(applicationPackage, fileRegistryMap, allocatedHosts);
             // Note: When changing the below you need to also change similar calls in SessionRepository.createSessionFromExisting()
             zooKeeperClient.writeApplicationId(applicationId);
-            zooKeeperClient.writeTags(tags);
             zooKeeperClient.writeApplicationPackageReference(Optional.of(fileReference));
             zooKeeperClient.writeVespaVersion(vespaVersion);
             zooKeeperClient.writeDockerImageRepository(dockerImageRepository);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index d26173b4dd7..306b24a3c69 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -265,17 +265,14 @@ public class SessionRepository {
                                                   TimeoutBudget timeoutBudget,
                                                   DeployLogger deployLogger) {
         ApplicationId existingApplicationId = existingSession.getApplicationId();
-        Tags existingTags = existingSession.getTags();
         File existingApp = getSessionAppDir(existingSession.getSessionId());
         LocalSession session = createSessionFromApplication(existingApp,
                                                             existingApplicationId,
-                                                            existingTags,
                                                             internalRedeploy,
                                                             timeoutBudget,
                                                             deployLogger);
         // Note: Setters below need to be kept in sync with calls in SessionPreparer.writeStateToZooKeeper()
         session.setApplicationId(existingApplicationId);
-        session.setTags(existingTags);
         session.setApplicationPackageReference(existingSession.getApplicationPackageReference());
         session.setVespaVersion(existingSession.getVespaVersion());
         session.setDockerImageRepository(existingSession.getDockerImageRepository());
@@ -297,20 +294,19 @@ public class SessionRepository {
      */
     public LocalSession createSessionFromApplicationPackage(File applicationDirectory,
                                                             ApplicationId applicationId,
-                                                            Tags tags,
                                                             TimeoutBudget timeoutBudget,
                                                             DeployLogger deployLogger) {
         applicationRepo.createApplication(applicationId);
-        return createSessionFromApplication(applicationDirectory, applicationId, tags, false, timeoutBudget, deployLogger);
+        return createSessionFromApplication(applicationDirectory, applicationId, false, timeoutBudget, deployLogger);
     }
 
     /**
      * Creates a local session based on a remote session and the distributed application package.
      * Does not wait for session being created on other servers.
      */
-    private void createLocalSession(File applicationFile, ApplicationId applicationId, Tags tags, long sessionId) {
+    private void createLocalSession(File applicationFile, ApplicationId applicationId, long sessionId) {
         try {
-            ApplicationPackage applicationPackage = createApplicationPackage(applicationFile, applicationId, tags, sessionId, false, Optional.empty());
+            ApplicationPackage applicationPackage = createApplicationPackage(applicationFile, applicationId, sessionId, false, Optional.empty());
             createLocalSession(sessionId, applicationPackage);
         } catch (Exception e) {
             throw new RuntimeException("Error creating session " + sessionId, e);
@@ -686,13 +682,12 @@ public class SessionRepository {
     private ApplicationPackage createApplication(File userDir,
                                                  File configApplicationDir,
                                                  ApplicationId applicationId,
-                                                 Tags tags,
                                                  long sessionId,
                                                  Optional<Long> currentlyActiveSessionId,
                                                  boolean internalRedeploy,
                                                  Optional<DeployLogger> deployLogger) {
         long deployTimestamp = System.currentTimeMillis();
-        DeployData deployData = new DeployData(userDir.getAbsolutePath(), applicationId, tags, deployTimestamp, internalRedeploy,
+        DeployData deployData = new DeployData(userDir.getAbsolutePath(), applicationId, deployTimestamp, internalRedeploy,
                                                sessionId, currentlyActiveSessionId.orElse(nonExistingActiveSessionId));
         FilesApplicationPackage app = FilesApplicationPackage.fromFileWithDeployData(configApplicationDir, deployData);
         validateFileExtensions(applicationId, deployLogger, app);
@@ -720,14 +715,13 @@ public class SessionRepository {
 
     private LocalSession createSessionFromApplication(File applicationDirectory,
                                                       ApplicationId applicationId,
-                                                      Tags tags,
                                                       boolean internalRedeploy,
                                                       TimeoutBudget timeoutBudget,
                                                       DeployLogger deployLogger) {
         long sessionId = getNextSessionId();
         try {
             ensureSessionPathDoesNotExist(sessionId);
-            ApplicationPackage app = createApplicationPackage(applicationDirectory, applicationId, tags, sessionId, internalRedeploy, Optional.of(deployLogger));
+            ApplicationPackage app = createApplicationPackage(applicationDirectory, applicationId, sessionId, internalRedeploy, Optional.of(deployLogger));
             log.log(Level.FINE, () -> TenantRepository.logPre(tenantName) + "Creating session " + sessionId + " in ZooKeeper");
             SessionZooKeeperClient sessionZKClient = createSessionZooKeeperClient(sessionId);
             sessionZKClient.createNewSession(clock.instant());
@@ -743,7 +737,6 @@ public class SessionRepository {
 
     private ApplicationPackage createApplicationPackage(File applicationDirectory,
                                                         ApplicationId applicationId,
-                                                        Tags tags,
                                                         long sessionId,
                                                         boolean internalRedeploy,
                                                         Optional<DeployLogger> deployLogger) throws IOException {
@@ -756,7 +749,6 @@ public class SessionRepository {
             ApplicationPackage applicationPackage = createApplication(applicationDirectory,
                                                                       userApplicationDir,
                                                                       applicationId,
-                                                                      tags,
                                                                       sessionId,
                                                                       activeSessionId,
                                                                       internalRedeploy,
@@ -875,7 +867,7 @@ public class SessionRepository {
         }
         ApplicationId applicationId = sessionZKClient.readApplicationId();
         log.log(Level.FINE, () -> "Creating local session for tenant '" + tenantName + "' with session id " + sessionId);
-        createLocalSession(sessionDir, applicationId, sessionZKClient.readTags(), sessionId);
+        createLocalSession(sessionDir, applicationId, sessionId);
     }
 
     private Optional<Long> getActiveSessionId(ApplicationId applicationId) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
index 2353c480a34..4bbb8a63974 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
@@ -14,7 +14,6 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.AthenzDomain;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.DockerImage;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.path.Path;
 import com.yahoo.slime.SlimeUtils;
@@ -59,7 +58,6 @@ public class SessionZooKeeperClient {
     // NOTE: Any state added here MUST also be propagated in com.yahoo.vespa.config.server.deploy.Deployment.prepare()
 
     static final String APPLICATION_ID_PATH = "applicationId";
-    static final String TAGS_PATH = "tags";
     static final String APPLICATION_PACKAGE_REFERENCE_PATH = "applicationPackageReference";
     private static final String VERSION_PATH = "version";
     private static final String CREATE_TIME_PATH = "createTime";
@@ -175,20 +173,6 @@ public class SessionZooKeeperClient {
                       .orElseThrow(() -> new NotFoundException("Could not find application id for session " + sessionId));
     }
 
-    private Path tagsPath() {
-        return sessionPath.append(TAGS_PATH);
-    }
-
-    public void writeTags(Tags tags) {
-        curator.set(tagsPath(), Utf8.toBytes(tags.asString()));
-    }
-
-    public Tags readTags() {
-        Optional<byte[]> data = curator.getData(tagsPath());
-        if (data.isEmpty()) return Tags.empty();
-        return Tags.fromString(Utf8.toString(data.get()));
-    }
-
     void writeApplicationPackageReference(Optional<FileReference> applicationPackageReference) {
         applicationPackageReference.ifPresent(
                 reference -> curator.set(applicationPackageReferencePath(), Utf8.toBytes(reference.value())));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 8f104a27000..76eb61ed141 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -17,7 +17,6 @@ import com.yahoo.config.provision.HostFilter;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.NetworkPorts;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.exception.ActivationConflictException;
 import com.yahoo.container.jdisc.HttpResponse;
@@ -846,7 +845,7 @@ public class ApplicationRepositoryTest {
     }
 
     private long createSession(ApplicationId applicationId, TimeoutBudget timeoutBudget, File app) {
-        return applicationRepository.createSession(applicationId, Tags.empty(), timeoutBudget, app, new BaseDeployLogger());
+        return applicationRepository.createSession(applicationId, timeoutBudget, app, new BaseDeployLogger());
     }
 
     private long createSessionFromExisting(ApplicationId applicationId, TimeoutBudget timeoutBudget) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
index 653753c97e7..fd6440a9632 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
@@ -13,7 +13,6 @@ import com.yahoo.config.model.application.provider.MockFileRegistry;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.HostSpec;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.path.Path;
 import com.yahoo.text.Utf8;
 import com.yahoo.vespa.config.server.zookeeper.ZKApplicationPackage;
@@ -60,7 +59,6 @@ public class ZooKeeperClientTest {
         ApplicationPackage app = FilesApplicationPackage.fromFileWithDeployData(new File("src/test/apps/zkfeed"),
                                                                                 new DeployData("/bar/baz",
                                                                                                ApplicationId.from("default", "appName", "default"),
-                                                                                               Tags.fromString("tag1 tag2"),
                                                                                                1345L,
                                                                                                true,
                                                                                                3L,
@@ -123,7 +121,6 @@ public class ZooKeeperClientTest {
         assertTrue(metaData.getChecksum().length() > 0);
         assertTrue(metaData.isInternalRedeploy());
         assertEquals("/bar/baz", metaData.getDeployPath());
-        assertEquals(Tags.fromString("tag1 tag2"), metaData.getTags());
         assertEquals(1345, metaData.getDeployTimestamp().longValue());
         assertEquals(3, metaData.getGeneration().longValue());
         assertEquals(2, metaData.getPreviousActiveGeneration());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
index 816f7e3dcec..1c71ef0b7fb 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
@@ -6,7 +6,6 @@ import com.yahoo.component.Version;
 import com.yahoo.config.application.api.ApplicationMetaData;
 import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.jdisc.HttpResponse;
@@ -132,7 +131,6 @@ public class SessionActiveHandlerTest {
 
         void invoke() {
             long sessionId = applicationRepository.createSession(applicationId(),
-                                                                 Tags.empty(),
                                                                  new TimeoutBudget(clock, Duration.ofSeconds(10)),
                                                                  testApp,
                                                                  new BaseDeployLogger());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
index 525a969ed1e..de6073bb1ea 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
@@ -10,7 +10,6 @@ import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.NodeAllocationException;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.jdisc.http.HttpRequest;
@@ -325,7 +324,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
     }
 
     private long createSession(ApplicationId applicationId) {
-        return applicationRepository.createSession(applicationId, Tags.empty(), timeoutBudget, app, new BaseDeployLogger());
+        return applicationRepository.createSession(applicationId, timeoutBudget, app, new BaseDeployLogger());
     }
 
     private static class FailingSessionPrepareHandler extends SessionPrepareHandler {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
index 82d6f183761..2c898b8bf7d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
@@ -7,7 +7,6 @@ import com.yahoo.config.model.api.EndpointCertificateMetadata;
 import com.yahoo.config.model.api.TenantSecretStore;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.CloudAccount;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
 
@@ -63,7 +62,6 @@ public class PrepareParamsTest {
         PrepareParams prepareParams = createParams("http://foo:19071/application/v2/", TenantName.defaultName());
 
         assertEquals(ApplicationId.defaultId(), prepareParams.getApplicationId());
-        assertTrue(prepareParams.tags().isEmpty());
         assertFalse(prepareParams.isDryRun());
         assertFalse(prepareParams.isVerbose());
         assertFalse(prepareParams.ignoreValidationErrors());
@@ -74,18 +72,6 @@ public class PrepareParamsTest {
     }
 
     @Test
-    public void testTagsParsing() throws IOException {
-        var prepareParams = createParams(request + "&" + PrepareParams.TAGS_PARAM_NAME + "=tag1%20tag2", TenantName.from("foo"));
-        assertEquals(Tags.fromString("tag1 tag2"), prepareParams.tags());
-
-        // Verify using json object
-        var slime = SlimeUtils.jsonToSlime(json);
-        slime.get().setString(PrepareParams.TAGS_PARAM_NAME, "tag1 tag2");
-        PrepareParams prepareParamsJson = PrepareParams.fromJson(SlimeUtils.toJsonBytes(slime), TenantName.from("foo"), Duration.ofSeconds(60));
-        assertPrepareParamsEqual(prepareParams, prepareParamsJson);
-    }
-
-    @Test
     public void testCorrectParsingWithContainerEndpoints() throws IOException {
         var endpoints = List.of(new ContainerEndpoint("qrs1", ApplicationClusterEndpoint.Scope.global,
                                                       List.of("c1.example.com",
@@ -221,7 +207,6 @@ public class PrepareParamsTest {
         assertEquals(urlParams.force(), jsonParams.force());
         assertEquals(urlParams.waitForResourcesInPrepare(), jsonParams.waitForResourcesInPrepare());
         assertEquals(urlParams.getApplicationId(), jsonParams.getApplicationId());
-        assertEquals(urlParams.tags(), jsonParams.tags());
         assertEquals(urlParams.getTimeoutBudget().timeout(), jsonParams.getTimeoutBudget().timeout());
         assertEquals(urlParams.vespaVersion(), jsonParams.vespaVersion());
         assertEquals(urlParams.containerEndpoints(), jsonParams.containerEndpoints());