mirror of
https://github.com/puppetmaster/typhoon.git
synced 2025-08-02 16:41:34 +02:00
Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
634deaf92e | |||
cd699ee1aa |
@ -60,6 +60,7 @@ data "ct_config" "install" {
|
|||||||
baseurl_flag = var.cached_install ? "-b ${var.matchbox_http_endpoint}/assets/flatcar" : ""
|
baseurl_flag = var.cached_install ? "-b ${var.matchbox_http_endpoint}/assets/flatcar" : ""
|
||||||
})
|
})
|
||||||
strict = true
|
strict = true
|
||||||
|
install_snippets = lookup(var.install_snippets, var.controllers.*.name[count.index], [])
|
||||||
}
|
}
|
||||||
|
|
||||||
# Match each controller by MAC
|
# Match each controller by MAC
|
||||||
|
@ -61,6 +61,12 @@ variable "snippets" {
|
|||||||
default = {}
|
default = {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "install_snippets" {
|
||||||
|
type = map(list(string))
|
||||||
|
description = "Map from machine names to lists of Container Linux Config snippets to run during install phase"
|
||||||
|
default = {}
|
||||||
|
}
|
||||||
|
|
||||||
variable "worker_node_labels" {
|
variable "worker_node_labels" {
|
||||||
type = map(list(string))
|
type = map(list(string))
|
||||||
description = "Map from worker names to lists of initial node labels"
|
description = "Map from worker names to lists of initial node labels"
|
||||||
|
@ -55,6 +55,7 @@ data "ct_config" "install" {
|
|||||||
baseurl_flag = var.cached_install ? "-b ${var.matchbox_http_endpoint}/assets/flatcar" : ""
|
baseurl_flag = var.cached_install ? "-b ${var.matchbox_http_endpoint}/assets/flatcar" : ""
|
||||||
})
|
})
|
||||||
strict = true
|
strict = true
|
||||||
|
snippets = var.install_snippets
|
||||||
}
|
}
|
||||||
|
|
||||||
# Match a worker to a profile by MAC
|
# Match a worker to a profile by MAC
|
||||||
|
@ -60,6 +60,12 @@ variable "snippets" {
|
|||||||
default = []
|
default = []
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "install_snippets" {
|
||||||
|
type = list(string)
|
||||||
|
description = "List of Butane snippets to run with the install command"
|
||||||
|
default = []
|
||||||
|
}
|
||||||
|
|
||||||
variable "node_labels" {
|
variable "node_labels" {
|
||||||
type = list(string)
|
type = list(string)
|
||||||
description = "List of initial node labels"
|
description = "List of initial node labels"
|
||||||
|
@ -22,6 +22,7 @@ module "workers" {
|
|||||||
node_labels = lookup(var.worker_node_labels, var.workers[count.index].name, [])
|
node_labels = lookup(var.worker_node_labels, var.workers[count.index].name, [])
|
||||||
node_taints = lookup(var.worker_node_taints, var.workers[count.index].name, [])
|
node_taints = lookup(var.worker_node_taints, var.workers[count.index].name, [])
|
||||||
snippets = lookup(var.snippets, var.workers[count.index].name, [])
|
snippets = lookup(var.snippets, var.workers[count.index].name, [])
|
||||||
|
install_snippets = lookup(var.install_snippets, var.workers[count.index].name, [])
|
||||||
|
|
||||||
# optional
|
# optional
|
||||||
download_protocol = var.download_protocol
|
download_protocol = var.download_protocol
|
||||||
|
@ -194,7 +194,7 @@ Workers with similar features can be defined inline using the `workers` field as
|
|||||||
|
|
||||||
```tf
|
```tf
|
||||||
module "mercury-node1" {
|
module "mercury-node1" {
|
||||||
source = "git::https://github.com/poseidon/typhoon//bare-metal/fedora-coreos/kubernetes/worker?ref=v1.27.4"
|
source = "git::https://github.com/poseidon/typhoon//bare-metal/flatcar-linux/kubernetes/worker?ref=v1.27.4"
|
||||||
|
|
||||||
# bare-metal
|
# bare-metal
|
||||||
cluster_name = "mercury"
|
cluster_name = "mercury"
|
||||||
@ -206,13 +206,13 @@ module "mercury-node1" {
|
|||||||
name = "node2"
|
name = "node2"
|
||||||
mac = "52:54:00:b2:2f:86"
|
mac = "52:54:00:b2:2f:86"
|
||||||
domain = "node2.example.com"
|
domain = "node2.example.com"
|
||||||
kubeconfig = module.mercury.kubeconfig
|
kubeconfig = module.mercury.kubeconfig-admin
|
||||||
ssh_authorized_key = "ssh-rsa AAAAB3Nz..."
|
ssh_authorized_key = "ssh-rsa AAAAB3Nz..."
|
||||||
|
|
||||||
# optional
|
# optional
|
||||||
snippets = []
|
snippets = []
|
||||||
node_labels = []
|
node_labels = []
|
||||||
node_tains = []
|
node_taints = []
|
||||||
install_disk = "/dev/vda"
|
install_disk = "/dev/vda"
|
||||||
cached_install = false
|
cached_install = false
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user