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

Services updates

4 files changed, 2 insertions, 27 deletions

diff --git a/config-model/src/main/Makefile b/config-model/src/main/Makefile
index 85f0c888446..ffd3b890d2e 100644
--- a/config-model/src/main/Makefile
+++ b/config-model/src/main/Makefile
@@ -10,7 +10,7 @@ all: ${outputdir} ${outputdir}/services.rng ${outputdir}/hosts.rng ${outputdir}/
 ${outputdir}:
 	mkdir -p ${outputdir}
 
-${outputdir}/services.rng: ${srcdir}/services.rnc ${srcdir}/common.rnc ${srcdir}/admin.rnc ${srcdir}/clients.rnc ${srcdir}/docproc.rnc ${srcdir}/routing.rnc ${srcdir}/clients-v2.rnc ${srcdir}/content.rnc ${srcdir}/genericmodule.rnc ${srcdir}/legacygenericcluster.rnc ${srcdir}/genericcluster.rnc ${srcdir}/legacygenericmodule.rnc ${srcdir}/containercluster.rnc
+${outputdir}/services.rng: ${srcdir}/services.rnc ${srcdir}/common.rnc ${srcdir}/admin.rnc ${srcdir}/clients.rnc ${srcdir}/docproc.rnc ${srcdir}/routing.rnc ${srcdir}/clients-v2.rnc ${srcdir}/content.rnc ${srcdir}/genericmodule.rnc ${srcdir}/genericcluster.rnc ${srcdir}/legacygenericmodule.rnc ${srcdir}/containercluster.rnc
 	java -jar $(trangjar) -I rnc -O rng ${srcdir}/services.rnc ${outputdir}/services.rng
 
 ${outputdir}/services.xsd: ${outputdir}/services.rng
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");
 
diff --git a/config-model/src/main/resources/schema/legacygenericcluster.rnc b/config-model/src/main/resources/schema/legacygenericcluster.rnc
deleted file mode 100644
index b00d4ff097b..00000000000
--- a/config-model/src/main/resources/schema/legacygenericcluster.rnc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-# Generic, application-specific service cluster
-# 
-include "legacygenericmodule.rnc"
-
-LegacyGenericCluster = element cluster {
-  attribute name { text } &
-  attribute command { text } &
-  attribute hostservice { text }? &
-  attribute num-hosts { text }? &
-  GenericConfig* &
-  LegacyGenericModule* &
-  element node {
-    service.attlist &
-    attribute name { text }? &
-    LegacyGenericModule* &
-    GenericConfig*
-  }*
-}
-
diff --git a/config-model/src/main/resources/schema/services.rnc b/config-model/src/main/resources/schema/services.rnc
index c8467898639..3a8ffe30563 100644
--- a/config-model/src/main/resources/schema/services.rnc
+++ b/config-model/src/main/resources/schema/services.rnc
@@ -7,13 +7,11 @@ include "docproc.rnc"
 include "routing.rnc"
 include "containercluster.rnc"
 include "genericcluster.rnc"
-include "legacygenericcluster.rnc"
 
 start = element services {
    attribute version { "1.0" }? &
    attribute application-type { "hosted-infrastructure" }? &
    element legacy { element v7-geo-positions { xsd:boolean } }? &
-   LegacyGenericCluster* &
    GenericCluster* &
    GenericConfig* &
    Admin? &