diff options
author | Harald Musum <musum@verizonmedia.com> | 2023-02-16 10:10:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-16 10:10:48 +0100 |
commit | 6ade28932ddb47cc0afba3b74e31077a883dfafa (patch) | |
tree | d99ec37c49dbf30fefa35e1db972b9c075d89f17 /config-model/src | |
parent | 0284d2b9fe94a403677092d52d757cea6f590587 (diff) | |
parent | 4e9df52570f76b1443cdd306c0e622ac10efb804 (diff) |
Merge pull request #26060 from vespa-engine/hmusum/log-when-admin-version-3.0-is-used
Add log warning / notification for those still using admin version 3,…
Diffstat (limited to 'config-model/src')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java index 1562dbbfb00..e225da565c2 100644 --- a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java +++ b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java @@ -20,6 +20,7 @@ import org.w3c.dom.Element; import java.util.Collection; import java.util.List; +import java.util.logging.Level; /** * Config model adaptor of the Admin class. @@ -51,7 +52,7 @@ public class AdminModel extends ConfigModel { if (admin == null) return; if (admin.getClusterControllers() != null) admin.getClusterControllers().prepare(deployState); if (admin.getMetricsProxyCluster() != null) admin.getMetricsProxyCluster().prepare(deployState); - admin.getLogServerContainerCluster().ifPresent((ContainerCluster cc) -> cc.prepare(deployState)); + admin.getLogServerContainerCluster().ifPresent((ContainerCluster<?> cc) -> cc.prepare(deployState)); } private void verifyClusterControllersOnlyDefinedForContent(ConfigModelRepo configModelRepo) { @@ -110,6 +111,12 @@ public class AdminModel extends ConfigModel { @Override public void doBuild(AdminModel model, Element adminElement, ConfigModelContext modelContext) { + // TODO: Remove in Vespa 9 + if ("3.0".equals(adminElement.getAttribute("version"))) + modelContext.getDeployState().getDeployLogger() + .logApplicationPackage(Level.WARNING, "admin model version 3.0 is deprecated and support will removed in Vespa 9, " + + "please use version 4.0 or remove the element completely. See https://cloud.vespa.ai/en/reference/services#ignored-elements"); + TreeConfigProducer<AnyConfigProducer> parent = modelContext.getParentProducer(); ModelContext.Properties properties = modelContext.getDeployState().getProperties(); DomAdminV4Builder domBuilder = new DomAdminV4Builder(modelContext, |