Remove default flavors

7 files changed, 1 insertions, 122 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
index 6c7da668e93..2eff081f42d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java
@@ -117,18 +117,6 @@ public class ConfigserverCluster extends AbstractConfigProducer
         if (options.system().isPresent()) {
             builder.environment(options.system().get());
         }
-        if (options.defaultFlavor().isPresent()) {
-            builder.defaultFlavor(options.defaultFlavor().get());
-        }
-        if (options.defaultAdminFlavor().isPresent()) {
-            builder.defaultAdminFlavor(options.defaultAdminFlavor().get());
-        }
-        if (options.defaultContainerFlavor().isPresent()) {
-            builder.defaultContainerFlavor(options.defaultContainerFlavor().get());
-        }
-        if (options.defaultContentFlavor().isPresent()) {
-            builder.defaultContentFlavor(options.defaultContentFlavor().get());
-        }
 
         builder.serverId(HostName.getLocalhost());
         if (!containerCluster.getHttp().getHttpServer().getConnectorFactories().isEmpty()) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
index eafff2374cb..2162550cadf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/option/CloudConfigOptions.java
@@ -36,10 +36,6 @@ public interface CloudConfigOptions {
     Optional<String> environment();
     Optional<String> region();
     Optional<String> system();
-    Optional<String> defaultFlavor();
-    Optional<String> defaultAdminFlavor();
-    Optional<String> defaultContainerFlavor();
-    Optional<String> defaultContentFlavor();
     Optional<Boolean> useVespaVersionInRequest();
     Optional<Integer> numParallelTenantLoaders();
     Optional<String> loadBalancerAddress();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
index 07422b1f215..ec01716d9c9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
@@ -99,18 +99,6 @@ public class TestOptions implements CloudConfigOptions {
     public Optional<String> system() { return Optional.empty(); }
 
     @Override
-    public Optional<String> defaultFlavor() { return defaultFlavor; }
-
-    @Override
-    public Optional<String> defaultAdminFlavor() { return defaultAdminFlavor; }
-
-    @Override
-    public Optional<String> defaultContainerFlavor() { return defaultContainerFlavor; }
-
-    @Override
-    public Optional<String> defaultContentFlavor() { return defaultContentFlavor; }
-
-    @Override
     public Optional<Boolean> useVespaVersionInRequest() { return useVespaVersionInRequest; }
 
     @Override
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 2050721fef1..2b40b786431 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -141,6 +141,7 @@
       "public com.yahoo.config.provision.NodeType type()",
       "public java.lang.String toString()",
       "public static com.yahoo.config.provision.Capacity fromNodeCount(int)",
+      "public static com.yahoo.config.provision.Capacity fromCount(int, com.yahoo.config.provision.NodeResources)",
       "public static com.yahoo.config.provision.Capacity fromCount(int, com.yahoo.config.provision.NodeResources, boolean, boolean)",
       "public static com.yahoo.config.provision.Capacity fromCount(int, java.util.Optional, boolean, boolean)",
       "public static com.yahoo.config.provision.Capacity fromNodeCount(int, java.util.Optional, boolean, boolean)",
@@ -822,12 +823,10 @@
       "public void <init>(com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)",
       "public void <init>(com.yahoo.config.provision.SystemName, com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)",
       "public void <init>(com.yahoo.config.provision.CloudName, com.yahoo.config.provision.SystemName, com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)",
-      "public void <init>(com.yahoo.config.provision.CloudName, com.yahoo.config.provision.SystemName, com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName, com.yahoo.config.provision.NodeFlavors)",
       "public com.yahoo.config.provision.CloudName cloud()",
       "public com.yahoo.config.provision.SystemName system()",
       "public com.yahoo.config.provision.Environment environment()",
       "public com.yahoo.config.provision.RegionName region()",
-      "public java.lang.String defaultFlavor(com.yahoo.config.provision.ClusterSpec$Type)",
       "public java.util.Optional nodeFlavors()",
       "public static com.yahoo.config.provision.Zone defaultZone()",
       "public java.lang.String toString()",
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
index f2e32b1b996..eebedd15e2c 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
@@ -21,7 +21,6 @@ public class Zone {
     private final SystemName systemName;
     private final Environment environment;
     private final RegionName region;
-    private final FlavorDefaults flavorDefaults;
     private final Optional<NodeFlavors> nodeFlavors;
 
     @Inject
@@ -30,7 +29,6 @@ public class Zone {
              SystemName.from(configserverConfig.system()),
              Environment.from(configserverConfig.environment()),
              RegionName.from(configserverConfig.region()),
-             new FlavorDefaults(configserverConfig),
              nodeFlavors);
     }
 
@@ -50,25 +48,15 @@ public class Zone {
     }
 
     /** Create from cloud, system, environment, region and node flavors. Use for testing. */
-    public Zone(CloudName cloudName,
-                SystemName systemName,
-                Environment environment,
-                RegionName region,
-                NodeFlavors nodeFlavors) {
-        this(cloudName, systemName, environment, region, new FlavorDefaults("default"), nodeFlavors);
-    }
-
     private Zone(CloudName cloudName,
                  SystemName systemName,
                  Environment environment,
                  RegionName region,
-                 FlavorDefaults flavorDefaults,
                  NodeFlavors nodeFlavors) {
         this.cloudName = cloudName;
         this.systemName = systemName;
         this.environment = environment;
         this.region = region;
-        this.flavorDefaults = flavorDefaults;
         this.nodeFlavors = Optional.ofNullable(nodeFlavors);
     }
 
@@ -88,9 +76,6 @@ public class Zone {
         return region;
     }
 
-    /** Returns the default hardware flavor to assign in this zone */
-    public String defaultFlavor(ClusterSpec.Type clusterType) { return flavorDefaults.flavor(clusterType); }
-
     /** Returns all available node flavors for the zone, or empty if not set for this Zone. */
     public Optional<NodeFlavors> nodeFlavors() { return nodeFlavors; }
 
@@ -118,58 +103,5 @@ public class Zone {
         return Objects.hash(environment, region);
     }
 
-    private static class FlavorDefaults {
-
-        /** The default default flavor */
-        private final String defaultFlavor;
-
-        /** The default flavor for each cluster type, or empty to use defaultFlavor */
-        private final Optional<String> adminFlavor;
-        private final Optional<String> containerFlavor;
-        private final Optional<String> contentFlavor;
-
-        /** Creates this with a default flavor and all cluster type flavors empty */
-        public FlavorDefaults(String defaultFlavor) {
-            this(defaultFlavor, Optional.empty(), Optional.empty(), Optional.empty());
-        }
-
-        /** Creates this with a default flavor and all cluster type flavors empty */
-        public FlavorDefaults(String defaultFlavor,
-                              Optional<String> adminFlavor, Optional<String> containerFlavor, Optional<String> contentFlavor) {
-            this.defaultFlavor = defaultFlavor;
-            this.adminFlavor = adminFlavor;
-            this.containerFlavor = containerFlavor;
-            this.contentFlavor = contentFlavor;
-        }
-
-        public FlavorDefaults(ConfigserverConfig config) {
-            this(config.defaultFlavor(),
-                 emptyIfDefault(config.defaultAdminFlavor()),
-                 emptyIfDefault(config.defaultContainerFlavor()),
-                 emptyIfDefault(config.defaultContentFlavor()));
-        }
-
-        /** Map "default" to empty - this config cannot have missing values due to the need for supporting non-hosted */
-        private static Optional<String> emptyIfDefault(String value) {
-            if (Strings.isNullOrEmpty(value)) return Optional.empty();
-            if (value.equals("default")) return Optional.empty();
-            return Optional.of(value);
-        }
-
-        /**
-         * Returns the flavor default for a given cluster type.
-         * This may be "default" - which is an invalid value - but never null.
-         */
-        public String flavor(ClusterSpec.Type clusterType) {
-            switch (clusterType) {
-                case admin: return adminFlavor.orElse(defaultFlavor);
-                case container: return containerFlavor.orElse(defaultFlavor);
-                case content: return contentFlavor.orElse(defaultFlavor);
-                default: return defaultFlavor; // future cluster types
-            }
-        }
-
-    }
-
 }
 
diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def
index 75d11ef46df..a2f3a8ce27f 100644
--- a/configdefinitions/src/vespa/configserver.def
+++ b/configdefinitions/src/vespa/configserver.def
@@ -37,10 +37,6 @@ cloud string default="default"
 environment string default="prod"
 region string default="default"
 system string default="main"
-defaultFlavor string default="default"
-defaultAdminFlavor string default="default"
-defaultContainerFlavor string default="default"
-defaultContentFlavor string default="default"
 
 # RPC protocol
 maxgetconfigclients int default=1000000
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java b/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java
index 3067d732ebf..79108862163 100644
--- a/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java
+++ b/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java
@@ -96,26 +96,6 @@ public class CloudConfigInstallVariables implements CloudConfigOptions {
     }
 
     @Override
-    public Optional<String> defaultFlavor() {
-        return getInstallVariable("default_flavor");
-    }
-
-    @Override
-    public Optional<String> defaultAdminFlavor() {
-        return getInstallVariable("default_admin_flavor");
-    }
-
-    @Override
-    public Optional<String> defaultContainerFlavor() {
-        return getInstallVariable("default_container_flavor");
-    }
-
-    @Override
-    public Optional<String> defaultContentFlavor() {
-        return getInstallVariable("default_content_flavor");
-    }
-
-    @Override
     public Optional<Boolean> useVespaVersionInRequest() {
         return getInstallVariable("use_vespa_version_in_request", Boolean::parseBoolean);
     }