diff --git a/examples/terraform/aws/README.md b/examples/terraform/aws/README.md index c5c9152..2ff5b46 100644 --- a/examples/terraform/aws/README.md +++ b/examples/terraform/aws/README.md @@ -55,6 +55,7 @@ | [kubernetes\_api\_allowed\_cidr](#input\_kubernetes\_api\_allowed\_cidr) | The CIDR from which to allow to access the Kubernetes API | `string` | `"0.0.0.0/0"` | no | | [kubernetes\_version](#input\_kubernetes\_version) | Kubernetes version to use for the cluster, if not set the k8s version shipped with the talos sdk version will be used | `string` | `null` | no | | [talos\_api\_allowed\_cidr](#input\_talos\_api\_allowed\_cidr) | The CIDR from which to allow to access the Talos API | `string` | `"0.0.0.0/0"` | no | +| [talos\_version\_contract](#input\_talos\_version\_contract) | Talos API version to use for the cluster, if not set the the version shipped with the talos sdk version will be used | `string` | `null` | no | | [vpc\_cidr](#input\_vpc\_cidr) | The IPv4 CIDR block for the VPC. | `string` | `"172.16.0.0/16"` | no | | [worker\_groups](#input\_worker\_groups) | List of node worker node groups to create |
list(object({
name = string
instance_type = optional(string, "c5.large")
ami_id = optional(string, null)
num_instances = optional(number, 1)
config_patch_files = optional(list(string), [])
tags = optional(map(string), {})
}))
|
[
{
"name": "default"
}
]
| no | diff --git a/examples/terraform/aws/main.tf b/examples/terraform/aws/main.tf index 1e8c06b..28905ae 100644 --- a/examples/terraform/aws/main.tf +++ b/examples/terraform/aws/main.tf @@ -312,6 +312,7 @@ data "talos_machine_configuration" "controlplane" { cluster_endpoint = "https://${module.elb_k8s_elb.elb_dns_name}" machine_type = "controlplane" machine_secrets = talos_machine_secrets.this.machine_secrets + talos_version = var.talos_version_contract kubernetes_version = var.kubernetes_version docs = false examples = false @@ -330,6 +331,7 @@ data "talos_machine_configuration" "worker_group" { cluster_endpoint = "https://${module.elb_k8s_elb.elb_dns_name}" machine_type = "worker" machine_secrets = talos_machine_secrets.this.machine_secrets + talos_version = var.talos_version_contract kubernetes_version = var.kubernetes_version docs = false examples = false diff --git a/examples/terraform/aws/variables.tf b/examples/terraform/aws/variables.tf index 3183c41..ac6d5a7 100644 --- a/examples/terraform/aws/variables.tf +++ b/examples/terraform/aws/variables.tf @@ -10,6 +10,12 @@ variable "ccm" { default = false } +variable "talos_version_contract" { + description = "Talos API version to use for the cluster, if not set the the version shipped with the talos sdk version will be used" + type = string + default = null +} + variable "kubernetes_version" { description = "Kubernetes version to use for the cluster, if not set the k8s version shipped with the talos sdk version will be used" type = string diff --git a/examples/terraform/azure/.terraform.lock.hcl b/examples/terraform/azure/.terraform.lock.hcl index 282c493..5db598c 100644 --- a/examples/terraform/azure/.terraform.lock.hcl +++ b/examples/terraform/azure/.terraform.lock.hcl @@ -2,21 +2,21 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.85.0" + version = "3.92.0" constraints = ">= 3.0.0, ~> 3.0, >= 3.11.0, < 4.0.0" hashes = [ - "h1:UW2HuNrkVexKwNYbkI1Xr/B3ip/cCgizIjfKN+ulpPs=", - "zh:1ae6c0d82b5801641a17094b84f2ec1dcac699c1c4e40669a267511061414a34", - "zh:259e9386a43aabecb1205b0ceea2d205223637c09b66d806a89fed04f3343253", - "zh:4d940f9c14fece4f1d9219ac9d104202e5561bddc5024e5ac97f3f93eea20110", - "zh:530bca70b950e835f63c796c694106d701e5de0e2cf096fa35f08afd5c254594", - "zh:69e6b7f44ffbe0383b6485bb9db26781eb7869503889303e202967900a6b35ed", - "zh:8528e7d054254daae06eeb2bf343d566d3908a024fdfb5e515fbdbe0669c15eb", - "zh:98d66edfa89ed9a431ca37be384e5dfe7fa20bdc732c6e7d30f3f922ca3b29dc", - "zh:b8d37cedeffeb6bd37d4ec79fc2da19ed6b57d1ac08d835395dfa4fb3cfdf447", - "zh:bbc94e89cd6c0d59c2e5ed0bce852cac8435b6dc2e979691ee84af4c8b2c9bb8", - "zh:ceb4c624e8bb56bbcfe53e3c4ed4b4d27c3a5b62e5f4890b32c98b60b83c7827", - "zh:f08c5bf19eb25f668633964c6bfa823aa0ead785824082533c4a6cff3959e3d0", + "h1:+bZPRgjpUA6LivvMIS1UdwRWUgzoYBp/nhEpbL4aXHM=", + "zh:04292e149676ba956d738e85faeb6d6ebd3759e8310f1c4155e67402eb5ae0f7", + "zh:0963b4528f25d01d5c733e17de31e2c0b94790fd02931b2a47cd051b20dd0d96", + "zh:133563e16e8a4a7139ac11d94e68de8d1d5e3a62a532e64ac936735d7b1e04db", + "zh:2b219f1b40881d3bdd89257c916f255a7e36904ddc65dbbafee80763661b4636", + "zh:4b4e11a4e3716b290b3b173dfd15b06814b2f6f148f663e3c67a677c95526339", + "zh:5607c7bff3019c3b31488be1a8a9d77a96d27b199a1d8b789e4c2d4c90805674", + "zh:6469aef7728947dacb47785e6082d2d95ebd336a8798f3be6cece5a13145108c", + "zh:69e563f4e6397e1ebaef6f554d296238ec1d9dadc4b865c36743bd8366a888da", + "zh:887a223b7a9ec4e66634dbb65d9dcc53f0be06d058d9a209927ad49702ae790c", + "zh:b03c273367885c5489a24c31859af81ea58cb169431c0da97a175945ec968f53", + "zh:dd7b704ceaf98ce591e111a9c5085465c946f4f8f357089c0e27e990a669ba39", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } diff --git a/examples/terraform/azure/README.md b/examples/terraform/azure/README.md index 09eae6d..36dacc8 100644 --- a/examples/terraform/azure/README.md +++ b/examples/terraform/azure/README.md @@ -50,7 +50,7 @@ Getting the kubeconfig and talosconfig for this cluster can be done with `terraf | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | 3.85.0 | +| [azurerm](#provider\_azurerm) | 3.92.0 | | [talos](#provider\_talos) | 0.3.2 | ## Modules