config scheduling on cp, config kubernetes version

This commit is contained in:
Stefan Le Breton 2024-11-22 10:34:56 +01:00
parent 0cd059d3d8
commit 2f3cd22828
3 changed files with 32 additions and 2 deletions

View file

@ -23,11 +23,24 @@ locals {
# "!${var.hcloud_private_network.cidr}" # "!${var.hcloud_private_network.cidr}"
# ] # ]
# } # }
# kubernetes version
apiServer = {
image = (var.kubernetes_version != "") ? "registry.k8s.io/kube-apiserver:v${var.kubernetes_version}" : null
}
controllerManager = {
image = (var.kubernetes_version != "") ? "registry.k8s.io/kube-controller-manager:v${var.kubernetes_version}" : null
}
proxy = {
image = (var.kubernetes_version != "") ? "registry.k8s.io/kube-proxy:v${var.kubernetes_version}" : null
}
scheduler = {
image = (var.kubernetes_version != "") ? "registry.k8s.io/kube-scheduler:v${var.kubernetes_version}" : null
}
} }
}) })
talos_config_patches = yamlencode({ talos_config_patches = yamlencode({
cluster = { cluster = {
allowSchedulingOnControlPlanes = true # TODO: optional allowSchedulingOnControlPlanes = var.schedule_on_controlplane
network = { network = {
cni = { cni = {
name = "none" name = "none"
@ -63,7 +76,8 @@ locals {
] ]
} }
machine = { machine = {
kubelet = { # TODO: optional kubelet version kubelet = {
image = (var.kubernetes_version != "") ? "ghcr.io/siderolabs/kubelet:v${var.kubernetes_version}" : null
nodeIP = { nodeIP = {
validSubnets = [ validSubnets = [
"${var.hcloud_private_network.cidr}" "${var.hcloud_private_network.cidr}"

View file

@ -9,6 +9,10 @@ talos_cluster_name = "talos-test"
talos_num_cp = 1 talos_num_cp = 1
talos_num_wk = 3 talos_num_wk = 3
# optional, if not given talos default version
#kubernetes_version = "1.29.11"
# DNS # DNS
# naming of nodes: # naming of nodes:

View file

@ -11,10 +11,18 @@ variable "talos_version" {
type = string type = string
description = "talos image version" description = "talos image version"
} }
variable "talos_cluster_name" { variable "talos_cluster_name" {
type = string type = string
description = "name of the cluster" description = "name of the cluster"
} }
variable "kubernetes_version" {
type = string
description = "kubernetes image version"
default = ""
}
variable "subdomain" { variable "subdomain" {
type = string type = string
description = "subdomain" description = "subdomain"
@ -47,6 +55,10 @@ variable "hcloud_private_network" {
} }
} }
variable "schedule_on_controlplane" {
type = bool
default = false
}
# cilium # cilium
variable "cilium_operator_replicas" { variable "cilium_operator_replicas" {