feat: allow disabling mount of SOCI directory (#2588)

Some instance types have instance stores that can be slower than EBS.
Add an option to disable the mount of the SOCI directory if desired.

Author: fletcherw

nodeadm/Makefile

@@ -138,4 +138,4 @@ update-deps:
 	go get $(shell go list -f '{{if not (or .Main .Indirect)}}{{.Path}}{{end}}' -mod=mod -m all) && go mod tidy && go mod vendor
 
 generate-instance-info:
-	go run ./tools/instance-info/main.go > internal/kubelet/instance-info.jsonl
+	go run ./tools/instance-info/main.go > internal/kubelet/instance-info.jsonl

nodeadm/api/v1alpha1/nodeconfig_types.go

@@ -145,12 +145,14 @@ const (
 //
 // * `Containerd` refers to `/var/lib/containerd`
 // * `PodLogs` refers to `/var/log/pods`
-// +kubebuilder:validation:Enum={Containerd, PodLogs}
+// * `SOCI` refers to `/var/lib/soci-snapshotter-grpc`
+// +kubebuilder:validation:Enum={Containerd, PodLogs, SOCI}
 type DisabledMount string
 
 const (
 	DisabledMountContainerd DisabledMount = "Containerd"
 	DisabledMountPodLogs    DisabledMount = "PodLogs"
+	DisabledMountSOCI       DisabledMount = "SOCI"
 )
 
 // Feature specifies which feature gate should be toggled

nodeadm/crds/node.eks.aws_nodeconfigs.yaml

@@ -122,9 +122,11 @@ spec:
 
                             * `Containerd` refers to `/var/lib/containerd`
                             * `PodLogs` refers to `/var/log/pods`
+                            * `SOCI` refers to `/var/lib/soci-snapshotter-grpc`
                           enum:
                           - Containerd
                           - PodLogs
+                          - SOCI
                           type: string
                         type: array
                       mountPath:

nodeadm/doc/api.md

@@ -45,12 +45,13 @@ DisabledMount specifies a directory that should not be mounted onto local storag
 
 * `Containerd` refers to `/var/lib/containerd`
 * `PodLogs` refers to `/var/log/pods`
+* `SOCI` refers to `/var/lib/soci-snapshotter-grpc`
 
 _Appears in:_
 - [LocalStorageOptions](#localstorageoptions)
 
 .Validation:
-- Enum: [Containerd PodLogs]
+- Enum: [Containerd PodLogs SOCI]
 
 #### EnvironmentOptions
 

nodeadm/internal/api/types.go

@@ -131,6 +131,7 @@ type DisabledMount string
 const (
 	DisabledMountContainerd DisabledMount = "Containerd"
 	DisabledMountPodLogs    DisabledMount = "PodLogs"
+	DisabledMountSOCI       DisabledMount = "SOCI"
 )
 
 type Feature string

nodeadm/internal/system/local_disk.go

@@ -37,6 +37,8 @@ func (a *localDiskAspect) Setup(cfg *api.NodeConfig) error {
 			args = append(args, "--no-bind-pods-logs")
 		case api.DisabledMountContainerd:
 			args = append(args, "--no-bind-containerd")
+		case api.DisabledMountSOCI:
+			args = append(args, "--no-bind-soci")
 		}
 	}