fix(terraform): parameterize worker network interface, use nvme diskSelector instead of raw path, add configurable swap partition support
This commit is contained in:
@@ -89,6 +89,7 @@ resource "local_file" "worker_configs" {
|
|||||||
lan_ip = each.value.lan_ip
|
lan_ip = each.value.lan_ip
|
||||||
lan_subnet = each.value.lan_subnet
|
lan_subnet = each.value.lan_subnet
|
||||||
lan_gateway = each.value.lan_gateway
|
lan_gateway = each.value.lan_gateway
|
||||||
|
network_interface = each.value.network_interface
|
||||||
kubelet_image = local.kubelet_image
|
kubelet_image = local.kubelet_image
|
||||||
cluster_dns_ip = local.cluster_dns_ip
|
cluster_dns_ip = local.cluster_dns_ip
|
||||||
install_disk = each.value.install_disk
|
install_disk = each.value.install_disk
|
||||||
@@ -100,6 +101,7 @@ resource "local_file" "worker_configs" {
|
|||||||
zone = each.value.zone
|
zone = each.value.zone
|
||||||
gpu_count = each.value.gpu_count
|
gpu_count = each.value.gpu_count
|
||||||
extra_disks = each.value.extra_disks
|
extra_disks = each.value.extra_disks
|
||||||
|
swap_size = each.value.swap_size
|
||||||
|
|
||||||
# Cluster config
|
# Cluster config
|
||||||
cluster_id = var.cluster_id
|
cluster_id = var.cluster_id
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ machine:
|
|||||||
network:
|
network:
|
||||||
hostname: ${hostname}
|
hostname: ${hostname}
|
||||||
interfaces:
|
interfaces:
|
||||||
- interface: eno1
|
- interface: ${network_interface}
|
||||||
addresses:
|
addresses:
|
||||||
- ${lan_ip}/24
|
- ${lan_ip}/24
|
||||||
routes:
|
routes:
|
||||||
@@ -37,11 +37,15 @@ machine:
|
|||||||
- ${cluster_dns_ip}
|
- ${cluster_dns_ip}
|
||||||
extraArgs:
|
extraArgs:
|
||||||
rotate-server-certificates: true
|
rotate-server-certificates: true
|
||||||
|
extraConfig:
|
||||||
|
memorySwap:
|
||||||
|
swapBehavior: LimitedSwap
|
||||||
nodeIP:
|
nodeIP:
|
||||||
validSubnets:
|
validSubnets:
|
||||||
- 192.168.1.0/24
|
- 192.168.1.0/24
|
||||||
install:
|
install:
|
||||||
disk: ${install_disk}
|
diskSelector:
|
||||||
|
match: disk.transport == "nvme"
|
||||||
image: ${factory_image}
|
image: ${factory_image}
|
||||||
wipe: true
|
wipe: true
|
||||||
grubUseUKICmdline: true
|
grubUseUKICmdline: true
|
||||||
@@ -93,3 +97,14 @@ cluster:
|
|||||||
kubernetes:
|
kubernetes:
|
||||||
disabled: true
|
disabled: true
|
||||||
service: {}
|
service: {}
|
||||||
|
%{ if swap_size != "" ~}
|
||||||
|
---
|
||||||
|
apiVersion: v1alpha1
|
||||||
|
kind: SwapVolumeConfig
|
||||||
|
name: swap1
|
||||||
|
provisioning:
|
||||||
|
diskSelector:
|
||||||
|
match: disk.transport == "nvme"
|
||||||
|
minSize: ${swap_size}
|
||||||
|
maxSize: ${swap_size}
|
||||||
|
%{ endif ~}
|
||||||
|
|||||||
Binary file not shown.
@@ -128,9 +128,11 @@ variable "worker_configs" {
|
|||||||
lan_subnet = string
|
lan_subnet = string
|
||||||
lan_gateway = string
|
lan_gateway = string
|
||||||
install_disk = string
|
install_disk = string
|
||||||
|
network_interface = optional(string, "eno1")
|
||||||
zone = string
|
zone = string
|
||||||
gpu_count = optional(number, 0)
|
gpu_count = optional(number, 0)
|
||||||
factory_image = optional(string)
|
factory_image = optional(string)
|
||||||
|
swap_size = optional(string, "")
|
||||||
extra_disks = optional(list(object({
|
extra_disks = optional(list(object({
|
||||||
device = string
|
device = string
|
||||||
mountpoint = string
|
mountpoint = string
|
||||||
|
|||||||
Reference in New Issue
Block a user