Merge branch 'master' into hakonhall/add-cloud-flag-dimension

1 files changed, 15 insertions, 3 deletions

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index 8ee6584f93a..260499588ae 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -58,6 +58,12 @@ public class Flags {
             // if any, or otherwise hosted-vespa:tenant-host:default.
             APPLICATION_ID, TENANT_ID, CLUSTER_ID, CLUSTER_TYPE);
 
+    public static final UnboundBooleanFlag SIMPLER_ACL = defineFeatureFlag(
+            "simpler-acl", true,
+            List.of("hakonhall"), "2023-07-04", "2023-08-04",
+            "Simplify ACL in hosted Vespa",
+            "Takes effect on the next fetch of ACL rules");
+
     public static final UnboundDoubleFlag DEFAULT_TERM_WISE_LIMIT = defineDoubleFlag(
             "default-term-wise-limit", 1.0,
             List.of("baldersheim"), "2020-12-02", "2023-12-31",
@@ -366,7 +372,7 @@ public class Flags {
     );
 
     public static final UnboundBooleanFlag ENABLE_CROWDSTRIKE = defineFeatureFlag(
-            "enable-crowdstrike", true, List.of("andreer"), "2023-04-13", "2023-07-31",
+            "enable-crowdstrike", true, List.of("andreer"), "2023-04-13", "2023-08-31",
             "Whether to enable CrowdStrike.", "Takes effect on next host admin tick",
             HOSTNAME);
 
@@ -377,13 +383,13 @@ public class Flags {
             ZONE_ID, APPLICATION_ID);
 
     public static final UnboundBooleanFlag RANDOMIZED_ENDPOINT_NAMES = defineFeatureFlag(
-            "randomized-endpoint-names", false, List.of("andreer"), "2023-04-26", "2023-07-30",
+            "randomized-endpoint-names", false, List.of("andreer"), "2023-04-26", "2023-08-30",
             "Whether to use randomized endpoint names",
             "Takes effect on application deployment",
             APPLICATION_ID);
 
     public static final UnboundIntFlag CERT_POOL_SIZE = defineIntFlag(
-            "cert-pool-size", 0, List.of("andreer"), "2023-06-19", "2023-07-25",
+            "cert-pool-size", 0, List.of("andreer"), "2023-06-19", "2023-08-25",
             "Target number of preprovisioned endpoints certificates to maintain",
             "Takes effect on next run of CertPoolMaintainer"
     );
@@ -444,6 +450,12 @@ public class Flags {
             "Takes effect immediately",
             ZONE_ID);
 
+    public static final UnboundBooleanFlag USE_VESPA_USER_EVERYWHERE = defineFeatureFlag(
+            "use-vespa-user-everywhere", false,
+            List.of("aressem"), "2023-07-28", "2023-09-01",
+            "Use the vespa user for running Vespa everywhere",
+            "Takes effect immediately");
+
     /** WARNING: public for testing: All flags should be defined in {@link Flags}. */
     public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, List<String> owners,
                                                        String createdAt, String expiresAt, String description,