From 1c11410c2d6a81cf749138f69c21a92dd28d9e6e Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 7 Jan 2026 00:53:11 -0800 Subject: [PATCH] More resource re-factors, upgrades and fixes for future work Housekeeping but the wiki got hosed :(( --- infra/vultr-kubernetes/backend.tf | 4 ++-- infra/vultr-kubernetes/health.tf | 4 ++-- infra/vultr-kubernetes/ingress.tf | 2 +- infra/vultr-kubernetes/namespaces.tf | 8 -------- infra/vultr-kubernetes/variables.tfvars | 4 ++-- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/infra/vultr-kubernetes/backend.tf b/infra/vultr-kubernetes/backend.tf index a411dee..a711123 100644 --- a/infra/vultr-kubernetes/backend.tf +++ b/infra/vultr-kubernetes/backend.tf @@ -13,7 +13,7 @@ terraform { } vultr = { source = "vultr/vultr" - version = "2.28.0" + version = "2.26.0" } kubernetes = { source = "hashicorp/kubernetes" @@ -25,7 +25,7 @@ terraform { } helm = { source = "hashicorp/helm" - version = "3.1.1" + version = "3.0.2" } tls = { source = "hashicorp/tls" diff --git a/infra/vultr-kubernetes/health.tf b/infra/vultr-kubernetes/health.tf index 788395b..fa06cab 100644 --- a/infra/vultr-kubernetes/health.tf +++ b/infra/vultr-kubernetes/health.tf @@ -1,4 +1,4 @@ -resource kubernetes_deployment health { +resource kubernetes_deployment_v1 health { metadata { name = "health" namespace = var.playground.namespace @@ -29,7 +29,7 @@ resource kubernetes_deployment health { } } -resource kubernetes_service health { +resource kubernetes_service_v1 health { metadata { name = "health" namespace = var.playground.namespace diff --git a/infra/vultr-kubernetes/ingress.tf b/infra/vultr-kubernetes/ingress.tf index 80fb5a9..bb4731c 100644 --- a/infra/vultr-kubernetes/ingress.tf +++ b/infra/vultr-kubernetes/ingress.tf @@ -1,7 +1,7 @@ locals { services = { code = kubernetes_service.gitea - sanity = kubernetes_service.health + sanity = kubernetes_service_v1.health uptime = kubernetes_service.kuma wiki = kubernetes_service.otterwiki } diff --git a/infra/vultr-kubernetes/namespaces.tf b/infra/vultr-kubernetes/namespaces.tf index e88418e..ecbfc47 100644 --- a/infra/vultr-kubernetes/namespaces.tf +++ b/infra/vultr-kubernetes/namespaces.tf @@ -7,12 +7,4 @@ resource kubernetes_namespace playground { } } -resource kubernetes_namespace openobserve { - metadata { - annotations = { - names = "openobserve" - } - name = "openobserve" - } -} diff --git a/infra/vultr-kubernetes/variables.tfvars b/infra/vultr-kubernetes/variables.tfvars index 8acdc1a..f30547c 100644 --- a/infra/vultr-kubernetes/variables.tfvars +++ b/infra/vultr-kubernetes/variables.tfvars @@ -1,11 +1,11 @@ cluster = { region = "lax" label = "athens-cluster" - version = "v1.33.0+3" + version = "v1.34.1+2" pools = { main = { node_quantity = 1 - plan = "vc2-2c-4gb" + plan = "vc2-1c-2gb" label = "main" min_nodes = 1 max_nodes = 2