diff options
| author | Håkon Hallingstad <hakon@yahooinc.com> | 2024-05-18 23:38:02 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@yahooinc.com> | 2024-05-18 23:38:02 +0200 |
| commit | dec25d5ab61a9e574a8b41853caa879adfccf894 (patch) | |
| tree | 2f030b67856c39dff2a1448beaf5f9ef8040d6a5 /config-model-api | |
| parent | 922b703f5d73244b5be1b4362c0193b76a501409 (diff) | |
Remove flags dependency from config-model
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/abi-spec.json | 4 | ||||
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index c0139c87349..b86b5fd9b99 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -1326,7 +1326,9 @@ "public boolean alwaysMarkPhraseExpensive()", "public boolean sortBlueprintsByCost()", "public int persistenceThreadMaxFeedOpBatchSize()", - "public boolean logserverOtelCol()" + "public boolean logserverOtelCol()", + "public com.yahoo.config.provision.SharedHosts sharedHosts()", + "public com.yahoo.config.provision.NodeResources$Architecture adminClusterArchitecture()" ], "fields" : [ ] }, diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index ad5ab5b7ee4..67735329287 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -12,6 +12,9 @@ import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.DataplaneToken; import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.HostName; +import com.yahoo.config.provision.NodeResources; +import com.yahoo.config.provision.NodeResources.Architecture; +import com.yahoo.config.provision.SharedHosts; import com.yahoo.config.provision.Zone; import java.io.File; @@ -114,6 +117,8 @@ public interface ModelContext { @ModelFeatureFlag(owners = {"baldersheim"}) default boolean sortBlueprintsByCost() { return false; } @ModelFeatureFlag(owners = {"vekterli"}) default int persistenceThreadMaxFeedOpBatchSize() { return 1; } @ModelFeatureFlag(owners = {"olaa"}) default boolean logserverOtelCol() { return false; } + @ModelFeatureFlag(owners = {"bratseth"}) default SharedHosts sharedHosts() { return SharedHosts.empty(); } + @ModelFeatureFlag(owners = {"bratseth"}) default Architecture adminClusterArchitecture() { return Architecture.x86_64; } } /** Warning: As elsewhere in this package, do not make backwards incompatible changes that will break old config models! */ |