scottk/terraform-talos
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/terraform-talos.git synced 2025-10-29 17:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

cosmetic

Browse Source
This commit is contained in:
Serge Logvinov
2024-11-02 16:06:53 +02:00
parent 17dac27379
commit d9d2a04b83
8 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
proxmox/.gitignore vendored
View File

@@ -9,3 +9,4 @@ terraform.tfvars.sops.json
#
age.key.txt
.env.yaml
secrets.proxmox.yaml

6
proxmox/Makefile
View File

@@ -80,8 +80,8 @@ system:
proxmox-cloud-controller-manager oci://ghcr.io/sergelogvinov/charts/proxmox-cloud-controller-manager
#
# File vars/secrets.proxmox.yaml should be created manually
# File vars/secrets.proxmox.yaml was created by terraform
#
kubectl --kubeconfig=kubeconfig apply -f vars/proxmox-ns.yaml
# helm --kubeconfig=kubeconfig secrets upgrade -i --namespace=csi-proxmox -f vars/proxmox-csi.yaml -f vars/secrets.proxmox.yaml \
# proxmox-csi-plugin oci://ghcr.io/sergelogvinov/charts/proxmox-csi-plugin
helm --kubeconfig=kubeconfig secrets upgrade -i --namespace=csi-proxmox -f vars/proxmox-csi.yaml -f vars/secrets.proxmox.yaml \
proxmox-csi-plugin oci://ghcr.io/sergelogvinov/charts/proxmox-csi-plugin

20
proxmox/instances-controlplane.tf
View File

@@ -204,8 +204,8 @@ resource "local_sensitive_file" "controlplane" {
"clusters" : [{
"url" : "https://${each.value.hvv4}:8006/api2/json",
"insecure" : true,
"token_id" : split("=", local.proxmox_token)[0],
"token_secret" : split("=", local.proxmox_token)[1],
"token_id" : split("=", local.proxmox_token_ccm)[0],
"token_secret" : split("=", local.proxmox_token_ccm)[1],
"region" : var.region,
}]
})
@@ -215,6 +215,22 @@ resource "local_sensitive_file" "controlplane" {
file_permission = "0600"
}
resource "local_sensitive_file" "csi" {
content = yamlencode({
"config" : {
"clusters" : [{
"url" : "https://${var.proxmox_host}:8006/api2/json",
"insecure" : true,
"token_id" : split("=", local.proxmox_token_csi)[0],
"token_secret" : split("=", local.proxmox_token_csi)[1],
"region" : var.region,
}]
}
})
filename = "vars/secrets.proxmox.yaml"
file_permission = "0600"
}
locals {
controlplane_config = { for k, v in local.controlplanes : k => "talosctl apply-config --insecure --nodes ${v.ipv6} --config-patch @_cfgs/${v.name}.yaml --file _cfgs/controlplane.yaml" }
}

2
proxmox/instances-db.tf
View File

@@ -88,7 +88,7 @@ resource "proxmox_virtual_environment_vm" "db" {
up_delay = 5
}
machine = "pc"
machine = "q35"
cpu {
architecture = "x86_64"
cores = each.value.cpu

2
proxmox/instances-web.tf
View File

@@ -105,7 +105,7 @@ resource "proxmox_virtual_environment_vm" "web" {
up_delay = 5
}
machine = "pc"
machine = "q35"
cpu {
architecture = "x86_64"
cores = each.value.cpu

2
proxmox/instances-worker.tf
View File

@@ -84,7 +84,7 @@ resource "proxmox_virtual_environment_vm" "worker" {
up_delay = 15
}
machine = "pc"
machine = "q35"
cpu {
architecture = "x86_64"
cores = each.value.cpu

3
proxmox/variables.tf
View File

@@ -43,7 +43,8 @@ data "terraform_remote_state" "init" {
locals {
kubernetes = jsondecode(data.sops_file.tfvars.raw)["kubernetes"]
proxmox_token = data.terraform_remote_state.init.outputs.ccm
proxmox_token_ccm = data.terraform_remote_state.init.outputs.ccm
proxmox_token_csi = data.terraform_remote_state.init.outputs.csi
}
variable "nodes" {

7
proxmox/vars/secrets.proxmox.yaml
View File

@@ -1,7 +0,0 @@
config:
clusters:
- region: region-1
url: https://172.16.0.128:8006/api2/json
insecure: true
token_id: kubernetes@pve!csi
token_secret: f6ead34e-11c0-4c4d-b8f3-7ae99b526ac0