Skip to content

Commit 11d8517

Browse files
author
Ubuntu
committed
Parameterize Talos and Kubernetes versions for easier upgrades
1 parent 846f26a commit 11d8517

File tree

5 files changed

+27
-16
lines changed

5 files changed

+27
-16
lines changed

.terraform-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.9.5
1+
1.11.4

cluster.tf

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,27 @@ data "talos_client_configuration" "talosconfig" {
1212

1313
# Control Plane Machine Configurations
1414
data "talos_machine_configuration" "machineconfig_cp" {
15-
cluster_name = var.cluster_name
16-
cluster_endpoint = "https://${var.talos_cp_01_ip_addr}:6443"
17-
machine_type = "controlplane"
18-
machine_secrets = talos_machine_secrets.machine_secrets.machine_secrets
15+
cluster_name = var.cluster_name
16+
cluster_endpoint = "https://${var.talos_cp_01_ip_addr}:6443"
17+
machine_type = "controlplane"
18+
machine_secrets = talos_machine_secrets.machine_secrets.machine_secrets
19+
kubernetes_version = var.kubernetes_version
1920
}
2021

2122
data "talos_machine_configuration" "machineconfig_cp_02" {
22-
cluster_name = var.cluster_name
23-
cluster_endpoint = "https://${var.talos_cp_02_ip_addr}:6443"
24-
machine_type = "controlplane"
25-
machine_secrets = talos_machine_secrets.machine_secrets.machine_secrets
23+
cluster_name = var.cluster_name
24+
cluster_endpoint = "https://${var.talos_cp_02_ip_addr}:6443"
25+
machine_type = "controlplane"
26+
machine_secrets = talos_machine_secrets.machine_secrets.machine_secrets
27+
kubernetes_version = var.kubernetes_version
2628
}
2729

2830
data "talos_machine_configuration" "machineconfig_cp_03" {
29-
cluster_name = var.cluster_name
30-
cluster_endpoint = "https://${var.talos_cp_03_ip_addr}:6443"
31-
machine_type = "controlplane"
32-
machine_secrets = talos_machine_secrets.machine_secrets.machine_secrets
31+
cluster_name = var.cluster_name
32+
cluster_endpoint = "https://${var.talos_cp_03_ip_addr}:6443"
33+
machine_type = "controlplane"
34+
machine_secrets = talos_machine_secrets.machine_secrets.machine_secrets
35+
kubernetes_version = var.kubernetes_version
3336
}
3437

3538
# Apply Control Plane Configurations

files.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
locals {
22
talos = {
3-
version = "v1.9.5"
3+
version = var.talos_version
44
}
55
}
66

talosconfig

Lines changed: 0 additions & 2 deletions
This file was deleted.

variables.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,13 @@ variable "cp_vip" {
4949
type = string
5050
default = "192.168.3.180"
5151
}
52+
53+
variable "talos_version" {
54+
type = string
55+
default = "v1.9.5"
56+
}
57+
58+
variable "kubernetes_version" {
59+
type = string
60+
default = "1.32.0"
61+
}

0 commit comments

Comments
 (0)