Skip to content

Commit

Permalink
chore: adjust extension versions (tags) to drop Talos version
Browse files Browse the repository at this point in the history
Drop Talos version when the extension doesn't have a hard dependency
(i.e. doesn't import kernel modules).

Fixes #288

```diff
9c9
< ghcr.io/siderolabs/fuse3:3.16.1-v1.6.0-alpha.2-15-g66a1265
---
> ghcr.io/siderolabs/fuse3:3.16.1
11,12c11,12
< ghcr.io/siderolabs/gvisor:20240109.0-v1.6.0-alpha.2-15-g66a1265
< ghcr.io/siderolabs/hello-world-service:v1.6.0-alpha.2-15-g66a1265
---
> ghcr.io/siderolabs/gvisor:20240109.0
> ghcr.io/siderolabs/hello-world-service:v1.0.0
17,18c17,18
< ghcr.io/siderolabs/mdadm:v4.2-v1.6.0-alpha.2-15-g66a1265
< ghcr.io/siderolabs/nut-client:2.8.1-v1.6.0-alpha.2-15-g66a1265
---
> ghcr.io/siderolabs/mdadm:v4.2
> ghcr.io/siderolabs/nut-client:2.8.1
24c24
< ghcr.io/siderolabs/stargz-snapshotter:v0.15.1-v1.6.0-alpha.2-15-g66a1265
---
> ghcr.io/siderolabs/stargz-snapshotter:v0.15.1
28c28
< ghcr.io/siderolabs/util-linux-tools:v1.6.0-alpha.2-15-g66a1265
---
> ghcr.io/siderolabs/util-linux-tools:2.39.3
```

Signed-off-by: Andrey Smirnov <[email protected]>
  • Loading branch information
smira committed Jan 31, 2024
1 parent 66a1265 commit 4a93d56
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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` |
Expand All @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion container-runtime/gvisor/vars.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION: "{{ .GVISOR_VERSION }}-{{ .BUILD_ARG_TAG }}"
VERSION: "{{ .GVISOR_VERSION }}"
2 changes: 1 addition & 1 deletion container-runtime/stargz-snapshotter/vars.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION: "{{ .STARGZ_SNAPSHOTTER_VERSION }}-{{ .BUILD_ARG_TAG }}"
VERSION: "{{ .STARGZ_SNAPSHOTTER_VERSION }}"
2 changes: 1 addition & 1 deletion examples/hello-world-service/vars.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION: "{{ .BUILD_ARG_TAG }}"
VERSION: "v1.0.0"
2 changes: 1 addition & 1 deletion power/nut-client/vars.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION: "{{ .NUT_VERSION }}-{{ .BUILD_ARG_TAG }}"
VERSION: "{{ .NUT_VERSION }}"
2 changes: 1 addition & 1 deletion storage/fuse3/vars.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION: "{{ .FUSE3_VERSION }}-{{ .BUILD_ARG_TAG }}"
VERSION: "{{ .FUSE3_VERSION }}"
2 changes: 1 addition & 1 deletion storage/mdadm/vars.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION: "v{{ .MDADM_VERSION }}-{{ .BUILD_ARG_TAG }}"
VERSION: "v{{ .MDADM_VERSION }}"
2 changes: 1 addition & 1 deletion tools/util-linux/vars.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION: "{{ .BUILD_ARG_TAG }}"
VERSION: "{{ .UTIL_LINUX_VERSION }}"

0 comments on commit 4a93d56

Please sign in to comment.