diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-02-15 14:05:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-15 14:05:49 +0100 |
| commit | cbc21762b55c66b23048539c651ae2f83f3716d3 (patch) | |
| tree | 966b1f81c204faa00996d1f507ec93978fa133a8 | |
| parent | b9b7e3cf8529e6f7e9904c1013174e37c0460696 (diff) | |
| parent | 0d1055778ceded029fb52f3776a61f56c18eccd6 (diff) | |
Merge pull request #26047 from vespa-engine/bjorncs/capabilities
Add new capabilities to existing capability sets
| -rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java b/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java index cc5bdbeafd3..67a805d3204 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java @@ -21,17 +21,20 @@ public class CapabilitySet implements ToCapabilitySet { private static final Map<String, CapabilitySet> PREDEFINED = new HashMap<>(); - private static final CapabilitySet SHARED_CAPABILITIES_APP_NODE = CapabilitySet.of( - Capability.LOGSERVER_API, Capability.CONFIGSERVER__CONFIG_API, - Capability.CONFIGSERVER__FILEDISTRIBUTION_API, Capability.CONFIGPROXY__CONFIG_API, - Capability.CONFIGPROXY__FILEDISTRIBUTION_API, Capability.SENTINEL__CONNECTIVITY_CHECK); /* Predefined capability sets */ public static final CapabilitySet ALL = predefined( "vespa.all", Capability.values()); public static final CapabilitySet TELEMETRY = predefined( "vespa.telemetry", - Capability.CONTENT__STATUS_PAGES, Capability.CONTENT__METRICS_API); + Capability.CONTENT__STATUS_PAGES, Capability.CONTENT__METRICS_API, Capability.CONTAINER__STATE_API, + Capability.METRICSPROXY__METRICS_API, Capability.SENTINEL__CONNECTIVITY_CHECK); + + private static final CapabilitySet SHARED_CAPABILITIES_APP_NODE = CapabilitySet.of( + Capability.LOGSERVER_API, Capability.CONFIGSERVER__CONFIG_API, + Capability.CONFIGSERVER__FILEDISTRIBUTION_API, Capability.CONFIGPROXY__CONFIG_API, + Capability.CONFIGPROXY__FILEDISTRIBUTION_API, TELEMETRY); + public static final CapabilitySet CONTENT_NODE = predefined( "vespa.content_node", Capability.CONTENT__STORAGE_API, Capability.CONTENT__DOCUMENT_API, Capability.CONTAINER__DOCUMENT_API, @@ -47,7 +50,8 @@ public class CapabilitySet implements ToCapabilitySet { "vespa.logserver_node", SHARED_CAPABILITIES_APP_NODE); public static final CapabilitySet CONFIGSERVER_NODE = predefined( "vespa.config_server_node", - Capability.CLIENT__FILERECEIVER_API, Capability.CONTAINER__MANAGEMENT_API, TELEMETRY); + Capability.CLIENT__FILERECEIVER_API, Capability.CONTAINER__MANAGEMENT_API, Capability.SLOBROK__API, + Capability.CLUSTER_CONTROLLER__REINDEXING, Capability.CLUSTER_CONTROLLER__STATE, TELEMETRY); private static CapabilitySet predefined(String name, ToCapabilitySet... capabilities) { var instance = CapabilitySet.of(capabilities); |