m/node/kubernetes: remove local-strict storage class
It turns out that the local-strict storage class did not have an effect
on readonly volumes, or on gVisor. And after updating runc to 1.2.0, it
no longer has an effect anywhere. It appears that setting noexec and
similar flags in the CSI server, using a storage class, is the wrong
approach and just happened to work by accident. Instead, this should
probably be implemented as a Kubernetes feature to set per-mount-point
flags on the VolumeMount.
This commit thus removes the local-strict storage class and the mount
options processing in the provisioner and CSI server. This will allow
updating runc.
Additionally, the StatefulSet end-to-end test is extended to also run
tests with gVisor. gVisor apparently does not support block volumes.
See: https://github.com/monogon-dev/monogon/issues/361
Change-Id: Ic2f50aa3bc9442ca1dbb9e8742d5b8fecbfc3614
Reviewed-on: https://review.monogon.dev/c/monogon/+/3658
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/metropolis/test/e2e/persistentvolume/main.go b/metropolis/test/e2e/persistentvolume/main.go
index 577c343..d9ff958 100644
--- a/metropolis/test/e2e/persistentvolume/main.go
+++ b/metropolis/test/e2e/persistentvolume/main.go
@@ -9,6 +9,7 @@
import (
"errors"
+ "flag"
"fmt"
"os"
"path/filepath"
@@ -23,6 +24,8 @@
// This is a copy of the constant in metropolis/node/kubernetes/provisioner.go.
const inodeCapacityRatio = 4 * 512
+var runtimeClass = flag.String("runtimeclass", "", "Name of the runtime class")
+
// checkFilesystemVolume checks that the filesystem containing path has the
// given mount flags and capacity.
func checkFilesystemVolume(path string, expectedFlags int64, expectedBytes uint64) error {
@@ -86,20 +89,21 @@
if err := checkFilesystemVolume("/vol/default", 0, 1*1024*1024); err != nil {
return err
}
- if err := checkFilesystemVolume("/vol/local-strict", unix.ST_NOSUID|unix.ST_NODEV|unix.ST_NOEXEC, 5*1024*1024); err != nil {
- return err
- }
if err := checkFilesystemVolume("/vol/readonly", unix.ST_RDONLY, 1*1024*1024); err != nil {
return err
}
- if err := checkBlockVolume("/vol/block", 1*1024*1024); err != nil {
- return err
+ // Block volumes are not supported on gVisor.
+ if *runtimeClass != "gvisor" {
+ if err := checkBlockVolume("/vol/block", 1*1024*1024); err != nil {
+ return err
+ }
}
return nil
}
func main() {
- fmt.Println("PersistentVolume tests starting...")
+ flag.Parse()
+ fmt.Printf("PersistentVolume tests starting on %s...\n", *runtimeClass)
if err := testPersistentVolume(); err != nil {
fmt.Println(err.Error())