diff --git a/NETWORK.md b/NETWORK.md deleted file mode 100644 index c99587c..0000000 --- a/NETWORK.md +++ /dev/null @@ -1,65 +0,0 @@ -# Infrastructure Overview – Wheatley - -This document describes the network and infrastructure architecture of the *Wheatley* environment. Its purpose is to clearly document **connectivity, routing, and responsibilities per site**, enabling predictable operations, troubleshooting, and future expansion. - ---- - -## Overview - -The infrastructure consists of three primary sites: - -| Site | Role | Subnet | -|------|------|--------| -| **Hobbyrack** | Central hub, homelab, workloads | `10.13.37.0/24` | -| **MAPPS** | Externally managed platform services | `10.7.65.192/26` | -| **Home** | Client network | `192.168.1.0/24` | - -Connectivity between sites is provided via **IPSec** and **WireGuard**, with *Hobbyrack* acting as the central routing and transit hub. - ---- - -## Network Diagram - -```mermaid -flowchart LR - %% Hobbyrack - subgraph HR["Hobbyrack"] - HR_OPN["OPNsense Gateway -10.13.37.1"] - HR_LAN["10.13.37.0/24"] - HR_CLUSTER["k8s-wheatley -(Servarr stack)"] - HR_OPN --- HR_LAN - HR_LAN --- HR_CLUSTER - end - - %% Managed Apps - subgraph MA["Forti – Managed"] - MA_GW["Gateway -10.7.65.193"] - MA_LAN["10.7.65.192/26"] - MA_CLUSTER["MAPPS Cluster -(Mimir, Loki, Vault)"] - MA_CLUSTER2["k8s-peterg -(ArgoCD)"] - MA_GW --- MA_LAN - MA_LAN --- MA_CLUSTER - MA_LAN --- MA_CLUSTER2 - end - - %% Home - subgraph TH["Home"] - TH_GW["UniFi Gateway -192.168.1.1"] - TH_LAN["192.168.1.0/24"] - TH_CLIENTS["Clients"] - TH_GW --- TH_LAN - TH_LAN --- TH_CLIENTS - end - - %% Tunnels - HR_OPN <==>|"IPSec -10.13.37.0/24 ↔ 10.7.65.192/26"| MA_GW - HR_OPN <==>|"WireGuard Hub -10.167.84.0/24"| TH_GW - diff --git a/README.md b/README.md index 845a94e..655a5de 100644 --- a/README.md +++ b/README.md @@ -1,47 +1,2 @@ -# Hobbyrack Infrastructure +# infrastructure -This repository contains the infrastructure-as-code configuration for managing Wheatley, a homelab environment within Hobbyrack. The current focus is on deploying a Kubernetes clusters with Talos and Cilium on Proxmox VE using OpenTofu. - -## Contents - -- **modules/**: Contains reusable modules for cluster bootstrap and node provisioning. - - **talos-bootstrap/**: Bootstraps the Talos cluster, including templates for machine configuration and Cilium installation. - - **talos-node/**: Provisions individual Talos node VMs on Proxmox. -- **pve01.wheatley.in/**: Configuration specific to the Proxmox VE host `pve01.wheatley.in`. - - **k8s-wheatley/**: Provisions the `k8s-wheatley` Kubernetes cluster. - - **templates/**: Provisions VM templates on the PVE host. - -## Requirements - -- [OpenTofu](https://opentofu.org/) >= 1.0 -- Access to a Proxmox VE environment -- (Optional) talosctl for managing Talos nodes - -## Usage - -1. **Initialize OpenTofu** - ```sh - tofu init - ``` -2. **Review the execution plan** - ```sh - tofu plan - ``` -3. **Apply the infrastructure** - ```sh - tofu apply - ``` - -> Adjust variables in `variables.tf` or provide a `terraform.tfvars` file for your environment. - -## Contributing - -Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change. - -## License - -This repository is licensed under the MIT License. See the `LICENSE` file for details. - -## Contact - -For questions or support, open an issue or contact via GitHub. diff --git a/modules/talos-bootstrap/README.md b/modules/talos-bootstrap/README.md deleted file mode 100644 index cb73270..0000000 --- a/modules/talos-bootstrap/README.md +++ /dev/null @@ -1,44 +0,0 @@ - -## Requirements - -| Name | Version | -|------|---------| -| [talos](#requirement\_talos) | 0.9.0 | - -## Providers - -| Name | Version | -|------|---------| -| [talos](#provider\_talos) | 0.9.0 | - -## Modules - -No modules. - -## Resources - -| Name | Type | -|------|------| -| [talos_cluster_kubeconfig.kubeconfig](https://registry.terraform.io/providers/siderolabs/talos/0.9.0/docs/resources/cluster_kubeconfig) | resource | -| [talos_machine_bootstrap.talos_machine_bootstrap](https://registry.terraform.io/providers/siderolabs/talos/0.9.0/docs/resources/machine_bootstrap) | resource | -| [talos_machine_configuration_apply.config_apply_cp](https://registry.terraform.io/providers/siderolabs/talos/0.9.0/docs/resources/machine_configuration_apply) | resource | -| [talos_machine_configuration_apply.config_apply_worker](https://registry.terraform.io/providers/siderolabs/talos/0.9.0/docs/resources/machine_configuration_apply) | resource | -| [talos_machine_secrets.machine_secrets](https://registry.terraform.io/providers/siderolabs/talos/0.9.0/docs/resources/machine_secrets) | resource | -| [talos_client_configuration.talosconfig](https://registry.terraform.io/providers/siderolabs/talos/0.9.0/docs/data-sources/client_configuration) | data source | -| [talos_machine_configuration.machineconfig-cp](https://registry.terraform.io/providers/siderolabs/talos/0.9.0/docs/data-sources/machine_configuration) | data source | -| [talos_machine_configuration.machineconfig-worker](https://registry.terraform.io/providers/siderolabs/talos/0.9.0/docs/data-sources/machine_configuration) | data source | - -## Inputs - -| Name | Description | Type | Default | Required | -|------|-------------|------|---------|:--------:| -| [node\_config](#input\_node\_config) | Talos node configuration | 
object({
    ipv4_gateway           = string
    talos_version          = string
    gateway_api_version    = string
    cilium_version         = string
    cluster_name           = string
    kubernetes_version     = string
    cluster_endpoint       = string
    proxmox_node           = string
    controlplane_addresses = list(string)
    worker_addresses       = list(string)
  })
| n/a | yes | -| [talos\_nodes](#input\_talos\_nodes) | List of Talos nodes to bootstrap | 
list(object({
    name            = string
    type            = string
    ipv4_address    = string
    storage_address = optional(string)
    pvc_disks       = optional(list(number))
    gpu_enabled     = optional(bool, false)
  }))
| n/a | yes | - -## Outputs - -| Name | Description | -|------|-------------| -| [kubeconfig](#output\_kubeconfig) | n/a | -| [talosconfig](#output\_talosconfig) | n/a | - \ No newline at end of file diff --git a/modules/talos-node/README.md b/modules/talos-node/README.md deleted file mode 100644 index cccf05a..0000000 --- a/modules/talos-node/README.md +++ /dev/null @@ -1,34 +0,0 @@ - -## Requirements - -| Name | Version | -|------|---------| -| [proxmox](#requirement\_proxmox) | 0.86.0 | - -## Providers - -| Name | Version | -|------|---------| -| [proxmox](#provider\_proxmox) | 0.86.0 | - -## Modules - -No modules. - -## Resources - -| Name | Type | -|------|------| -| [proxmox_virtual_environment_vm.talos-node](https://registry.terraform.io/providers/bpg/proxmox/0.86.0/docs/resources/virtual_environment_vm) | resource | - -## Inputs - -| Name | Description | Type | Default | Required | -|------|-------------|------|---------|:--------:| -| [node](#input\_node) | Basic configuration for the Talos node | 
object({
    id                 = number
    type               = string
    name               = string
    ipv4_address       = string
    ipv4_gateway       = string
    cpu                = number
    gpu                = optional(bool, false)
    memory             = number
    disk               = string
    storagepool        = string
    talos_version      = string
    cluster_name       = string
    kubernetes_version = string
    cluster_endpoint   = string
    proxmox_node       = string
  })
| n/a | yes | -| [pvc\_disks](#input\_pvc\_disks) | List of extra disks to attach to the node | `list(number)` | `[]` | no | - -## Outputs - -No outputs. - \ No newline at end of file diff --git a/pve01.wheatley.in/k8s-wheatley/.terraform.lock.hcl b/pve01.wheatley.in/k8s-wheatley/.terraform.lock.hcl index b837e8d..d4c298c 100644 --- a/pve01.wheatley.in/k8s-wheatley/.terraform.lock.hcl +++ b/pve01.wheatley.in/k8s-wheatley/.terraform.lock.hcl @@ -2,73 +2,47 @@ # Manual edits may be lost in future updates. provider "registry.opentofu.org/bpg/proxmox" { - version = "0.95.0" - constraints = "0.95.0" + version = "0.86.0" + constraints = "0.86.0" hashes = [ - "h1:8gOZBH6hYhvvr9ycmz8AVdgnABQPEft6q/qj2uIdDR8=", - "h1:APHNeh4Fayb+RnVzIUBGwD4pQZHEH6NBukvZKW9TETw=", - "h1:C/SnO5houq7BCNvpmH+QV+RbxcIyASlQm8dI51vxm34=", - "h1:HDn4A1XRSbaKd4RIzHJM/U1TBLw1llq5sAjB1oPS2yM=", - "h1:NamnpRo4NLLqhjWFw0lPr4V0Vm/hHqNOXfCbiPsv9WY=", - "h1:P/DYln7s7I2YWrowkkvrAdNXCYCOcccR38mcZLzidbs=", - "h1:QmOVJQiSH80Jdmc8T4CLKhkkHHtCohYpgNXTGyfYNX0=", - "h1:XqbY+SVrGaRp9T+nkw929kG3/4fp8SbFy7LUA2io8vU=", - "h1:aWrhONde+FDq3mgc3A2VJSvwt8R/gR+enf+GTww9TIU=", - "h1:nJblnO+z23prp5I9vqlR0C984dJ53Vpzj+ad3iPdig4=", - "h1:rnReS6P0e2uXYVMhpPgHb1B+eQrjXCnP8Hp6THLPqPg=", - "h1:s5DW5MUXT5Yspd7Z4qTrAnnSismfI7gqL4+aiMUuDY8=", - "h1:zEUJdG/8tJnHkjq1DZBqpkGuabZ6Ev1ExY4Y/ITHTVA=", - "h1:zxHxjwctc98DHZjOY4YOPkxYBk7cY28r0j9/6sI5o7I=", - "zh:07439b6c10c48c25357cd574d9db024adb21419865c5b22019a2d0493314b2fb", - "zh:29b56acca3df3d1ad1c0d677165192d59ec850c26d013e19a18cc94b11789b39", - "zh:35f73b7eeef23867633ee2d687c1cf015eb15ff128fc9527f018aaf0c58ef1ce", - "zh:4a479884f6549e8f5b11659c4fe9e3af4fc3f95440d7d8b54335d608361c731f", - "zh:4c89f62fb4528f15ae71fc91f792fe5e747ce162e7bf6124f21989d8805a3971", - "zh:510ccaaddb1add81563417dcb8f25f364988e8797293d2889b0bdbf623abe01b", - "zh:5d791e444e671f6b41c371fddec9d3aba8c8c5c8996ec0864b5aa8678b70feee", - "zh:5e655ca1b5d10cfebbe649952d073699005015082de897f3424faa80a9c13667", - "zh:71d639eaa7aaa7a6fa68a8bd546d864842c163ff4f2abc48176e287642156d27", - "zh:beb1f2ea7ca4e1e42373749b3b1a3dc7bb2bf283001eb9181e162da4f1345b07", - "zh:cd8116cfb4988c7157ec2ef18a3fb2bfa1020342fd66f99aa66ef8db678fe09d", - "zh:d0e3eacce028554d641ea7bfb857888559f9f92f3dcc00bdd5d8a3bc70768580", - "zh:e0eabff8250b428de253f064324fc878a27fa258a79aa76a1b0dab158986cec6", - "zh:eef582a3fcc21a7c7c29719ec1f969089f9bba8376a6bb0c8f5aa6c8f89a8ee0", + "h1:brQxwkXGxNw5N2gNwwefF9XxzrudYgSyjHrRhdvAdjo=", + "zh:09b627b92a59848769fadfc3d8103eebf070a3800144bf03cb93f44472327f44", + "zh:0e19eb7f1047d541e50b97d7ac440ea73685d0c28ed2dbe64217cbe2f0b353e0", + "zh:20f1e70091ff3056876618c93afd79527c8995f955d153993e8fbb10fa42593b", + "zh:3920315be565976f5a9da0803f8f1a108221282f1bc9e21160669d793af4e0c8", + "zh:5133b2a2027428d3926eaa3bcdc0ab65a75305d54f6cbc7c54cce746dfddbc8e", + "zh:514c588b04738d55c9e6b1c5a4e3fb1ef4041dfb809d2268f14d29839ecfba59", + "zh:55916034025b4833bd6a93bb5948dfb7d00830a772ef74fa70898c6f7de0da0b", + "zh:58b485a4b0bde56ca7032fca0ac09cb4c6ff2579e06cf4f2a311bb695baa0df1", + "zh:75ebe44e6da4108af5fe02a9cd99ed0189985b486a2a56594952098d161ceb3d", + "zh:a8c870bfb5958a3d49d639db3c2761cfb453c6a6f95e5e241890922b11c8a4d8", + "zh:c2df2748b9be47a6c3e613667c64874d5cb1d3fbb5b985d6eb9c3af5af298454", + "zh:c3059668f4f81e450e555a47310e7042044b335f131643262fd51f9ba96f2214", + "zh:ddbbb23910666f70cf4a9587ba57b45f5f58c53a1f8d7cee1d6f90a3d3ef38ef", + "zh:e430138b897edcd3b64e4309db34ac872526187782626aa074d8d1647a0abfa8", "zh:f26e0763dbe6a6b2195c94b44696f2110f7f55433dc142839be16b9697fa5597", ] } provider "registry.opentofu.org/siderolabs/talos" { - version = "0.10.1" - constraints = "0.10.1" + version = "0.9.0" + constraints = "0.9.0" hashes = [ - "h1:1/HTp6cDJWQJzRj8preKQvw3x/qffivOJhZx27OmAig=", - "h1:5NH5P1sqJqFAhAQxfZ0CC1T5Aj6jZLe53lWgJHPhrk0=", - "h1:97x1aN9Ydi+yO9IOGFed+mbjh8myBMPKQY36vLS9Sk0=", - "h1:PVonzANqcaopoXwRFHWZL6Q4iPs9YFhaJ+Y2c9iYRTs=", - "h1:WaWU/5BK+X9s/Vt1f6Iz/6iyWxC1KBN+hMN0VxisILg=", - "h1:ZmyK5/k34tApxFFbqKe5W/Q9RZEMgUdaVqcF92AeUow=", - "h1:aZRJCGsYiSQK2GCwofbv6iFWLvVj+wwZrwyh8chYjVs=", - "h1:fUnidKAmrtS9rdzrH5QyPUH8LSHQCqU05UTSLPRDJos=", - "h1:fc7ekyeFDNNvScqgHgowGjM9jnKFyUOMGfnEKJwuf1c=", - "h1:gWMvxlc8zIyeA0snj+6rarGUuBGtpb5D/mRttkbQ2hQ=", - "h1:hcyPHdphfvQ9lH7yWwy8XTjfE2h2WJNydMMXbli9jGo=", - "h1:kNrX3umPDAktIxQWUtx5lN6TGcDTqZxR79mTRqzU7Hg=", - "h1:rXc4IengYQexTK0URU4MRGtrkO0iS3YFTUeozTigBHo=", - "h1:y+7wlj9usfM3aoSkU+J1VRatR4k1NGKMOW7oA5c8H/Y=", + "h1:50TaymX/KnjXcURmpKsVd7JUyLRrMDNXMHFgqzSe88U=", "zh:0fa82a384b25a58b65523e0ea4768fa1212b1f5cfc0c9379d31162454fedcc9d", - "zh:349463cdd4cdb36e03276fdb855e687242237c7cf0bd5871aea995a83838c52e", - "zh:3885026ef7c1c7012d312fc37a35af70821650b10cef03b8ffd08d22145c117d", - "zh:3a5c4ddae27200663d3552daa8db6d6ad91f49746825e0556370f67e2d3ead5a", - "zh:456e233aec7d83558255da87ba0b1c7fec81bf71b1aa4e0f35a2787d3f104c2a", - "zh:6b781a16764c91259a6646f346cf47e99a31d7eefcdd188b1ea8b287b8fd0531", - "zh:6d91f628812ec99a71964f00e83df93f6106b830af111b611b6a0f68ad6987ea", - "zh:80430dea846ef82a4fb430abe4f0213ae79f9f38a7a61752bbeeec59c82c1387", - "zh:84717212f789a026492b0a4d121fcdf4a15f48916f9500cdb4ffa1f6c26479cc", - "zh:a0fcaa3fd515d78cf635884165e111fa37b6300cefb0a6412fb1ed584d88599a", - "zh:b0f8dbb8a667e00340ca9566d1bee933097b3b252a1df3737d2fb376964ab8cc", - "zh:b8191729e70d5e7e53730f7c499ab16faec23d45969424c1f304bab0f6fcfcb6", - "zh:be3b5cfc57abdbab689088b2677516703600a12eaefc02a2355ba9002f80f273", - "zh:d53afbcbeaeeed6c7e65477da4daca2cc4ab0c52ad833219c1141f9310325dc2", - "zh:f04f8a103f5136bdd6910d531192ad0cb10c8734b519b9e9dff4185d5cc7113e", + "zh:249ab08b810bb96ef7c35354a12622907df7cbda59c83ff314ee85e8b851128d", + "zh:4f284c21f0cb4b7012fdb231ebba4803e5c389f7ea380fb5958ebfa6b822d055", + "zh:6049f8d06bc92ab1a46d56c2b37799e6a1b7ce3c61905acf8f0c2009942be8ac", + "zh:7de5f0a6429c6856ade3c7e59d5041a7fe8e0010aea14a2074e91f8a526283ce", + "zh:9760420cf5feec0550556664962bc6f1af45115b9ea5bcbf47aa9bffd3dd4ac2", + "zh:9860272a9fbcea65393c478dc579ad2677a44338de24677702ce699a027801aa", + "zh:a60311a8bf267b18dcf1c8250f45e371b51c6aef086e037a3f9496602f190187", + "zh:b74c119b2a964cae8d17b5b5f14c8eecf44708e3817c1f65ac89b813856aed98", + "zh:bc33e14650052c246ac2e6492a0a24755d4e8d27cb7259e3996f07b0537f2c77", + "zh:c4bc2c65b3dcef2508c14dbbfc18937c5ede11670c02a644cbc28c83a57de92b", + "zh:c98bf4809220568d76ea2db232a88a60c29fd90d4c9e2f8c8a68cf91ceed066a", + "zh:de0179ee9c55bf36d3474049ceac3a105ed7bc1fb9c4787d4076c4b15d268b66", + "zh:e99e019d950131c2c4259c1cbca1d072cb813bdfdbbbf9359f5901d6b7542a0d", + "zh:feb941cc673692c6858f96590f3ca082683a62aa2d2842b9bfffcd327eb840d3", ] } diff --git a/pve01.wheatley.in/k8s-wheatley/README.md b/pve01.wheatley.in/k8s-wheatley/README.md deleted file mode 100644 index 0f8b055..0000000 --- a/pve01.wheatley.in/k8s-wheatley/README.md +++ /dev/null @@ -1,38 +0,0 @@ - -## Requirements - -| Name | Version | -|------|---------| -| [proxmox](#requirement\_proxmox) | 0.86.0 | -| [talos](#requirement\_talos) | 0.9.0 | - -## Providers - -No providers. - -## Modules - -| Name | Source | Version | -|------|--------|---------| -| [controlplanes](#module\_controlplanes) | ../../modules/talos-node | n/a | -| [talos-bootstrap](#module\_talos-bootstrap) | ../../modules/talos-bootstrap | n/a | -| [workers](#module\_workers) | ../../modules/talos-node | n/a | - -## Resources - -No resources. - -## Inputs - -| Name | Description | Type | Default | Required | -|------|-------------|------|---------|:--------:| -| [proxmox\_api\_token](#input\_proxmox\_api\_token) | Proxmox API token | `string` | n/a | yes | -| [proxmox\_endpoint](#input\_proxmox\_endpoint) | Proxmox API endpoint | `string` | n/a | yes | - -## Outputs - -| Name | Description | -|------|-------------| -| [kubeconfig](#output\_kubeconfig) | n/a | -| [talosconfig](#output\_talosconfig) | n/a | - \ No newline at end of file diff --git a/pve01.wheatley.in/k8s-wheatley/main.tf b/pve01.wheatley.in/k8s-wheatley/main.tf index 08ebb8a..bdf409e 100644 --- a/pve01.wheatley.in/k8s-wheatley/main.tf +++ b/pve01.wheatley.in/k8s-wheatley/main.tf @@ -6,7 +6,7 @@ terraform { skip_credentials_validation = true skip_metadata_api_check = true skip_region_validation = true - use_path_style = true + force_path_style = true } } @@ -64,26 +64,20 @@ locals { cluster_name = local.cluster_name kubernetes_version = local.kubernetes_version ipv4_gateway = local.ipv4_gateway - pvc_disks = [150] + pvc_disks = [100] nodes = [ { - name = "worker01" - ip_address = "10.13.37.21" - storage_address = "10.0.69.21" - gpu_enabled = false + name = "worker01" + ip_address = "10.13.37.21" }, { - name = "worker02" - ip_address = "10.13.37.22" - storage_address = "10.0.69.22" - gpu_enabled = false + name = "worker02" + ip_address = "10.13.37.22" }, { - name = "worker03" - ip_address = "10.13.37.23" - storage_address = "10.0.69.23" - gpu_enabled = false + name = "worker03" + ip_address = "10.13.37.23" }, ] } @@ -94,12 +88,11 @@ locals { } module "controlplanes" { - source = "../../modules/talos-node" + source = "./modules/talos-node" for_each = { for node in local.controlplanes.nodes : node.name => node } node = { id = local.vm-id_prefix + 10 + tonumber(replace(each.key, "cp", "")) - type = "controlplane" name = format("k8s-wheatley-%s", each.value.name) ipv4_address = each.value.ip_address cpu = local.controlplanes.cpu @@ -116,16 +109,14 @@ module "controlplanes" { } module "workers" { - source = "../../modules/talos-node" + source = "./modules/talos-node" for_each = { for node in local.workers.nodes : node.name => node } node = { id = local.vm-id_prefix + 20 + tonumber(replace(each.key, "worker", "")) - type = "worker" name = format("k8s-wheatley-%s", each.value.name) ipv4_address = each.value.ip_address cpu = local.workers.cpu - gpu = each.value.gpu_enabled memory = local.workers.memory disk = local.workers.disk storagepool = local.workers.storagepool @@ -145,7 +136,7 @@ module "talos-bootstrap" { module.workers ] - source = "../../modules/talos-bootstrap" + source = "./modules/talos-bootstrap" node_config = { ipv4_gateway = local.ipv4_gateway @@ -170,12 +161,9 @@ module "talos-bootstrap" { ], [ for node in local.workers.nodes : { - name = format("k8s-wheatley-%s", node.name) - type = "worker" - ipv4_address = node.ip_address - storage_address = node.storage_address - pvc_disks = local.workers.pvc_disks - gpu_enabled = node.gpu_enabled + name = format("k8s-wheatley-%s", node.name) + type = "worker" + ipv4_address = node.ip_address } ] ) diff --git a/modules/talos-bootstrap/main.tf b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/main.tf similarity index 95% rename from modules/talos-bootstrap/main.tf rename to pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/main.tf index 81ec920..1563085 100644 --- a/modules/talos-bootstrap/main.tf +++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { talos = { source = "siderolabs/talos" - version = "0.10.1" + version = "0.9.0" } } } @@ -54,6 +54,7 @@ resource "talos_machine_configuration_apply" "config_apply_cp" { vip_address = var.node_config.cluster_endpoint node_name = format("%s.wheatley.in", var.node_config.proxmox_node) machine_type = each.value.type + talos_version = var.node_config.talos_version gateway-api_version = var.node_config.gateway_api_version cilium_version = var.node_config.cilium_version cilium_install_file = file("${path.module}/templates/cilium-install.yaml.tmpl") @@ -75,15 +76,13 @@ resource "talos_machine_configuration_apply" "config_apply_worker" { templatefile("${path.module}/templates/machineconfig-worker.yaml.tmpl", { hostname = each.value.name cluster_name = var.node_config.cluster_name + vip_address = var.node_config.cluster_endpoint node_name = format("%s.wheatley.in", var.node_config.proxmox_node) - storage_address = each.value.storage_address machine_type = each.value.type talos_version = var.node_config.talos_version gateway-api_version = var.node_config.gateway_api_version cilium_version = var.node_config.cilium_version cilium_install_file = file("${path.module}/templates/cilium-install.yaml.tmpl") - pvc_disks = each.value.pvc_disks - gpu_enabled = each.value.gpu_enabled }) ] } diff --git a/modules/talos-bootstrap/outputs.tf b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/outputs.tf similarity index 100% rename from modules/talos-bootstrap/outputs.tf rename to pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/outputs.tf diff --git a/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl similarity index 100% rename from modules/talos-bootstrap/templates/cilium-install.yaml.tmpl rename to pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl diff --git a/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl similarity index 75% rename from modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl rename to pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl index 53ce1f8..67829b1 100644 --- a/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl +++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl @@ -3,6 +3,7 @@ machine: type: ${machine_type} install: disk: /dev/vda + image: factory.talos.dev/nocloud-installer-secureboot/ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515:v${talos_version} network: hostname: ${hostname} nameservers: @@ -15,6 +16,7 @@ machine: kubelet: extraArgs: pod-max-pids: 1000 + rotate-server-certificates: true extraConfig: imageGCHighThresholdPercent: 75 imageGCLowThresholdPercent: 70 @@ -36,6 +38,7 @@ cluster: disabled: true extraManifests: - https://github.com/kubernetes-sigs/gateway-api/releases/download/v${gateway-api_version}/standard-install.yaml + - https://raw.githubusercontent.com/alex1989hu/kubelet-serving-cert-approver/refs/heads/main/deploy/standalone-install.yaml inlineManifests: - name: cilium-bootstrap contents: | diff --git a/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl similarity index 57% rename from modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl rename to pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl index 7692f7d..3637e5b 100644 --- a/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl +++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl @@ -3,40 +3,18 @@ machine: type: ${machine_type} install: disk: /dev/vda -%{ if gpu_enabled != false ~} - image: factory.talos.dev/nocloud-installer-secureboot/29d29d87bf3b88fe13caf73c20c7a8b6a4355d8177d0d690d5c9f85d4ddb67b7:v${talos_version} -%{ endif ~} + image: factory.talos.dev/nocloud-installer-secureboot/ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515:v${talos_version} network: hostname: ${hostname} nameservers: - 9.9.9.9 -%{ if storage_address != false ~} - interfaces: - - interface: eth1 - mtu: 9000 - dhcp: false - addresses: - - ${storage_address}/24 -%{ endif ~} kubelet: extraArgs: pod-max-pids: 1000 + rotate-server-certificates: true extraConfig: imageGCHighThresholdPercent: 75 imageGCLowThresholdPercent: 70 - nodeIP: - validSubnets: - - 10.13.37.0/24 - kernel: - modules: - - name: drbd - parameters: - - usermode_helper=disabled - - name: drbd_transport_tcp - - name: dm_thin_pool -%{ if gpu_enabled != false ~} - - name: i915 -%{ endif ~} nodeLabels: topology.kubernetes.io/region: ${cluster_name} topology.kubernetes.io/zone: ${node_name} @@ -55,6 +33,7 @@ cluster: disabled: true extraManifests: - https://github.com/kubernetes-sigs/gateway-api/releases/download/v${gateway-api_version}/standard-install.yaml + - https://raw.githubusercontent.com/alex1989hu/kubelet-serving-cert-approver/refs/heads/main/deploy/standalone-install.yaml inlineManifests: - name: cilium-bootstrap contents: | diff --git a/modules/talos-bootstrap/variables.tf b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/variables.tf similarity index 72% rename from modules/talos-bootstrap/variables.tf rename to pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/variables.tf index 095e6c6..34fb8e1 100644 --- a/modules/talos-bootstrap/variables.tf +++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/variables.tf @@ -17,11 +17,8 @@ variable "node_config" { variable "talos_nodes" { description = "List of Talos nodes to bootstrap" type = list(object({ - name = string - type = string - ipv4_address = string - storage_address = optional(string) - pvc_disks = optional(list(number)) - gpu_enabled = optional(bool, false) + name = string + type = string + ipv4_address = string })) } diff --git a/modules/talos-node/main.tf b/pve01.wheatley.in/k8s-wheatley/modules/talos-node/main.tf similarity index 54% rename from modules/talos-node/main.tf rename to pve01.wheatley.in/k8s-wheatley/modules/talos-node/main.tf index f5be63f..020a5f5 100644 --- a/modules/talos-node/main.tf +++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-node/main.tf @@ -2,27 +2,26 @@ terraform { required_providers { proxmox = { source = "bpg/proxmox" - version = "0.95.0" + version = "0.86.0" } } } resource "proxmox_virtual_environment_vm" "talos-node" { - vm_id = var.node.id - name = var.node.name - node_name = var.node.proxmox_node - tags = ["tofu"] - bios = "ovmf" + vm_id = var.node.id + name = var.node.name + node_name = var.node.proxmox_node + tags = ["tofu"] clone { - vm_id = 10000 + tonumber(replace(var.node.talos_version, ".", "")) + vm_id = 10000 + tonumber(replace(var.node.talos_version, ".", "")) retries = 3 } cpu { cores = var.node.cpu sockets = 1 - type = "host" + type = "x86-64-v2-AES" } memory { @@ -46,31 +45,6 @@ resource "proxmox_virtual_environment_vm" "talos-node" { } } - network_device { - bridge = "vmbr1" - model = "virtio" - mtu = 1500 - } - - dynamic "network_device" { - for_each = var.node.type == "worker" ? [1] : [] - content { - bridge = "vmbr2" - model = "virtio" - mtu = 9000 - } - } - - dynamic "hostpci" { - for_each = var.node.gpu == true ? [1] : [] - content { - device = "hostpci0" - mapping = "A380_GPU" - pcie = true - rombar = true - } - } - initialization { datastore_id = var.node.storagepool ip_config { @@ -83,10 +57,4 @@ resource "proxmox_virtual_environment_vm" "talos-node" { servers = ["9.9.9.9"] } } - - lifecycle { - ignore_changes = [ - clone, - ] - } } diff --git a/modules/talos-node/variables.tf b/pve01.wheatley.in/k8s-wheatley/modules/talos-node/variables.tf similarity index 89% rename from modules/talos-node/variables.tf rename to pve01.wheatley.in/k8s-wheatley/modules/talos-node/variables.tf index 26b7451..389306f 100644 --- a/modules/talos-node/variables.tf +++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-node/variables.tf @@ -2,12 +2,10 @@ variable "node" { description = "Basic configuration for the Talos node" type = object({ id = number - type = string name = string ipv4_address = string ipv4_gateway = string cpu = number - gpu = optional(bool, false) memory = number disk = string storagepool = string diff --git a/pve01.wheatley.in/k8s-wheatley/providers.tf b/pve01.wheatley.in/k8s-wheatley/providers.tf index 765f546..77de528 100644 --- a/pve01.wheatley.in/k8s-wheatley/providers.tf +++ b/pve01.wheatley.in/k8s-wheatley/providers.tf @@ -2,11 +2,11 @@ terraform { required_providers { talos = { source = "siderolabs/talos" - version = "0.10.1" + version = "0.9.0" } proxmox = { source = "bpg/proxmox" - version = "0.95.0" + version = "0.86.0" } } } diff --git a/pve01.wheatley.in/templates/.terraform.lock.hcl b/pve01.wheatley.in/templates/.terraform.lock.hcl deleted file mode 100644 index f16f884..0000000 --- a/pve01.wheatley.in/templates/.terraform.lock.hcl +++ /dev/null @@ -1,56 +0,0 @@ -# This file is maintained automatically by "tofu init". -# Manual edits may be lost in future updates. - -provider "registry.opentofu.org/bpg/proxmox" { - version = "0.95.0" - constraints = "0.95.0" - hashes = [ - "h1:8gOZBH6hYhvvr9ycmz8AVdgnABQPEft6q/qj2uIdDR8=", - "h1:APHNeh4Fayb+RnVzIUBGwD4pQZHEH6NBukvZKW9TETw=", - "h1:C/SnO5houq7BCNvpmH+QV+RbxcIyASlQm8dI51vxm34=", - "h1:HDn4A1XRSbaKd4RIzHJM/U1TBLw1llq5sAjB1oPS2yM=", - "h1:NamnpRo4NLLqhjWFw0lPr4V0Vm/hHqNOXfCbiPsv9WY=", - "h1:P/DYln7s7I2YWrowkkvrAdNXCYCOcccR38mcZLzidbs=", - "h1:QmOVJQiSH80Jdmc8T4CLKhkkHHtCohYpgNXTGyfYNX0=", - "h1:XqbY+SVrGaRp9T+nkw929kG3/4fp8SbFy7LUA2io8vU=", - "h1:aWrhONde+FDq3mgc3A2VJSvwt8R/gR+enf+GTww9TIU=", - "h1:nJblnO+z23prp5I9vqlR0C984dJ53Vpzj+ad3iPdig4=", - "h1:rnReS6P0e2uXYVMhpPgHb1B+eQrjXCnP8Hp6THLPqPg=", - "h1:s5DW5MUXT5Yspd7Z4qTrAnnSismfI7gqL4+aiMUuDY8=", - "h1:zEUJdG/8tJnHkjq1DZBqpkGuabZ6Ev1ExY4Y/ITHTVA=", - "h1:zxHxjwctc98DHZjOY4YOPkxYBk7cY28r0j9/6sI5o7I=", - "zh:07439b6c10c48c25357cd574d9db024adb21419865c5b22019a2d0493314b2fb", - "zh:29b56acca3df3d1ad1c0d677165192d59ec850c26d013e19a18cc94b11789b39", - "zh:35f73b7eeef23867633ee2d687c1cf015eb15ff128fc9527f018aaf0c58ef1ce", - "zh:4a479884f6549e8f5b11659c4fe9e3af4fc3f95440d7d8b54335d608361c731f", - "zh:4c89f62fb4528f15ae71fc91f792fe5e747ce162e7bf6124f21989d8805a3971", - "zh:510ccaaddb1add81563417dcb8f25f364988e8797293d2889b0bdbf623abe01b", - "zh:5d791e444e671f6b41c371fddec9d3aba8c8c5c8996ec0864b5aa8678b70feee", - "zh:5e655ca1b5d10cfebbe649952d073699005015082de897f3424faa80a9c13667", - "zh:71d639eaa7aaa7a6fa68a8bd546d864842c163ff4f2abc48176e287642156d27", - "zh:beb1f2ea7ca4e1e42373749b3b1a3dc7bb2bf283001eb9181e162da4f1345b07", - "zh:cd8116cfb4988c7157ec2ef18a3fb2bfa1020342fd66f99aa66ef8db678fe09d", - "zh:d0e3eacce028554d641ea7bfb857888559f9f92f3dcc00bdd5d8a3bc70768580", - "zh:e0eabff8250b428de253f064324fc878a27fa258a79aa76a1b0dab158986cec6", - "zh:eef582a3fcc21a7c7c29719ec1f969089f9bba8376a6bb0c8f5aa6c8f89a8ee0", - "zh:f26e0763dbe6a6b2195c94b44696f2110f7f55433dc142839be16b9697fa5597", - ] -} - -provider "registry.opentofu.org/hashicorp/http" { - version = "3.5.0" - constraints = "3.5.0" - hashes = [ - "h1:eClUBisXme48lqiUl3U2+H2a2mzDawS9biqfkd9synw=", - "zh:0a2b33494eec6a91a183629cf217e073be063624c5d3f70870456ddb478308e9", - "zh:180f40124fa01b98b3d2f79128646b151818e09d6a1a9ca08e0b032a0b1e9cb1", - "zh:3e29e1de149dc10bf78620526c7cb8c62cd76087f5630dfaba0e93cda1f3aa7b", - "zh:4420950200cf86042ec940d0e2c9b7c89966bf556bf8038ba36217eae663bca5", - "zh:5d1f7d02109b2e2dca7ec626e5563ee765583792d0fd64081286f16f9433bd0d", - "zh:8500b138d338b1994c4206aa577b5c44e1d7260825babcf43245a7075bfa52a5", - "zh:b42165a6c4cfb22825938272d12b676e4a6946ac4e750f85df870c947685df2d", - "zh:b919bf3ee8e3b01051a0da3433b443a925e272893d3724ee8fc0f666ec7012c9", - "zh:d13b81ea6755cae785b3e11634936cdff2dc1ec009dc9610d8e3c7eb32f42e69", - "zh:f1c9d2eb1a6b618ae77ad86649679241bd8d6aacec06d0a68d86f748687f4eb3", - ] -} diff --git a/pve01.wheatley.in/templates/README.md b/pve01.wheatley.in/templates/README.md deleted file mode 100644 index bdbca5d..0000000 --- a/pve01.wheatley.in/templates/README.md +++ /dev/null @@ -1,33 +0,0 @@ - -## Requirements - -| Name | Version | -|------|---------| -| [http](#requirement\_http) | 3.5.0 | -| [proxmox](#requirement\_proxmox) | 0.86.0 | - -## Providers - -No providers. - -## Modules - -| Name | Source | Version | -|------|--------|---------| -| [talos](#module\_talos) | ./talos | n/a | - -## Resources - -No resources. - -## Inputs - -| Name | Description | Type | Default | Required | -|------|-------------|------|---------|:--------:| -| [proxmox\_api\_token](#input\_proxmox\_api\_token) | Proxmox API token | `string` | n/a | yes | -| [proxmox\_endpoint](#input\_proxmox\_endpoint) | Proxmox API endpoint | `string` | n/a | yes | - -## Outputs - -No outputs. - \ No newline at end of file diff --git a/pve01.wheatley.in/templates/main.tf b/pve01.wheatley.in/templates/main.tf deleted file mode 100644 index eb46ee2..0000000 --- a/pve01.wheatley.in/templates/main.tf +++ /dev/null @@ -1,25 +0,0 @@ -terraform { - backend "s3" { - bucket = "13225-wheatley-states" - key = "pve01-templates.tfstate" - region = "main" - skip_credentials_validation = true - skip_metadata_api_check = true - skip_region_validation = true - force_path_style = true - } -} - -provider "proxmox" { - endpoint = var.proxmox_endpoint - api_token = var.proxmox_api_token - ssh { - agent = true - username = "tofu" - } -} - -module "talos" { - source = "./talos" - talos_versions = ["1.12.2"] -} diff --git a/pve01.wheatley.in/templates/talos/.terraform.lock.hcl b/pve01.wheatley.in/templates/talos/.terraform.lock.hcl new file mode 100644 index 0000000..9f1211b --- /dev/null +++ b/pve01.wheatley.in/templates/talos/.terraform.lock.hcl @@ -0,0 +1,42 @@ +# This file is maintained automatically by "tofu init". +# Manual edits may be lost in future updates. + +provider "registry.opentofu.org/bpg/proxmox" { + version = "0.86.0" + constraints = "0.86.0" + hashes = [ + "h1:brQxwkXGxNw5N2gNwwefF9XxzrudYgSyjHrRhdvAdjo=", + "zh:09b627b92a59848769fadfc3d8103eebf070a3800144bf03cb93f44472327f44", + "zh:0e19eb7f1047d541e50b97d7ac440ea73685d0c28ed2dbe64217cbe2f0b353e0", + "zh:20f1e70091ff3056876618c93afd79527c8995f955d153993e8fbb10fa42593b", + "zh:3920315be565976f5a9da0803f8f1a108221282f1bc9e21160669d793af4e0c8", + "zh:5133b2a2027428d3926eaa3bcdc0ab65a75305d54f6cbc7c54cce746dfddbc8e", + "zh:514c588b04738d55c9e6b1c5a4e3fb1ef4041dfb809d2268f14d29839ecfba59", + "zh:55916034025b4833bd6a93bb5948dfb7d00830a772ef74fa70898c6f7de0da0b", + "zh:58b485a4b0bde56ca7032fca0ac09cb4c6ff2579e06cf4f2a311bb695baa0df1", + "zh:75ebe44e6da4108af5fe02a9cd99ed0189985b486a2a56594952098d161ceb3d", + "zh:a8c870bfb5958a3d49d639db3c2761cfb453c6a6f95e5e241890922b11c8a4d8", + "zh:c2df2748b9be47a6c3e613667c64874d5cb1d3fbb5b985d6eb9c3af5af298454", + "zh:c3059668f4f81e450e555a47310e7042044b335f131643262fd51f9ba96f2214", + "zh:ddbbb23910666f70cf4a9587ba57b45f5f58c53a1f8d7cee1d6f90a3d3ef38ef", + "zh:e430138b897edcd3b64e4309db34ac872526187782626aa074d8d1647a0abfa8", + "zh:f26e0763dbe6a6b2195c94b44696f2110f7f55433dc142839be16b9697fa5597", + ] +} + +provider "registry.opentofu.org/hashicorp/http" { + version = "3.5.0" + hashes = [ + "h1:eClUBisXme48lqiUl3U2+H2a2mzDawS9biqfkd9synw=", + "zh:0a2b33494eec6a91a183629cf217e073be063624c5d3f70870456ddb478308e9", + "zh:180f40124fa01b98b3d2f79128646b151818e09d6a1a9ca08e0b032a0b1e9cb1", + "zh:3e29e1de149dc10bf78620526c7cb8c62cd76087f5630dfaba0e93cda1f3aa7b", + "zh:4420950200cf86042ec940d0e2c9b7c89966bf556bf8038ba36217eae663bca5", + "zh:5d1f7d02109b2e2dca7ec626e5563ee765583792d0fd64081286f16f9433bd0d", + "zh:8500b138d338b1994c4206aa577b5c44e1d7260825babcf43245a7075bfa52a5", + "zh:b42165a6c4cfb22825938272d12b676e4a6946ac4e750f85df870c947685df2d", + "zh:b919bf3ee8e3b01051a0da3433b443a925e272893d3724ee8fc0f666ec7012c9", + "zh:d13b81ea6755cae785b3e11634936cdff2dc1ec009dc9610d8e3c7eb32f42e69", + "zh:f1c9d2eb1a6b618ae77ad86649679241bd8d6aacec06d0a68d86f748687f4eb3", + ] +} diff --git a/pve01.wheatley.in/templates/talos/README.md b/pve01.wheatley.in/templates/talos/README.md deleted file mode 100644 index eff4004..0000000 --- a/pve01.wheatley.in/templates/talos/README.md +++ /dev/null @@ -1,36 +0,0 @@ - -## Requirements - -| Name | Version | -|------|---------| -| [proxmox](#requirement\_proxmox) | 0.86.0 | - -## Providers - -| Name | Version | -|------|---------| -| [http](#provider\_http) | n/a | -| [proxmox](#provider\_proxmox) | 0.86.0 | - -## Modules - -No modules. - -## Resources - -| Name | Type | -|------|------| -| [proxmox_virtual_environment_download_file.talos-image](https://registry.terraform.io/providers/bpg/proxmox/0.86.0/docs/resources/virtual_environment_download_file) | resource | -| [proxmox_virtual_environment_vm.talos-template](https://registry.terraform.io/providers/bpg/proxmox/0.86.0/docs/resources/virtual_environment_vm) | resource | -| [http_http.schematic](https://registry.terraform.io/providers/hashicorp/http/latest/docs/data-sources/http) | data source | - -## Inputs - -| Name | Description | Type | Default | Required | -|------|-------------|------|---------|:--------:| -| [talos\_versions](#input\_talos\_versions) | List of Talos versions to create templates for | `list(string)` | `[]` | no | - -## Outputs - -No outputs. - \ No newline at end of file diff --git a/pve01.wheatley.in/templates/talos/main.tf b/pve01.wheatley.in/templates/talos/main.tf index b10426a..61cbd78 100644 --- a/pve01.wheatley.in/templates/talos/main.tf +++ b/pve01.wheatley.in/templates/talos/main.tf @@ -1,12 +1,29 @@ terraform { - required_providers { - proxmox = { - source = "bpg/proxmox" - version = "0.95.0" - } + backend "s3" { + bucket = "13225-wheatley-states" + key = "pve01-templates.tfstate" + region = "main" + skip_credentials_validation = true + skip_metadata_api_check = true + skip_region_validation = true + force_path_style = true } } +provider "proxmox" { + endpoint = var.proxmox_endpoint + api_token = var.proxmox_api_token + ssh { + agent = true + username = "root" + } +} + + +locals { + talos_versions = ["1.11.5"] +} + data "http" "schematic" { url = "https://factory.talos.dev/schematics" method = "POST" @@ -23,20 +40,21 @@ locals { } resource "proxmox_virtual_environment_download_file" "talos-image" { - for_each = toset(var.talos_versions) + for_each = toset(local.talos_versions) node_name = "pve01" datastore_id = "local" content_type = "iso" - url = "https://factory.talos.dev/image/${local.schematic_id}/v${each.value}/nocloud-amd64-secureboot.iso" - file_name = "talos-${each.value}-nocloud-amd64-secureboot.iso" + url = "https://factory.talos.dev/image/${local.schematic_id}/v${each.value}/nocloud-amd64-secureboot.raw.gz" + file_name = "talos-${each.value}-nocloud-amd64-secureboot.img" + decompression_algorithm = "gz" } resource "proxmox_virtual_environment_vm" "talos-template" { depends_on = [proxmox_virtual_environment_download_file.talos-image] - for_each = toset(var.talos_versions) + for_each = toset(local.talos_versions) template = true vm_id = 10000 + tonumber(replace(each.value, ".", "")) @@ -55,7 +73,7 @@ resource "proxmox_virtual_environment_vm" "talos-template" { cpu { cores = 2 sockets = 1 - type = "host" + type = "x86-64-v2-AES" } memory { dedicated = 2048 @@ -75,4 +93,7 @@ resource "proxmox_virtual_environment_vm" "talos-template" { datastore_id = local.storagepool version = "v2.0" } + network_device { + bridge = "vmbr1" + } } diff --git a/pve01.wheatley.in/templates/providers.tf b/pve01.wheatley.in/templates/talos/providers.tf similarity index 87% rename from pve01.wheatley.in/templates/providers.tf rename to pve01.wheatley.in/templates/talos/providers.tf index de0ba54..aaaa45a 100644 --- a/pve01.wheatley.in/templates/providers.tf +++ b/pve01.wheatley.in/templates/talos/providers.tf @@ -2,7 +2,7 @@ terraform { required_providers { proxmox = { source = "bpg/proxmox" - version = "0.95.0" + version = "0.86.0" } http = { source = "hashicorp/http" diff --git a/pve01.wheatley.in/templates/talos/schematic.yaml b/pve01.wheatley.in/templates/talos/schematic.yaml index 9f77c1c..f27af6e 100644 --- a/pve01.wheatley.in/templates/talos/schematic.yaml +++ b/pve01.wheatley.in/templates/talos/schematic.yaml @@ -1,5 +1,4 @@ customization: systemExtensions: officialExtensions: - - siderolabs/drbd - siderolabs/qemu-guest-agent diff --git a/pve01.wheatley.in/templates/talos/variables.tf b/pve01.wheatley.in/templates/talos/variables.tf index 22784bb..086f9ff 100644 --- a/pve01.wheatley.in/templates/talos/variables.tf +++ b/pve01.wheatley.in/templates/talos/variables.tf @@ -1,5 +1,8 @@ -variable talos_versions { - description = "List of Talos versions to create templates for" - type = list(string) - default = [] +variable "proxmox_endpoint" { + description = "Proxmox API endpoint" + type = string +} +variable "proxmox_api_token" { + description = "Proxmox API token" + type = string } diff --git a/pve01.wheatley.in/templates/variables.tf b/pve01.wheatley.in/templates/variables.tf deleted file mode 100644 index 086f9ff..0000000 --- a/pve01.wheatley.in/templates/variables.tf +++ /dev/null @@ -1,8 +0,0 @@ -variable "proxmox_endpoint" { - description = "Proxmox API endpoint" - type = string -} -variable "proxmox_api_token" { - description = "Proxmox API token" - type = string -} diff --git a/renovate.json b/renovate.json deleted file mode 100644 index d2cdd71..0000000 --- a/renovate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:best-practices" - ], - "dependencyDashboard": true, - "dependencyDashboardTitle": "Renovate Dashboard", - "labels": [ - "renovate" - ], - "prHourlyLimit": 0, - "schedule": [ - "before 6am on Tuesday" - ] -}