chore: pull in latest pkgs

Updates zfs to 2.1.14. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
siderolabs · Dec 7, 2023 · c12741e · c12741e
1 parent 5ee719f
commit c12741e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.kres.yaml b/.kres.yaml
@@ -68,7 +68,7 @@ spec:
       - name: EXTENSIONS_IMAGE_REF
         defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
       - name: PKGS
-        defaultValue: v1.6.0
+        defaultValue: v1.6.0-3-g617d342
     depends:
       - internal/extensions/image-digests
     script:

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2023-12-01T10:26:12Z by kres latest.
+# Generated on 2023-12-07T13:05:39Z by kres latest.
 
 # common variables
 
@@ -84,7 +84,7 @@ NONFREE_TARGETS = nonfree-kmod-nvidia
 # extra variables
 
 EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
-PKGS ?= v1.6.0
+PKGS ?= v1.6.0-3-g617d342
 
 # help menu
 

diff --git a/Pkgfile b/Pkgfile
@@ -6,7 +6,7 @@ vars:
   PKGS_PREFIX: ghcr.io/siderolabs
   LINUX_FIRMWARE_VERSION: "20231111" # update this when updating PKGS_VERSION in Makefile
   DRBD_DRIVER_VERSION: 9.2.6 # update this when updating PKGS_VERSION in Makefile
-  ZFS_DRIVER_VERSION: 2.1.13 # update this when updating PKGS_VERSION in Makefile
+  ZFS_DRIVER_VERSION: 2.1.14 # update this when updating PKGS_VERSION in Makefile
   UTIL_LINUX_VERSION: 2.39.2 # update this when updating PKGS_VERSION in Makefile
 
   # renovate: datasource=git-tags extractVersion=^libtiprc-(?<version>.*)$ depName=git://linux-nfs.org/~steved/libtirpc

diff --git a/hack/release.toml b/hack/release.toml
@@ -74,6 +74,7 @@ mdadm extension is now supported as Talos System Extension.
 * gasket driver: 09385d4
 * Intel ucode: 20231114
 * NVIDIA: 535.129.03
+* ZFS: 2.1.14
 """
 
 

diff --git a/storage/zfs/zfs-tools/pkg.yaml b/storage/zfs/zfs-tools/pkg.yaml
@@ -11,8 +11,8 @@ steps:
   - sources:
       - url: https://github.com/openzfs/zfs/releases/download/zfs-{{ .ZFS_DRIVER_VERSION }}/zfs-{{ .ZFS_DRIVER_VERSION }}.tar.gz
         destination: zfs.tar.gz
-        sha256: 06b24cbb3cbc1554e2edf2fcd71d1f8bec4febf4412aeac17070877c44302abd
-        sha512: d06fce8faa22b0cab2c69befa3842476703433fa90530d1fdf168716afd2039e97b124aa8ef581bed3bc19604fa2faa0bc1e29f6d028e3ef0085f0e34e05230a
+        sha256: 509fed100e73477621bfb56c58346a3306727dbb6f7e017ba714101babb6ea3f
+        sha512: 4a65c8b7d5576fa2dcc14e7ccaa93191c1d3791479cf89bd02c2bd04434ff5e93709b328796d4f9ba93da19f12772e359df373f40919350a3e1e4c52758b47c8
     env:
       ARCH: {{ if eq .ARCH "aarch64"}}arm64{{ else if eq .ARCH "x86_64" }}x86_64{{ else }}unsupported{{ end }}
     prepare: