Merge pull request '[deploy-opentofu]' (#295) from fenix-admin into dev

Reviewed-on: fenix-gitea-admin/iac-opentofu-private#295

documentation/start.txt

@@ -2,7 +2,7 @@ https://spacelift.io/blog/opentofu-tutorial - explaining language of opentofu
 
 https://opentofu.org/docs/intro/ - quick start and explaning who to work in team
 
-https://opentofu.org/docs/intro/ - CICD for opentofu explained 
+https://opentofu.org/docs/intro/ - CICD for opentofu explained
  
 
  

merge_yaml.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from ruamel.yaml import YAML 
+from ruamel.yaml import YAML
 import sys
 import json
 from collections.abc import Mapping

proxmox.tf

@@ -19,7 +19,7 @@ resource "proxmox_virtual_environment_download_file" "latest_ubunto_cloud_img" {
   content_type = "iso"
   datastore_id = "local"
   node_name    = "fenix"
-  url = "https://cloud-images.ubuntu.com/jammy/20251206/jammy-server-cloudimg-amd64.img"
+  url = "https://cloud-images.ubuntu.com/jammy/20250725/jammy-server-cloudimg-amd64.img"
   file_name = "jammyservercloudimgamd64.img"
 }
 
@@ -105,7 +105,6 @@ resource "proxmox_virtual_environment_vm" "proxmox-kubernetes-VM-template" {
 
   cpu {
     cores = 2
-    type = "host"
   }
 
   memory {
@@ -117,14 +116,13 @@ resource "proxmox_virtual_environment_vm" "proxmox-kubernetes-VM-template" {
     file_id      = proxmox_virtual_environment_download_file.latest_ubunto_cloud_img.id
     interface    = "scsi0"
     file_format  = "qcow2"
-    size         = 64
   }
 
   # Configuração da interface de rede
   network_device {
-    bridge = "vmbr0"  # rede de gestão para comunicação com Cluster B
+    bridge = "vmbr0"
   }
-  
+
 initialization {
     dns {
       servers = ["1.1.1.1"]
@@ -134,7 +132,6 @@ initialization {
         address = "dhcp"
       }
     }
-
   user_data_file_id = proxmox_virtual_environment_file.cloud_init_yaml.id
  }
 }
@@ -149,12 +146,10 @@ resource "proxmox_virtual_environment_vm" "k8s_vms" {
   
   clone {
     vm_id = proxmox_virtual_environment_vm.proxmox-kubernetes-VM-template.id
-    full = true
   }
 
   cpu {
     cores = each.value.cores
-    type = "host"
   }
 
   memory {
@@ -167,16 +162,6 @@ resource "proxmox_virtual_environment_vm" "k8s_vms" {
     interface    = "scsi1"
   }
 
-  # Bloco dinâmico para lista de hostpci
-  dynamic "hostpci" {
-    for_each = try(each.value.hostpci, [])
-    content {
-      device = hostpci.value.device
-      pcie   = try(hostpci.value.pcie, true)
-      mapping = hostpci.value.mapping 
-    }
-  }
-
   initialization {
       ip_config {
         ipv4 {

proxmox.variables.tf

@@ -40,13 +40,6 @@ variable "proxmox_k8s_vms" {
     vm_id     = number
     node_name  = string
     ip        = string
-    ip2        = string
-    ip3        = string
-    hostpci = optional(list(object({
-      pcie  = bool
-      device = string
-      mapping = string
-    })))
     cores     = optional(number)
     memory    = optional(number)
     data_store = optional(string)

secrets-output/iac.ansible.hosts.ini

@@ -1,13 +0,0 @@
-  
-[master]
-master1 ansible_host=192.168.1.99 ansible_user=user ansible_ssh_pass=pass ansible_ssh_common_args='-o StrictHostKeyChecking=no'
-
-[workers]
-  
-
-worker-192-168-1-101 ansible_host=192.168.1.101 ansible_user=user ansible_ssh_pass=pass ansible_ssh_common_args='-o StrictHostKeyChecking=no'
-  
-  
-
-
-

secrets/iac.proxmox.ssh.link

@@ -1 +0,0 @@
-proxmox-ssh.example.com

secrets/iac.vaultwarden-link

@@ -1 +0,0 @@
-https://vaultwarden.example.com

secrets/proxmox.secrets.tfvars

@@ -1,6 +1,6 @@
-#proxmox_server   = "proxmox.example.com"
+proxmox_server   = "proxmox.example.com"
-#PM_API_TOKEN_ID  = "tokenid"
+PM_API_TOKEN_ID  = "tokenid"
-#PM_API_TOKEN_SECRET = "tokensecret"
+PM_API_TOKEN_SECRET = "tokensecret"
 # tokenid is read automatically from PM_API_TOKEN_ID
 # token is read automatically from PM_API_TOKEN_SECRET
 
@@ -20,7 +20,6 @@ proxmox_k8s_vms = [
     vm_id     = 3001
     node_name = "node"
     ip        = "192.168.1.99/24"
-    ip3       = "192.168.1.199/24"
     cores     = 2
     memory    = 2000
     disk_size = 32
@@ -34,14 +33,13 @@ proxmox_k8s_vms = [
       }
     ]
     extra_packages = []
-    extra_runcmd   = ["sudo ip addr add 192.168.1.199/24 dev eth0"]
+    extra_runcmd   = []
   },
   {
     name      = "k8s-worker-01"
     vm_id     = 3002
     node_name = "node"
     ip        = "192.168.1.101/24"
-    ip3       = "192.168.1.201/24"
     cores     = 1
     memory    = 2000
     disk_size = 32
@@ -55,6 +53,6 @@ proxmox_k8s_vms = [
       }
     ]
     extra_packages = []
-    extra_runcmd   = ["sudo ip addr add 192.168.1.201/24 dev eth0"]
+    extra_runcmd   = []
   },
 ]

vaultwarden.tf

@@ -47,7 +47,7 @@ locals{
   hosts_ini = <<EOT
 
 [master]
-master1 ansible_host=${split("/", var.proxmox_k8s_vms[0].ip)[0]} ansible_user=${var.proxmox_k8s_vms[0].extra_users[0].name} ansible_ssh_pass=${var.proxmox_k8s_vms[0].extra_users[0].password} ansible_ssh_common_args='-o StrictHostKeyChecking=no'
+master-${replace(split("/", var.proxmox_k8s_vms[0].ip)[0], ".", "-")} ansible_host=${split("/", var.proxmox_k8s_vms[0].ip)[0]} ansible_user=${var.proxmox_k8s_vms[0].extra_users[0].name} ansible_ssh_pass=${var.proxmox_k8s_vms[0].extra_users[0].password} ansible_ssh_common_args='-o StrictHostKeyChecking=no'
 
 [workers]
 %{ for i, vm in var.proxmox_k8s_vms ~}