kind: 0.11.1 -> 0.14.0

- https://github.com/kubernetes-sigs/kind/releases/tag/v0.12.0
- https://github.com/kubernetes-sigs/kind/releases/tag/v0.13.0
- https://github.com/kubernetes-sigs/kind/releases/tag/v0.14.0

Changes:
- update/fix nixos specific kernel module path patch
- change build options to match upstream
- pin major go version to match upstream

+22 -18
+7 -3
pkgs/development/tools/kind/default.nix
··· 4 4 5 5 buildGoModule rec { 6 6 pname = "kind"; 7 - version = "0.11.1"; 7 + version = "0.14.0"; 8 8 9 9 src = fetchFromGitHub { 10 10 rev = "v${version}"; 11 11 owner = "kubernetes-sigs"; 12 12 repo = "kind"; 13 - sha256 = "sha256-pjg52ONseKNw06EOBzD6Elge+Cz+C3llPvjJPHkn1cw="; 13 + sha256 = "sha256-yCzznSVWuVEkaoj9bo0WOp3Dvl3t1UJ/DwtXv5dp+dQ="; 14 14 }; 15 15 16 16 patches = [ ··· 18 18 ./kernel-module-path.patch 19 19 ]; 20 20 21 - vendorSha256 = "sha256-HiVdekSZrC/RkMSvcwm1mv6AE4bA5kayUsMdVCbckiE="; 21 + vendorSha256 = "sha256-/UDmTyngydoso9F/iPp5JYlsfi0VNfHfTsxdGDaTK+w="; 22 + 23 + CGO_ENABLED = 0; 24 + GOFLAGS = [ "-trimpath" ]; 25 + ldFlags = [ "-buildid=" "-w" ]; 22 26 23 27 doCheck = false; 24 28
+14 -14
pkgs/development/tools/kind/kernel-module-path.patch
··· 1 1 diff --git a/pkg/cluster/internal/providers/common/getmodules.go b/pkg/cluster/internal/providers/common/getmodules.go 2 2 new file mode 100644 3 - index 00000000..f42a883d 3 + index 00000000..1cce5675 4 4 --- /dev/null 5 5 +++ b/pkg/cluster/internal/providers/common/getmodules.go 6 6 @@ -0,0 +1,15 @@ ··· 9 9 +import "os" 10 10 + 11 11 +const ( 12 - + fhsKernalModulePath = "/lib/modules" 13 - + nixKernalModulePath = "/run/booted-system/kernel-modules/lib" 12 + + fhsKernelModulePath = "/lib/modules" 13 + + nixKernelModulePath = "/run/booted-system/kernel-modules/lib/modules" 14 14 +) 15 15 + 16 16 +func GetKernelModulePath() string { 17 - + if _, err := os.Stat(nixKernalModulePath); !os.IsNotExist(err) { 18 - + return nixKernalModulePath 17 + + if _, err := os.Stat(nixKernelModulePath); !os.IsNotExist(err) { 18 + + return nixKernelModulePath 19 19 + } 20 - + return fhsKernalModulePath 20 + + return fhsKernelModulePath 21 21 +} 22 22 diff --git a/pkg/cluster/internal/providers/docker/provision.go b/pkg/cluster/internal/providers/docker/provision.go 23 - index 50161861..86d5b7b6 100644 23 + index 97b05594..3aaa9830 100644 24 24 --- a/pkg/cluster/internal/providers/docker/provision.go 25 25 +++ b/pkg/cluster/internal/providers/docker/provision.go 26 - @@ -242,7 +242,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n 26 + @@ -225,7 +225,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n 27 27 // (please don't depend on doing this though!) 28 28 "--volume", "/var", 29 29 // some k8s things want to read /lib/modules 30 30 - "--volume", "/lib/modules:/lib/modules:ro", 31 31 + "--volume", fmt.Sprintf("%s:/lib/modules:ro", common.GetKernelModulePath()), 32 + // propagate KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER to the entrypoint script 33 + "-e", "KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER", 32 34 }, 33 - args..., 34 - ) 35 35 diff --git a/pkg/cluster/internal/providers/podman/provision.go b/pkg/cluster/internal/providers/podman/provision.go 36 - index 51dce486..3bc36b42 100644 36 + index 50aa7018..7e25a4de 100644 37 37 --- a/pkg/cluster/internal/providers/podman/provision.go 38 38 +++ b/pkg/cluster/internal/providers/podman/provision.go 39 - @@ -205,7 +205,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n 39 + @@ -189,7 +189,7 @@ func runArgsForNode(node *config.Node, clusterIPFamily config.ClusterIPFamily, n 40 40 // dev: devices on the volume will be able to be used by processes within the container 41 41 "--volume", fmt.Sprintf("%s:/var:suid,exec,dev", varVolume), 42 42 // some k8s things want to read /lib/modules 43 43 - "--volume", "/lib/modules:/lib/modules:ro", 44 44 + "--volume", fmt.Sprintf("%s:/lib/modules:ro", common.GetKernelModulePath()), 45 + // propagate KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER to the entrypoint script 46 + "-e", "KIND_EXPERIMENTAL_CONTAINERD_SNAPSHOTTER", 45 47 }, 46 - args..., 47 - )
+1 -1
pkgs/top-level/all-packages.nix
··· 15730 15730 15731 15731 kcov = callPackage ../development/tools/analysis/kcov { }; 15732 15732 15733 - kind = callPackage ../development/tools/kind { }; 15733 + kind = callPackage ../development/tools/kind { buildGoModule = buildGo118Module; }; 15734 15734 15735 15735 khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { }; 15736 15736