Merge pull request #20982 from vespa-engine/services-updates

Services updates

1 files changed, 1 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
index 77b71a66118..0e0f992952a 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
@@ -138,12 +138,9 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter
                 continue;
             }
             if (tagName.equals("config")) {
-                // TODO: disallow on Vespa 8
+                // Top level config, mainly to be used by the Vespa team.
                 continue;
             }
-            if (tagName.equals("cluster")) {
-                throw new IllegalArgumentException("<" + tagName + "> on top-level is not allowed anymore");
-            }
             if ((tagName.equals("clients")) && deployState.isHosted())
                 throw new IllegalArgumentException("<" + tagName + "> is not allowed when running Vespa in a hosted environment");