diff options
Diffstat (limited to 'pkgs/development/tools/kind/kernel-module-path.patch')
| -rw-r--r-- | pkgs/development/tools/kind/kernel-module-path.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/tools/kind/kernel-module-path.patch b/pkgs/development/tools/kind/kernel-module-path.patch index 833cd3388ec..bb4c7bd0eaa 100644 --- a/pkgs/development/tools/kind/kernel-module-path.patch +++ b/pkgs/development/tools/kind/kernel-module-path.patch @@ -1,6 +1,6 @@ diff --git a/pkg/cluster/internal/providers/common/getmodules.go b/pkg/cluster/internal/providers/common/getmodules.go new file mode 100644 -index 00000000..f42a883d +index 00000000..1cce5675 --- /dev/null +++ b/pkg/cluster/internal/providers/common/getmodules.go @@ -0,0 +1,15 @@ @@ -9,39 +9,39 @@ index 00000000..f42a883d +import "os" + +const ( -+ fhsKernalModulePath = "/lib/modules" -+ nixKernalModulePath = "/run/booted-system/kernel-modules/lib" ++ fhsKernelModulePath = "/lib/modules" ++ nixKernelModulePath = "/run/booted-system/kernel-modules/lib/modules" +) + +func GetKernelModulePath() string { -+ if _, err := os.Stat(nixKernalModulePath); !os.IsNotExist(err) { -+ return nixKernalModulePath ++ if _, err := os.Stat(nixKernelModulePath); !os.IsNotExist(err) { ++ return nixKernelModulePath + } -+ return fhsKernalModulePath ++ return fhsKernelModulePath +} diff --git a/pkg/cluster/internal/providers/docker/provision.go b/pkg/cluster/internal/providers/docker/provision.go -index 50161861..86d5b7b6 100644 +index 97b05594..3aaa9830 100644 --- a/pkg/cluster/internal/providers/docker/provision.go +++ b/pkg/cluster/internal/providers/docker/provision.go -@@ -242,7 +242,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n +@@ -225,7 +225,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n // (please don't depend on doing this though!) "--volume", "/var", // some k8s things want to read /lib/modules - "--volume", "/lib/modules:/lib/modules:ro", + "--volume", fmt.Sprintf("%s:/lib/modules:ro", common.GetKernelModulePath()), + // propagate KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER to the entrypoint script + "-e", "KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER", }, - args..., - ) diff --git a/pkg/cluster/internal/providers/podman/provision.go b/pkg/cluster/internal/providers/podman/provision.go -index 51dce486..3bc36b42 100644 +index 50aa7018..7e25a4de 100644 --- a/pkg/cluster/internal/providers/podman/provision.go +++ b/pkg/cluster/internal/providers/podman/provision.go -@@ -205,7 +205,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n +@@ -189,7 +189,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n // dev: devices on the volume will be able to be used by processes within the container "--volume", fmt.Sprintf("%s:/var:suid,exec,dev", varVolume), // some k8s things want to read /lib/modules - "--volume", "/lib/modules:/lib/modules:ro", + "--volume", fmt.Sprintf("%s:/lib/modules:ro", common.GetKernelModulePath()), + // propagate KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER to the entrypoint script + "-e", "KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER", }, - args..., - ) |