Merge pull request #20177 from vespa-engine/freva/remove-flags

Remove CGroups v2, map user NS and mount readonly feature flags

1 files changed, 2 insertions, 8 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/UserNamespace.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/UserNamespace.java
index 776de103a13..40a8ab16923 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/UserNamespace.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/UserNamespace.java
@@ -14,8 +14,8 @@ public class UserNamespace {
      * Real value in /proc/sys/fs/overflowuid or overflowgid, hardcode default value*/
     private static final int OVERFLOW_ID = 65_534;
 
-    private volatile int uidOffset;
-    private volatile int gidOffset;
+    private final int uidOffset;
+    private final int gidOffset;
     private final int idRangeSize;
 
     public UserNamespace(int uidOffset, int gidOffset, int idRangeSize) {
@@ -32,12 +32,6 @@ public class UserNamespace {
     public int idRangeSize() { return idRangeSize; }
     public int overflowId() { return OVERFLOW_ID; }
 
-    // Remove after migration to mapped namespaces is complete, make fields final
-    public void setOffsets(int idOffset) {
-        this.uidOffset = idOffset;
-        this.gidOffset = idOffset;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;