Merge pull request 'fenix-admin' (#311) from fenix-admin into dev

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

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

@@ -120,7 +120,7 @@ resource "proxmox_virtual_environment_vm" "proxmox-kubernetes-VM-template" {
 
   # Configuração da interface de rede
   network_device {
-    bridge = "vmbr0"
+    bridge = "vmbr0"  # rede de gestão para comunicação com Cluster A
   }
 
 initialization {
@@ -132,6 +132,7 @@ initialization {
         address = "dhcp"
       }
     }
+
   user_data_file_id = proxmox_virtual_environment_file.cloud_init_yaml.id
  }
 }

proxmox.variables.tf

@@ -40,6 +40,8 @@ variable "proxmox_k8s_vms" {
     vm_id     = number
     node_name  = string
     ip        = string
+    ip2        = string
+    ip3        = string
     cores     = optional(number)
     memory    = optional(number)
     data_store = optional(string)

secrets-output/iac.ansible.hosts.ini

@@ -0,0 +1,13 @@
+  
+[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

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

secrets/iac.vaultwarden-link

@@ -0,0 +1 @@
+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,6 +20,7 @@ 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
@@ -33,13 +34,14 @@ proxmox_k8s_vms = [
       }
     ]
     extra_packages = []
-    extra_runcmd   = []
+    extra_runcmd   = ["sudo ip addr add 192.168.1.199/24 dev eth0"]
   },
   {
     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
@@ -53,6 +55,6 @@ proxmox_k8s_vms = [
       }
     ]
     extra_packages = []
-    extra_runcmd   = []
+    extra_runcmd   = ["sudo ip addr add 192.168.1.201/24 dev eth0"]
   },
 ]

vaultwarden.tf

@@ -47,7 +47,7 @@ locals{
   hosts_ini = <<EOT
 
 [master]
-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'
+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'
 
 [workers]
 %{ for i, vm in var.proxmox_k8s_vms ~}