Skip to content

Commit 92ba04a

Browse files
authored
Merge branch 'main' into feature/add-kubevirt-metrics-and-dashboard
2 parents dd87935 + 8193d78 commit 92ba04a

45 files changed

Lines changed: 2006 additions & 883 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎hack/e2e.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ machine:
113113
- usermode_helper=disabled
114114
- name: zfs
115115
- name: spl
116-
install:
117-
image: ghcr.io/aenix-io/cozystack/talos:v1.8.4
118116
files:
119117
- content: |
120118
[plugins]

‎packages/core/builder/templates/sandbox.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
automountServiceAccountToken: false
2727
terminationGracePeriodSeconds: 1
2828
containers:
29-
- name: imagere
29+
- name: imager
3030
image: "{{ .Values.talos.imager.image }}"
3131
securityContext:
3232
privileged: true

‎packages/core/builder/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
talos:
22
imager:
3-
image: ghcr.io/siderolabs/imager:v1.8.4
3+
image: ghcr.io/kvaps/talos/imager:v1.9.1-1-gac655f2d3-dirty

‎packages/core/installer/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ diff:
1919

2020
update:
2121
hack/gen-profiles.sh
22-
IMAGE=$$(awk '/^version:/ {print $$2}' images/talos/profiles/installer.yaml) \
23-
yq -i '.talos.imager.image = "ghcr.io/siderolabs/imager:" + strenv(IMAGE)' ../builder/values.yaml
22+
IMAGE=$$(yq '.input.baseInstaller.imageRef | sub("/installer:", "/imager:")' images/talos/profiles/installer.yaml) \
23+
yq -i '.talos.imager.image = strenv(IMAGE)' ../builder/values.yaml
2424

2525
image: pre-checks image-cozystack image-talos image-matchbox
2626

‎packages/core/installer/images/talos/profiles/initramfs.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
arch: amd64
44
platform: metal
55
secureboot: false
6-
version: v1.8.4
6+
version: v1.9.1
77
input:
88
kernel:
99
path: /usr/install/amd64/vmlinuz
1010
initramfs:
1111
path: /usr/install/amd64/initramfs.xz
1212
baseInstaller:
13-
imageRef: ghcr.io/siderolabs/installer:v1.8.4
13+
imageRef: ghcr.io/kvaps/talos/installer:v1.9.1-1-gac655f2d3-dirty
1414
systemExtensions:
1515
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210
1616
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,8 +19,8 @@ input:
1919
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
2020
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112
2121
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
22-
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4
23-
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4
22+
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
23+
- imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
2424
output:
2525
kind: initramfs
2626
imageOptions: {}

‎packages/core/installer/images/talos/profiles/installer.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
arch: amd64
44
platform: metal
55
secureboot: false
6-
version: v1.8.4
6+
version: v1.9.1
77
input:
88
kernel:
99
path: /usr/install/amd64/vmlinuz
1010
initramfs:
1111
path: /usr/install/amd64/initramfs.xz
1212
baseInstaller:
13-
imageRef: ghcr.io/siderolabs/installer:v1.8.4
13+
imageRef: ghcr.io/kvaps/talos/installer:v1.9.1-1-gac655f2d3-dirty
1414
systemExtensions:
1515
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210
1616
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,8 +19,8 @@ input:
1919
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
2020
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112
2121
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
22-
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4
23-
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4
22+
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
23+
- imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
2424
output:
2525
kind: installer
2626
imageOptions: {}

‎packages/core/installer/images/talos/profiles/iso.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
arch: amd64
44
platform: metal
55
secureboot: false
6-
version: v1.8.4
6+
version: v1.9.1
77
input:
88
kernel:
99
path: /usr/install/amd64/vmlinuz
1010
initramfs:
1111
path: /usr/install/amd64/initramfs.xz
1212
baseInstaller:
13-
imageRef: ghcr.io/siderolabs/installer:v1.8.4
13+
imageRef: ghcr.io/kvaps/talos/installer:v1.9.1-1-gac655f2d3-dirty
1414
systemExtensions:
1515
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210
1616
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,8 +19,8 @@ input:
1919
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
2020
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112
2121
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
22-
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4
23-
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4
22+
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
23+
- imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
2424
output:
2525
kind: iso
2626
imageOptions: {}

‎packages/core/installer/images/talos/profiles/kernel.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
arch: amd64
44
platform: metal
55
secureboot: false
6-
version: v1.8.4
6+
version: v1.9.1
77
input:
88
kernel:
99
path: /usr/install/amd64/vmlinuz
1010
initramfs:
1111
path: /usr/install/amd64/initramfs.xz
1212
baseInstaller:
13-
imageRef: ghcr.io/siderolabs/installer:v1.8.4
13+
imageRef: ghcr.io/kvaps/talos/installer:v1.9.1-1-gac655f2d3-dirty
1414
systemExtensions:
1515
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210
1616
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,8 +19,8 @@ input:
1919
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
2020
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112
2121
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
22-
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4
23-
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4
22+
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
23+
- imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
2424
output:
2525
kind: kernel
2626
imageOptions: {}

‎packages/core/installer/images/talos/profiles/metal.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
arch: amd64
44
platform: metal
55
secureboot: false
6-
version: v1.8.4
6+
version: v1.9.1
77
input:
88
kernel:
99
path: /usr/install/amd64/vmlinuz
1010
initramfs:
1111
path: /usr/install/amd64/initramfs.xz
1212
baseInstaller:
13-
imageRef: ghcr.io/siderolabs/installer:v1.8.4
13+
imageRef: ghcr.io/kvaps/talos/installer:v1.9.1-1-gac655f2d3-dirty
1414
systemExtensions:
1515
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210
1616
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,8 +19,8 @@ input:
1919
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
2020
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112
2121
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
22-
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4
23-
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4
22+
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
23+
- imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
2424
output:
2525
kind: image
2626
imageOptions: { diskSize: 1306525696, diskFormat: raw }

‎packages/core/installer/images/talos/profiles/nocloud.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
arch: amd64
44
platform: nocloud
55
secureboot: false
6-
version: v1.8.4
6+
version: v1.9.1
77
input:
88
kernel:
99
path: /usr/install/amd64/vmlinuz
1010
initramfs:
1111
path: /usr/install/amd64/initramfs.xz
1212
baseInstaller:
13-
imageRef: ghcr.io/siderolabs/installer:v1.8.4
13+
imageRef: ghcr.io/kvaps/talos/installer:v1.9.1-1-gac655f2d3-dirty
1414
systemExtensions:
1515
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210
1616
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,8 +19,8 @@ input:
1919
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
2020
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112
2121
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
22-
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4
23-
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4
22+
- imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
23+
- imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
2424
output:
2525
kind: image
2626
imageOptions: { diskSize: 1306525696, diskFormat: raw }

0 commit comments

Comments
 (0)