Cleaning up unused code

infra/dns/shockrah-xyz.tf

@@ -40,6 +40,7 @@ locals {
     { name = "sanity.shockrah.xyz",   records = [ var.vke_lb ] },
     { name = "uptime.shockrah.xyz",   records = [ var.vke_lb ] },
     { name = "code.shockrah.xyz",     records = [ var.vke_lb ] },
+    { name = "wiki.shockrah.xyz",     records = [ var.vke_lb ] },
   ]
 }
 

infra/vultr-kubernetes/cluster.tf

@@ -10,6 +10,7 @@ resource vultr_kubernetes athens {
     label         = var.cluster.pools["main"].label
     min_nodes     = var.cluster.pools["main"].min_nodes
     max_nodes     = var.cluster.pools["main"].max_nodes
+    auto_scaler   = true
   }
 }
 

infra/vultr-kubernetes/firewall.tf

@@ -8,16 +8,3 @@
 #   port = each.value
 # }
 
-resource vultr_firewall_group bastion {
-  description = "For connections into and out of the bastion host"
-}
-
-resource vultr_firewall_rule bastion_inbound {
-  firewall_group_id = vultr_firewall_group.bastion.id
-  protocol = "tcp"
-  ip_type = "v4"
-  subnet = "0.0.0.0"
-  subnet_size = 0
-  port = 22
-}
-

infra/vultr-kubernetes/git.tf

@@ -1,3 +1,6 @@
+# NOTE: this is a simple deployment for demo purposes only.
+# Currently it does support SSH access and lacks Gitea runners.
+# However a fully working setup can be found at: https://git.shockrah.xyz
 resource kubernetes_deployment gitea {
   metadata {
     name = "gitea"
@@ -28,7 +31,7 @@ resource kubernetes_deployment gitea {
             name = "gitea-main"
           }
           port {
-            container_port = 22
+            container_port = 2222
             name = "gitea-ssh"
           }
           volume_mount {
@@ -62,5 +65,10 @@ resource kubernetes_service gitea {
             port        = 3000
             name        = "http"
         }
+        port {
+          target_port = "gitea-ssh"
+          port        = 2222
+          name        = "ssh"
+        }
     }
 }

infra/vultr-kubernetes/ingress.tf

@@ -1,3 +1,11 @@
+locals {
+  services = {
+    code    = kubernetes_service.gitea
+    sanity  = kubernetes_service.health
+    uptime  = kubernetes_service.kuma
+    wiki    = kubernetes_service.otterwiki
+  }
+}
 resource kubernetes_ingress_v1 health {
     metadata {
         name = "health-ingress"
@@ -13,53 +21,25 @@ resource kubernetes_ingress_v1 health {
             hosts = [
                 "sanity.shockrah.xyz",
                 "uptime.shockrah.xyz",
-                "code.shockrah.xyz"
+                "code.shockrah.xyz",
+                "wiki.shockrah.xyz"
             ]
             secret_name = "shockrah"
         }
-        rule {
+        dynamic "rule" {
-            host = "sanity.shockrah.xyz"
+          for_each = local.services
+          content {
+            host = "${rule.key}.shockrah.xyz"
             http {
-                path {
+              path {
-                    path = "/"
+                path = "/"
-                    backend {
+                backend {
-                        service {
+                  service {
-                            name = kubernetes_service.health.metadata[0].name
+                    name = rule.value.metadata[0].name
-                            port {
-                                number = kubernetes_service.health.spec[0].port[0].port
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        rule {
-          host = "uptime.shockrah.xyz"
-          http {
-            path {
-              path = "/" 
-              backend {
-                service {
-                    name = kubernetes_service.kuma.metadata[0].name
                     port {
-                      number = kubernetes_service.kuma.spec[0].port[0].port
+                      number = rule.value.spec[0].port[0].port
-                    }
-                }
-              }
-            }
-          }
-        }
-        rule {
-          host = "code.shockrah.xyz"
-          http {
-            path {
-              path = "/" 
-              backend {
-                service {
-                    name = kubernetes_service.gitea.metadata[0].name
-                    port {
-                      number = kubernetes_service.gitea.spec[0].port[0].port
                     }
+                  }
                 }
               }
             }

infra/vultr-kubernetes/namespaces.tf

@@ -15,3 +15,4 @@ resource kubernetes_namespace openobserve {
     name = "openobserve"
     }
 }
+

infra/vultr-kubernetes/variables.tf

@@ -40,22 +40,10 @@ variable cluster {
 variable playground {
   type = object({
     namespace = string
-    health = object({
+    # TODO: Re-incorporate this var for templating later
-      dns = string
-    })
     tls = object({
       email = string
     })
   })
 }
 
-
-variable bastion {
-  type = object({
-    plan  = string
-    os    = string
-    label = string
-  })
-}
-
-

infra/vultr-kubernetes/variables.tfvars

@@ -5,7 +5,7 @@ cluster = {
   pools = {
     main = {
       node_quantity = 1
-      plan          =  "vc2-1c-2gb"
+      plan          =  "vc2-2c-4gb"
       label         = "main"
       min_nodes     = 1
       max_nodes     = 2
@@ -18,17 +18,7 @@ playground = {
   namespace = "playground"
   # Sanity check service that is used purely for the sake of ensuring
   # things are ( at a basic level ) functional
-  health = {
-    dns = "health"
-  }
   tls = {
     email = "dev@shockrah.xyz"
   }
 }
-
-bastion = {
-  plan  = "vc2-1c-2gb"
-  label = "bastion"
-  os    = "1743"
-}
-

infra/vultr-kubernetes/volumes.tf

@@ -30,3 +30,20 @@ resource kubernetes_persistent_volume_claim_v1 gitea {
       }
     }
 }
+
+
+resource kubernetes_persistent_volume_claim_v1 otterwiki {
+    metadata {
+      name = "otterwiki-data"
+      namespace = var.playground.namespace
+    }
+    spec {
+      volume_mode = "Filesystem"
+      access_modes = [ "ReadWriteOnce"]
+      resources {
+        requests = {
+          storage = "10Gi"
+        }
+      }
+    }
+}

infra/vultr-kubernetes/wiki.tf

@@ -0,0 +1,63 @@
+resource kubernetes_deployment otterwiki {
+    metadata {
+        name = "otterwiki"
+        namespace = var.playground.namespace
+        labels = {
+            "app" = "otterwiki"
+        }
+    }
+    spec {
+        replicas = 1
+        selector {
+            match_labels = {
+                "app" = "otterwiki"
+            }
+        }
+        template {
+            metadata {
+                labels = {
+                    "app" = "otterwiki"
+                }
+            }
+            spec {
+                container {
+                    name  = "otterwiki"
+                    image = "redimp/otterwiki:2"
+                    port {
+                        container_port = 8080
+                        name = "otterwiki-main"
+                    }
+                    volume_mount {
+                        name       = "otterwiki-data"
+                        mount_path = "/var/lib/otterwiki"
+                    }
+                }
+                volume {
+                    name = "otterwiki-data"
+                    persistent_volume_claim {
+                        claim_name = kubernetes_persistent_volume_claim_v1.otterwiki.metadata[0].name
+                    }
+                }
+            }
+        }
+    }
+}
+
+resource kubernetes_service otterwiki {
+    metadata {
+        name = "otterwiki"
+        namespace = var.playground.namespace
+    }
+    spec {
+        selector = {
+            "app" = "otterwiki"
+        }
+        port {
+            port        = 80
+            target_port = "otterwiki-main"
+            protocol    = "TCP"
+            name        = "http"
+        }
+    }
+}
+