feat: Update to talos and kubernetes
This commit is contained in:
@@ -29,7 +29,7 @@ repos:
|
|||||||
args:
|
args:
|
||||||
[
|
[
|
||||||
"--schemafile",
|
"--schemafile",
|
||||||
"https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json",
|
"https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json",
|
||||||
]
|
]
|
||||||
- id: check-jsonschema
|
- id: check-jsonschema
|
||||||
files: ^talos/nodes/.*\.y(a?)ml$
|
files: ^talos/nodes/.*\.y(a?)ml$
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# yaml-language-server: $schema=https://git.huizinga.dev/infra/crete/raw/branch/main/schemas/cluster.json
|
# yaml-language-server: $schema=https://git.huizinga.dev/infra/crete/raw/branch/main/schemas/cluster.json
|
||||||
version:
|
version:
|
||||||
kubernetes: 1.34.1
|
kubernetes: 1.35.3
|
||||||
talos: 1.11.3
|
talos: 1.12.6
|
||||||
|
|
||||||
base:
|
base:
|
||||||
kernelArgs:
|
kernelArgs:
|
||||||
@@ -20,7 +20,9 @@ base:
|
|||||||
all:
|
all:
|
||||||
- system/hostname.yaml
|
- system/hostname.yaml
|
||||||
- system/install-disk.yaml
|
- system/install-disk.yaml
|
||||||
- system/network.yaml
|
- system/network.yaml.jinja
|
||||||
|
- system/ntp.yaml
|
||||||
|
- system/dns.yaml.jinja
|
||||||
- networking/vip.yaml
|
- networking/vip.yaml
|
||||||
- networking/tailscale.yaml
|
- networking/tailscale.yaml
|
||||||
- networking/cilium.yaml
|
- networking/cilium.yaml
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
cluster:
|
cluster:
|
||||||
inlineManifests:
|
inlineManifests:
|
||||||
- name: cluster-variables
|
- name: cluster-variables
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
machine:
|
machine:
|
||||||
kubelet:
|
kubelet:
|
||||||
extraArgs:
|
extraArgs:
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
cluster:
|
cluster:
|
||||||
extraManifests:
|
extraManifests:
|
||||||
- https://raw.githubusercontent.com/alex1989hu/kubelet-serving-cert-approver/main/deploy/standalone-install.yaml
|
- https://raw.githubusercontent.com/alex1989hu/kubelet-serving-cert-approver/main/deploy/standalone-install.yaml
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
machine:
|
machine:
|
||||||
features:
|
features:
|
||||||
hostDNS:
|
hostDNS:
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
cluster:
|
cluster:
|
||||||
extraManifests:
|
extraManifests:
|
||||||
- https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.1/standard-install.yaml
|
- https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.1/standard-install.yaml
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
apiVersion: v1alpha1
|
apiVersion: v1alpha1
|
||||||
kind: ExtensionServiceConfig
|
kind: ExtensionServiceConfig
|
||||||
name: tailscale
|
name: tailscale
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
machine:
|
apiVersion: v1alpha1
|
||||||
network:
|
kind: Layer2VIPConfig
|
||||||
interfaces:
|
name: "{{ cluster.controlPlaneIp }}"
|
||||||
- interface: "{{node.network.interface}}"
|
link: "{{ node.network.interface }}"
|
||||||
vip:
|
|
||||||
ip: "{{cluster.controlPlaneIp}}"
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
cluster:
|
cluster:
|
||||||
inlineManifests:
|
inlineManifests:
|
||||||
- name: sops-key
|
- name: sops-key
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
machine:
|
machine:
|
||||||
files:
|
files:
|
||||||
- path: /etc/cri/conf.d/20-customization.part
|
- path: /etc/cri/conf.d/20-customization.part
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
apiVersion: v1alpha1
|
apiVersion: v1alpha1
|
||||||
kind: VolumeConfig
|
kind: VolumeConfig
|
||||||
name: EPHEMERAL
|
name: EPHEMERAL
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
apiVersion: v1alpha1
|
apiVersion: v1alpha1
|
||||||
kind: UserVolumeConfig
|
kind: UserVolumeConfig
|
||||||
name: local-path-provisioner
|
name: local-path-provisioner
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
machine:
|
machine:
|
||||||
kubelet:
|
kubelet:
|
||||||
extraMounts:
|
extraMounts:
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
apiVersion: v1alpha1
|
apiVersion: v1alpha1
|
||||||
kind: UserVolumeConfig
|
kind: UserVolumeConfig
|
||||||
name: longhorn
|
name: longhorn
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
machine:
|
machine:
|
||||||
# This is only needed on nodes that will have storage
|
# This is only needed on nodes that will have storage
|
||||||
sysctls:
|
sysctls:
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
cluster:
|
cluster:
|
||||||
allowSchedulingOnControlPlanes: true
|
allowSchedulingOnControlPlanes: true
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
|
apiVersion: v1alpha1
|
||||||
|
kind: ResolverConfig
|
||||||
|
nameservers:
|
||||||
|
{% for dns in node.network.dns %}
|
||||||
|
- address: {{ dns }}
|
||||||
|
{% endfor %}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
machine:
|
apiVersion: v1alpha1
|
||||||
network:
|
kind: HostnameConfig
|
||||||
hostname: "{{node.hostname}}"
|
hostname: "{{node.hostname}}"
|
||||||
|
auto: "off"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
machine:
|
machine:
|
||||||
install:
|
install:
|
||||||
disk: "{{node.install.disk}}"
|
disk: "{{node.install.disk}}"
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.11/website/content/v1.11/schemas/config.schema.json
|
|
||||||
machine:
|
|
||||||
network:
|
|
||||||
interfaces:
|
|
||||||
- interface: "{{node.network.interface}}"
|
|
||||||
dhcp: false
|
|
||||||
addresses:
|
|
||||||
- "{{node.network.ip}}"
|
|
||||||
routes:
|
|
||||||
- network: 0.0.0.0/0
|
|
||||||
gateway: "{{node.network.gateway}}"
|
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
# yaml-language-server: $schema=https://raw.githubusercontent.com/siderolabs/talos/refs/heads/release-1.12/website/content/v1.12/schemas/config.schema.json
|
||||||
|
apiVersion: v1alpha1
|
||||||
|
kind: LinkConfig
|
||||||
|
name: "{{node.network.interface}}"
|
||||||
|
up: true
|
||||||
|
mtu: 9000
|
||||||
|
addresses:
|
||||||
|
- address: "{{node.network.ip}}/{{ node.network.netmask | to_prefix }}"
|
||||||
|
routes:
|
||||||
|
- gateway: "{{node.network.gateway}}"
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
apiVersion: v1alpha1
|
||||||
|
kind: TimeSyncConfig
|
||||||
|
ntp:
|
||||||
|
servers:
|
||||||
|
- "{{ node.ntp }}"
|
||||||
+1
-2
@@ -13,9 +13,8 @@ goto node_${serial} || exit
|
|||||||
{%- if node.install.serial -%}
|
{%- if node.install.serial -%}
|
||||||
# {{ cluster.name }}/{{ node.hostname }}
|
# {{ cluster.name }}/{{ node.hostname }}
|
||||||
:node_{{ node.install.serial }}
|
:node_{{ node.install.serial }}
|
||||||
{% set ipArg = "ip=" ~ [node.network.ip, "" , node.network.gateway, node.network.netmask, node.hostname, node.network.interface, "", node.network.dns[0], node.network.dns[1], node.ntp]|join(":") -%}
|
|
||||||
imgfree
|
imgfree
|
||||||
kernel https://pxe.factory.talos.dev/image/{{ node.schematic }}/v{{ cluster.version.talos }}/kernel-{{ node.arch }} {{ ipArg }} {{ node.kernelArgs|join(" ") }} {% if node.install.auto %}talos.config={{httpUrl}}/configs/{{cluster.name}}/{{node.hostname}}.yaml{% endif +%}
|
kernel https://pxe.factory.talos.dev/image/{{ node.schematic }}/v{{ cluster.version.talos }}/kernel-{{ node.arch }} {{ node.kernelArgs|join(" ") }} {% if node.install.auto %}talos.config={{httpUrl}}/configs/{{cluster.name}}/{{node.hostname}}.yaml{% endif +%}
|
||||||
initrd https://pxe.factory.talos.dev/image/{{ node.schematic }}/v{{ cluster.version.talos }}/initramfs-{{ node.arch }}.xz
|
initrd https://pxe.factory.talos.dev/image/{{ node.schematic }}/v{{ cluster.version.talos }}/initramfs-{{ node.arch }}.xz
|
||||||
boot
|
boot
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Reference in New Issue
Block a user