diff --git a/.kres.yaml b/.kres.yaml index edf58cc6..0b44cd39 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -78,7 +78,7 @@ spec: - name: EXTENSIONS_IMAGE_REF defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG) - name: PKGS - defaultValue: v1.7.0-alpha.0-17-gefbbd23 + defaultValue: v1.7.0-alpha.0-18-g064fd58 - name: PKGS_PREFIX defaultValue: ghcr.io/siderolabs depends: diff --git a/Makefile b/Makefile index 231521bf..3a242872 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-01-26T09:29:52Z by kres latest. +# Generated on 2024-01-31T13:04:12Z by kres latest. # common variables @@ -85,7 +85,7 @@ NONFREE_TARGETS = nonfree-kmod-nvidia # extra variables EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG) -PKGS ?= v1.7.0-alpha.0-17-gefbbd23 +PKGS ?= v1.7.0-alpha.0-18-g064fd58 PKGS_PREFIX ?= ghcr.io/siderolabs # help menu diff --git a/README.md b/README.md index 74651682..13fc1d05 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ cosign verify --certificate-identity-regexp '@siderolabs\.com$' --certificate-oi | Name | Image | Description | Version Format | | ----------------------------------- | ------------------------------------------------------------------------------------------- | ----------------------------------------------- | ---------------------------------- | -| [gvisor](container-runtime/gvisor/) | [ghcr.io/siderolabs/gvisor](https://github.com/siderolabs/extensions/pkgs/container/gvisor) | [gVisor](https://gvisor.dev/) container runtime | `upstream version`-`talos version` | -| [stargz-snapshotter](container-runtime/stargz-snapshotter/) | [ghcr.io/siderolabs/stargz-snapshotter](https://github.com/siderolabs/extensions/pkgs/container/stargz-snapshotter) | [Stargz Snapshotter](https://github.com/containerd/stargz-snapshotter) container runtime | `upstream version`-`talos version` | +| [gvisor](container-runtime/gvisor/) | [ghcr.io/siderolabs/gvisor](https://github.com/siderolabs/extensions/pkgs/container/gvisor) | [gVisor](https://gvisor.dev/) container runtime | `upstream version` | +| [stargz-snapshotter](container-runtime/stargz-snapshotter/) | [ghcr.io/siderolabs/stargz-snapshotter](https://github.com/siderolabs/extensions/pkgs/container/stargz-snapshotter) | [Stargz Snapshotter](https://github.com/containerd/stargz-snapshotter) container runtime | `upstream version` | | [ecr-credential-provider](container-runtime/ecr-credential-provider) | [ghcr.io/siderolabs/ecr-credential-provider](https://github.com/siderolabs/extensions/pkgs/container/ecr-credential-provider) | [ECR Credential Provider](https://github.com/kubernetes/cloud-provider-aws/tree/master/cmd/ecr-credential-provider) kubelet plugin | `upstream version` | ### Firmware @@ -87,7 +87,7 @@ cosign verify --certificate-identity-regexp '@siderolabs\.com$' --certificate-oi | Name | Image | Description | Version Format | | ----------------------------------- | ----------------------------------------------------------------------------------------------------- | ------------------- | ---------------------------------- | | [iscsi-tools](storage/iscsi-tools/) | [ghcr.io/siderolabs/iscsi-tools](https://github.com/siderolabs/extensions/pkgs/container/iscsi-tools) | Open iSCSI tools | `v0.1.0` | -| [mdadm](storage/mdadm/) | [ghcr.io/siderolabs/mdadm](https://github.com/siderolabs/extensions/pkgs/container/mdadm) | manage MD devices tool | `upstream version`-`talos version` | +| [mdadm](storage/mdadm/) | [ghcr.io/siderolabs/mdadm](https://github.com/siderolabs/extensions/pkgs/container/mdadm) | manage MD devices tool | `upstream version` | | [drbd](storage/drbd/) | [ghcr.io/siderolabs/drbd](https://github.com/siderolabs/extensions/pkgs/container/drbd) | DRBD driver module | `upstream version`-`talos version` | | [zfs](storage/zfs/) | [ghcr.io/siderolabs/zfs](https://github.com/siderolabs/extensions/pkgs/container/zfs) | ZFS driver module | `upstream version`-`talos version` | | [btrfs](storage/btrfs/) | [ghcr.io/siderolabs/btrfs](https://github.com/siderolabs/extensions/pkgs/container/btrfs) | BTRFS driver module | `talos version` | @@ -96,7 +96,7 @@ cosign verify --certificate-identity-regexp '@siderolabs\.com$' --certificate-oi | Name | Image | Description | Version Format | | ------------------------------- | --------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------- | ---------------------------------- | -| [nut-client](power/nut-client/) | [ghcr.io/siderolabs/nut-client](https://github.com/siderolabs/talos-extensions/pkgs/container/nut-client) | [Network UPS Tools](https://networkupstools.org) upsmon client | `upstream version`-`talos version` | +| [nut-client](power/nut-client/) | [ghcr.io/siderolabs/nut-client](https://github.com/siderolabs/talos-extensions/pkgs/container/nut-client) | [Network UPS Tools](https://networkupstools.org) upsmon client | `upstream version` | ### Guest Agents @@ -115,9 +115,9 @@ cosign verify --certificate-identity-regexp '@siderolabs\.com$' --certificate-oi #### Tools -| Name | Description | Version Format | -| ------------------------------------- | ---------------------------------- | --------------- | -| [util-linux-tools](tools/util-linux/) | Util Linux tools (only fstrim now) | `talos version` | +| Name | Description | Version Format | +| ------------------------------------- | ---------------------------------- | ------------------ | +| [util-linux-tools](tools/util-linux/) | Util Linux tools (only fstrim now) | `upstream version` | ## Building Extensions diff --git a/container-runtime/gvisor/vars.yaml b/container-runtime/gvisor/vars.yaml index 9eaecb49..5580dcd7 100644 --- a/container-runtime/gvisor/vars.yaml +++ b/container-runtime/gvisor/vars.yaml @@ -1 +1 @@ -VERSION: "{{ .GVISOR_VERSION }}-{{ .BUILD_ARG_TAG }}" +VERSION: "{{ .GVISOR_VERSION }}" diff --git a/container-runtime/stargz-snapshotter/vars.yaml b/container-runtime/stargz-snapshotter/vars.yaml index 02d77e9f..351e8e75 100644 --- a/container-runtime/stargz-snapshotter/vars.yaml +++ b/container-runtime/stargz-snapshotter/vars.yaml @@ -1 +1 @@ -VERSION: "{{ .STARGZ_SNAPSHOTTER_VERSION }}-{{ .BUILD_ARG_TAG }}" +VERSION: "{{ .STARGZ_SNAPSHOTTER_VERSION }}" diff --git a/examples/hello-world-service/vars.yaml b/examples/hello-world-service/vars.yaml index f380ba71..bc8ad19b 100644 --- a/examples/hello-world-service/vars.yaml +++ b/examples/hello-world-service/vars.yaml @@ -1 +1 @@ -VERSION: "{{ .BUILD_ARG_TAG }}" +VERSION: "v1.0.0" diff --git a/power/nut-client/vars.yaml b/power/nut-client/vars.yaml index b07f68b7..bd3e21de 100644 --- a/power/nut-client/vars.yaml +++ b/power/nut-client/vars.yaml @@ -1 +1 @@ -VERSION: "{{ .NUT_VERSION }}-{{ .BUILD_ARG_TAG }}" +VERSION: "{{ .NUT_VERSION }}" diff --git a/storage/fuse3/vars.yaml b/storage/fuse3/vars.yaml index 6e991bfc..7aec66ef 100644 --- a/storage/fuse3/vars.yaml +++ b/storage/fuse3/vars.yaml @@ -1 +1 @@ -VERSION: "{{ .FUSE3_VERSION }}-{{ .BUILD_ARG_TAG }}" +VERSION: "{{ .FUSE3_VERSION }}" diff --git a/storage/mdadm/vars.yaml b/storage/mdadm/vars.yaml index 0f9a5865..d78d1eea 100644 --- a/storage/mdadm/vars.yaml +++ b/storage/mdadm/vars.yaml @@ -1 +1 @@ -VERSION: "v{{ .MDADM_VERSION }}-{{ .BUILD_ARG_TAG }}" +VERSION: "v{{ .MDADM_VERSION }}" diff --git a/tools/util-linux/vars.yaml b/tools/util-linux/vars.yaml index f380ba71..a9c16b3a 100644 --- a/tools/util-linux/vars.yaml +++ b/tools/util-linux/vars.yaml @@ -1 +1 @@ -VERSION: "{{ .BUILD_ARG_TAG }}" +VERSION: "{{ .UTIL_LINUX_VERSION }}"