chore: pull in latest pkgs

ZFS is now 2.2.2 in `main`. Signed-off-by: Andrey Smirnov <[email protected]>
siderolabs · Dec 7, 2023 · 622ec82 · 622ec82
1 parent 8378499
commit 622ec82
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 63 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.7.0-alpha.0
     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:02:30Z 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.7.0-alpha.0
 
 # 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.2.2 # 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
@@ -6,74 +6,20 @@ github_repo = "siderolabs/extensions"
 match_deps = "^github.com/((talos-systems|siderolabs)/[a-zA-Z0-9-]+)$"
 
 # previous release
-previous = "v1.5.0"
+previous = "v1.6.0-beta.0"
 
 pre_release = true
 
 preface = """\
-See [Talos Linux documentation](https://www.talos.dev/v1.6/talos-guides/configuration/system-extensions/) for information on using system extensions.
+See [Talos Linux documentation](https://www.talos.dev/v1.7/talos-guides/configuration/system-extensions/) for information on using system extensions.
 """
 
 [notes]
-    [notes.util-linux-tools]
-        title = "Util Linux Tools"
-        description = """\
-Util Linux Tools is now shipped as a system extension. Includes fstrim only.
-"""
-
-    [notes.intel-ice-firmware]
-        title = "Intel ICE firmware"
-        description = """\
-Intel ice firmware (E810) is now shipped as a system extension.
-"""
-
-    [notes.amdgpu-firmware]
-        title = "AMD GPU firmware"
-        description = """\
-AMD GPU firmware is now shipped as a system extension.
-"""
-
-    [notes.btrfs]
-        title = "BTRFS"
-        description = """\
-BTRFS drivers is now supported as Talos System Extension.
-"""
-
-    [notes.binfmt_misc]
-        title = "binfmt_misc"
-        description = """\
-`binfmt_misc` Linux module extension is now supported as Talos System Extension.
-"""
-
-    [notes.zfs]
-        title = "ZFS"
-        description = """\
-ZFS extensions now also ship zfs-tools and an extension service that imports all zpools on startup.
-"""
-
-    [notes.stargz]
-        title = "stargz-snapshotter"
-        description = """\
-stargz-snapshotter extension is now supported as Talos System Extension.
-"""
-
-    [notes.mdadm]
-        title = "mdadm"
-        description = """\
-mdadm extension is now supported as Talos System Extension.
-"""
 
     [notes.updates]
         title = "Component Updates"
         description = """\
-* DRBD: 9.2.6
-* QEMU agent: v8.1.3
-* Tailscale: 1.54.0
-* Xen Guest Utilities: 8.3.1
-* Linux Firmware: 20231111
-* gasket driver: 09385d4
-* Intel ucode: 20231114
-* NVIDIA: 535.129.03
+* ZFS: 2.2.2
 """
 
 

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: 76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9
+        sha512: bba252cbf7986f2cce154dd18a34aa478cf98f70106337188dc894de2446d60a58fa643706927757d1787506b44d4ff404897a2d0e16aacb0a7bf27765703332
     env:
       ARCH: {{ if eq .ARCH "aarch64"}}arm64{{ else if eq .ARCH "x86_64" }}x86_64{{ else }}unsupported{{ end }}
     prepare: