Talos: remove deprecated System Extentions and move to schematicID (#1309)

* Talos: remove deprecated System Extentions and move to schematicID for talhelper and SUC

* Fix typo in comments
This commit is contained in:
Wouter Bouvy authored and GitHub committed 2024-02-10 17:02:32 -05:00
1 parent 31323b4036
commit 4a65ddeff9
7 files changed
+10 -36

No files matched your search

+1 -10
View File
@@ -4,16 +4,7 @@ skip_tests: true
distribution: distribution:
type: talos type: talos
talos: talos:
schematics: schematicID: "df491c50a5acc05b977ef00c32050e1ceb0df746e40b33c643ac8a9bfb7c7263"
enabled: true
id: df491c50a5acc05b977ef00c32050e1ceb0df746e40b33c643ac8a9bfb7c7263
customization: |-
extraKernelArgs:
- net.ifnames=0
systemExtensions:
officialExtensions:
- siderolabs/intel-ucode
- siderolabs/i915-ucode
timezone: Etc/UTC timezone: Etc/UTC
+1 -1
View File
@@ -283,7 +283,7 @@ You have two different options for setting up your local workstation.
#### Talos #### Talos
1. Create Talos Secrets 1. Create Talos Secrets and configuration
```sh ```sh
task talos:gensecret task talos:gensecret
@@ -9,6 +9,6 @@ resources:
{% if distribution.type in ["k3s"] %} {% if distribution.type in ["k3s"] %}
- ./k3s/ks.yaml - ./k3s/ks.yaml
{% endif %} {% endif %}
{% if distribution.type in ["talos"] and nodes.talos.schematics.enabled %} {% if distribution.type in ["talos"] and distribution.talos.schematicID %}
- ./talos/ks.yaml - ./talos/ks.yaml
{% endif %} {% endif %}
@@ -2,6 +2,5 @@ main = lambda data: (
data.get("distribution", {}).get("type", "k3s") in ["talos"] and data.get("distribution", {}).get("type", "k3s") in ["talos"] and
data.get("distribution", {}) data.get("distribution", {})
.get("talos", {}) .get("talos", {})
.get("schematics", {}) .get("schematicID", {})
.get("enabled", False) == True
) )
@@ -88,6 +88,6 @@ spec:
args: args:
- --nodes=$(NODE_IP) - --nodes=$(NODE_IP)
- upgrade - upgrade
- --image=factory.talos.dev/installer/{{ distribution.talos.schematics.id }}:$(SYSTEM_UPGRADE_PLAN_LATEST_VERSION) - --image=factory.talos.dev/installer/{{ distribution.talos.schematicID }}:$(SYSTEM_UPGRADE_PLAN_LATEST_VERSION)
- --preserve=true - --preserve=true
- --wait=false - --wait=false
@@ -31,6 +31,7 @@ nodes:
installDiskSelector: installDiskSelector:
serial: "{{ item.talos_disk_device }}" serial: "{{ item.talos_disk_device }}"
{% endif %} {% endif %}
talosImageURL: factory.talos.dev/installer/{{ distribution.talos.schematicID }}
controlPlane: {{ (item.controller) | string | lower }} controlPlane: {{ (item.controller) | string | lower }}
networkInterfaces: networkInterfaces:
- interface: eth0 - interface: eth0
@@ -63,11 +64,6 @@ nodes:
{% endfor %} {% endfor %}
controlPlane: controlPlane:
{% if distribution.talos.schematics.enabled %}
schematic:
customization:
{{ distribution.talos.schematics.customization | indent(6, first=True) }}
{% endif %}
patches: patches:
# Configure containerd # Configure containerd
- &containerdPatch |- - &containerdPatch |-
+4 -16
View File
@@ -9,22 +9,10 @@ distribution:
type: k3s type: k3s
# (Optional) Talos Specific Options # (Optional) Talos Specific Options
talos: {} talos: {}
# schematics: # # (Required) If you need any additional System Extensions and/or kernel arguments generate a schematic ID.
# # (Required) Disabling the schematic will disable the system-upgrade-controller and any # # Go to https://factory.talos.dev/ and choose the System Extensions you need and/or add extra kernel arguments.
# # additional Talos customization you have defined. # # Otherwise use below default.
# enabled: false # schematicID: "376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba"
# # (Required) For use with the system-upgrade-controller generate a schematic ID
# # based on your System Extension requirements https://factory.talos.dev/
# id: ""
# # (Required) Additional NodeConfigs to apply to all nodes
# # See: https://budimanjojo.github.io/talhelper/latest/reference/configuration/#nodeconfigs
# customization: |-
# extraKernelArgs:
# - net.ifnames=0
# systemExtensions:
# officialExtensions:
# - siderolabs/intel-ucode
# - siderolabs/i915-ucode
# # (Optional) Add vlan tag to network master device # # (Optional) Add vlan tag to network master device
# # See: https://www.talos.dev/latest/advanced/advanced-networking/#vlans # # See: https://www.talos.dev/latest/advanced/advanced-networking/#vlans
# vlan: 1 # vlan: 1