multiport + naming

2025-05-18 00:29:58 +01:00
parent a53852b0c6
commit 3ff155e3e6
2 changed files with 31 additions and 14 deletions
@@ -210,6 +210,7 @@ resource "kubernetes_service" "automatic_service" {
      content {
        port        = port.value
        target_port = port.value
+        name        = replace("${each.key}${port.value}", "/(.{0,15})(.*)/", "$1")

      }
    }
@@ -310,7 +311,8 @@ resource "kubernetes_deployment_v1" "automatic" {
            for_each = each.value.service_port != null ? each.value.service_port : []
            content {
              container_port = port.value
-              name           = "${each.key}-${port.value}"
+              #              name           = "${each.key}-${port.value}"
+              name = replace("${each.key}${port.value}", "/(.{0,15})(.*)/", "$1")
            }
          }

@@ -6,18 +6,18 @@ kubernetes = {
    extra_manifest = ["/opt/kubernetes/Bookstack_kube/Bookstack.configmap.yaml", "/opt/kubernetes/Bookstack_kube/Bookstack.secret.yaml"]
    #image          = "linuxserver/bookstack:24.10.3"
    image        = "linuxserver/bookstack:latest"
-    service_port = [80,443]
+    service_port = [80, 443]
    database = {
      "image"     = "lscr.io/linuxserver/mariadb"
      "port"      = 3306
      "mountPath" = "/config"
    }
-#    requirements = {
-#      limits-cpu      = "18m"
-#      limits-memory   = "100Mi"
-#      requests-cpu    = "10m"
-#      requests-memory = "70Mi"
-#    }
+    #    requirements = {
+    #      limits-cpu      = "18m"
+    #      limits-memory   = "100Mi"
+    #      requests-cpu    = "10m"
+    #      requests-memory = "70Mi"
+    #    }
    secret_ref     = ["bookstack-credentials"]
    config_map_ref = ["config"]

@@ -198,7 +198,7 @@ kubernetes = {
    dns_nameservers  = "10.2.0.1"
    replicas         = 01
    image            = "qmcgaw/gluetun:latest"
-    service_port     = 8888
+    service_port     = [8888]
    extra_manifest   = ["/opt/kubernetes/Terraform_kube/external_manifests/gluetun/gluetun-secret-netherland.yaml"]
    security_context = true
    #    requirements = {
@@ -896,7 +896,7 @@ kubernetes = {
    namespace = "servarr"
    #replicas       = 0
    #    dns_nameservers     = "10.2.0.1"
-    service_port   = 9696
+    service_port   = [9696]
    extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/servarr/servarr-db.secret.yaml"]
    database       = {}

@@ -940,6 +940,21 @@ kubernetes = {


    }
+    pvc = {
+      prowlarr-config = {
+        name       = "prowlarr-config"
+        pvc_size   = "10Mi"
+        pvc        = true
+        mount_path = "/config"
+      }
+      servarr-data = {
+        name       = "servarr-data"
+        pvc_size   = "10Mi"
+        pvc        = false
+        host_path  = "/data"
+        mount_path = "/disk"
+      }
+    }

  }

@@ -1032,7 +1047,7 @@ kubernetes = {
    #enabled             = false
    image               = "lscr.io/linuxserver/qbittorrent:latest"
    connected_namespace = "servarr"
-    service_port        = 8080
+    service_port        = [8080]

    environment = {
      PUID = {
@@ -1144,7 +1159,7 @@ kubernetes = {
  wikijs = {
    #enabled             = false
    image          = "ghcr.io/requarks/wiki:2.5"
-    service_port   = 3000
+    service_port   = [3000]
    extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/wikijs/wikijs-db.secret.yaml"]
    database       = {}
    environment = {