diff --git a/.editorconfig b/.editorconfig index 09a2536..5fad59f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,7 +5,7 @@ indent_style = tab [*.yaml] indent_style = space -indent_size = 4 +indent_size = 2 [{*.py,tools/render}] indent_style = space diff --git a/config.yaml b/config.yaml index c3c705a..a2f7db7 100644 --- a/config.yaml +++ b/config.yaml @@ -1,6 +1,6 @@ server: - tftpIp: 192.168.1.1 - httpUrl: http://192.168.1.1:8000 + tftpIp: 192.168.1.1 + httpUrl: http://192.168.1.1:8000 tailscale: - loginServer: https://headscale.huizinga.dev + loginServer: https://headscale.huizinga.dev diff --git a/nodes/_defaults.yaml b/nodes/_defaults.yaml index d8e62db..a7aa824 100644 --- a/nodes/_defaults.yaml +++ b/nodes/_defaults.yaml @@ -3,29 +3,29 @@ arch: amd64 talosVersion: v1.11.3 kubernesVersion: v1.34.1 kernelArgs: - - talos.platform=metal - - console=tty0 - - init_on_alloc=1 - - init_on_free=1 - - slab_nomerge - - pti=on - - consoleblank=0 - - nvme_core.io_timeout=4294967295 - - printk.devkmsg=on - - selinux=1 - - lockdown=confidentiality + - talos.platform=metal + - console=tty0 + - init_on_alloc=1 + - init_on_free=1 + - slab_nomerge + - pti=on + - consoleblank=0 + - nvme_core.io_timeout=4294967295 + - printk.devkmsg=on + - selinux=1 + - lockdown=confidentiality extraKernelArgs: [] dns: - - 1.1.1.1 - - 8.8.8.8 + - 1.1.1.1 + - 8.8.8.8 ntp: nl.pool.ntp.org install: true autoInstall: false patches: - - !patch hostname - - !patch install-disk - - !patch network - - !patch vip - - !patch tailscale + - !patch hostname + - !patch install-disk + - !patch network + - !patch vip + - !patch tailscale patchesControlPlane: - - !patch allow-control-plane-workloads + - !patch allow-control-plane-workloads diff --git a/nodes/hellas/_defaults.yaml b/nodes/hellas/_defaults.yaml index ba25a2f..c406f52 100644 --- a/nodes/hellas/_defaults.yaml +++ b/nodes/hellas/_defaults.yaml @@ -2,6 +2,6 @@ netmask: 255.255.252.0 gateway: 10.0.0.1 installDisk: /dev/sda cluster: - name: hellas - controlPlaneIp: 10.0.2.1 - secretsFile: !realpath _secrets.yaml + name: hellas + controlPlaneIp: 10.0.2.1 + secretsFile: !realpath _secrets.yaml diff --git a/nodes/hellas/_secrets.yaml b/nodes/hellas/_secrets.yaml index 8c5fab6..7690821 100644 Binary files a/nodes/hellas/_secrets.yaml and b/nodes/hellas/_secrets.yaml differ diff --git a/nodes/testing/_defaults.yaml b/nodes/testing/_defaults.yaml index d54d604..1f0088a 100644 --- a/nodes/testing/_defaults.yaml +++ b/nodes/testing/_defaults.yaml @@ -3,6 +3,6 @@ gateway: 192.168.1.1 installDisk: /dev/vda autoInstall: true cluster: - name: testing - controlPlaneIp: 192.168.1.100 - secretsFile: !realpath _secrets.yaml + name: testing + controlPlaneIp: 192.168.1.100 + secretsFile: !realpath _secrets.yaml diff --git a/nodes/testing/_secrets.yaml b/nodes/testing/_secrets.yaml index ae162f9..d0f2eb5 100644 Binary files a/nodes/testing/_secrets.yaml and b/nodes/testing/_secrets.yaml differ diff --git a/patches/allow-control-plane-workloads.yaml b/patches/allow-control-plane-workloads.yaml index 281024a..78ee123 100644 --- a/patches/allow-control-plane-workloads.yaml +++ b/patches/allow-control-plane-workloads.yaml @@ -1,2 +1,2 @@ cluster: - allowSchedulingOnControlPlanes: true + allowSchedulingOnControlPlanes: true diff --git a/patches/hostname.yaml b/patches/hostname.yaml index 6c712ba..259a3f3 100644 --- a/patches/hostname.yaml +++ b/patches/hostname.yaml @@ -1,3 +1,3 @@ machine: - network: - hostname: {{node.hostname}} + network: + hostname: {{node.hostname}} diff --git a/patches/install-disk.yaml b/patches/install-disk.yaml index 3a2da3d..ff13ab1 100644 --- a/patches/install-disk.yaml +++ b/patches/install-disk.yaml @@ -1,3 +1,3 @@ machine: - install: - disk: {{node.installDisk}} + install: + disk: {{node.installDisk}} diff --git a/patches/network.yaml b/patches/network.yaml index 70529c5..57816ae 100644 --- a/patches/network.yaml +++ b/patches/network.yaml @@ -1,10 +1,10 @@ machine: - network: - interfaces: - - interface: {{node.interface}} - dhcp: false - addresses: - - {{node.ip}} - routes: - - network: 0.0.0.0/0 - gateway: {{node.gateway}} + network: + interfaces: + - interface: {{node.interface}} + dhcp: false + addresses: + - {{node.ip}} + routes: + - network: 0.0.0.0/0 + gateway: {{node.gateway}} diff --git a/patches/tailscale.yaml b/patches/tailscale.yaml index 0161b7e..3b0bab4 100644 --- a/patches/tailscale.yaml +++ b/patches/tailscale.yaml @@ -2,6 +2,6 @@ apiVersion: v1alpha1 kind: ExtensionServiceConfig name: tailscale environment: - - TS_AUTHKEY={{ config.tailscale.authKey }} - - TS_EXTRA_ARGS=--login-server {{ config.tailscale.loginServer }} - - TS_ROUTES={{ helper.tailscale_subnet(node.gateway, node.netmask) }} + - TS_AUTHKEY={{ config.tailscale.authKey }} + - TS_EXTRA_ARGS=--login-server {{ config.tailscale.loginServer }} + - TS_ROUTES={{ helper.tailscale_subnet(node.gateway, node.netmask) }} diff --git a/patches/vip.yaml b/patches/vip.yaml index 32b4d5a..f73c4dc 100644 --- a/patches/vip.yaml +++ b/patches/vip.yaml @@ -1,6 +1,6 @@ machine: - network: - interfaces: - - interface: {{node.interface}} - vip: - ip: {{node.cluster.controlPlaneIp}} + network: + interfaces: + - interface: {{node.interface}} + vip: + ip: {{node.cluster.controlPlaneIp}} diff --git a/secrets.yaml b/secrets.yaml index b187c77..5ff3544 100644 Binary files a/secrets.yaml and b/secrets.yaml differ