aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@yahooinc.com>2023-03-24 09:29:06 +0100
committerValerij Fredriksen <valerijf@yahooinc.com>2023-03-24 09:29:06 +0100
commitb8af87a7ad06868d01e3ce7f927946688515d576 (patch)
tree1bd3d7c9fd1ae8b46b88792f9124e5ff2210de13 /controller-server/src
parent6db94ff887b65b10b8c4a8ce10c0d2e195bc0c0a (diff)
Enable EnclaveAccessMaintainer in public
Diffstat (limited to 'controller-server/src')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EnclaveAccessMaintainer.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EnclaveAccessMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EnclaveAccessMaintainer.java
index bce4abcb14b..7af96d10f2f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EnclaveAccessMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/EnclaveAccessMaintainer.java
@@ -17,16 +17,15 @@ public class EnclaveAccessMaintainer extends ControllerMaintainer {
private static final Logger logger = Logger.getLogger(EnclaveAccessMaintainer.class.getName());
EnclaveAccessMaintainer(Controller controller, Duration interval) {
- super(controller, interval, null, Set.of(SystemName.PublicCd));
+ super(controller, interval, null, Set.of(SystemName.PublicCd, SystemName.Public));
}
@Override
protected double maintain() {
try {
return controller().serviceRegistry().enclaveAccessService().allowAccessFor(externalAccounts());
- }
- catch (RuntimeException e) {
- logger.log(WARNING, "Failed sharing AMIs", e);
+ } catch (RuntimeException e) {
+ logger.log(WARNING, "Failed sharing resources with enclave", e);
return 0;
}
}
@@ -39,5 +38,4 @@ public class EnclaveAccessMaintainer extends ControllerMaintainer {
return accounts;
}
-
}