multiport + naming
This commit is contained in:
@@ -210,6 +210,7 @@ resource "kubernetes_service" "automatic_service" {
|
|||||||
content {
|
content {
|
||||||
port = port.value
|
port = port.value
|
||||||
target_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 : []
|
for_each = each.value.service_port != null ? each.value.service_port : []
|
||||||
content {
|
content {
|
||||||
container_port = port.value
|
container_port = port.value
|
||||||
name = "${each.key}-${port.value}"
|
# name = "${each.key}-${port.value}"
|
||||||
|
name = replace("${each.key}${port.value}", "/(.{0,15})(.*)/", "$1")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+26
-11
@@ -6,18 +6,18 @@ kubernetes = {
|
|||||||
extra_manifest = ["/opt/kubernetes/Bookstack_kube/Bookstack.configmap.yaml", "/opt/kubernetes/Bookstack_kube/Bookstack.secret.yaml"]
|
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:24.10.3"
|
||||||
image = "linuxserver/bookstack:latest"
|
image = "linuxserver/bookstack:latest"
|
||||||
service_port = [80,443]
|
service_port = [80, 443]
|
||||||
database = {
|
database = {
|
||||||
"image" = "lscr.io/linuxserver/mariadb"
|
"image" = "lscr.io/linuxserver/mariadb"
|
||||||
"port" = 3306
|
"port" = 3306
|
||||||
"mountPath" = "/config"
|
"mountPath" = "/config"
|
||||||
}
|
}
|
||||||
# requirements = {
|
# requirements = {
|
||||||
# limits-cpu = "18m"
|
# limits-cpu = "18m"
|
||||||
# limits-memory = "100Mi"
|
# limits-memory = "100Mi"
|
||||||
# requests-cpu = "10m"
|
# requests-cpu = "10m"
|
||||||
# requests-memory = "70Mi"
|
# requests-memory = "70Mi"
|
||||||
# }
|
# }
|
||||||
secret_ref = ["bookstack-credentials"]
|
secret_ref = ["bookstack-credentials"]
|
||||||
config_map_ref = ["config"]
|
config_map_ref = ["config"]
|
||||||
|
|
||||||
@@ -198,7 +198,7 @@ kubernetes = {
|
|||||||
dns_nameservers = "10.2.0.1"
|
dns_nameservers = "10.2.0.1"
|
||||||
replicas = 01
|
replicas = 01
|
||||||
image = "qmcgaw/gluetun:latest"
|
image = "qmcgaw/gluetun:latest"
|
||||||
service_port = 8888
|
service_port = [8888]
|
||||||
extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/gluetun/gluetun-secret-netherland.yaml"]
|
extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/gluetun/gluetun-secret-netherland.yaml"]
|
||||||
security_context = true
|
security_context = true
|
||||||
# requirements = {
|
# requirements = {
|
||||||
@@ -896,7 +896,7 @@ kubernetes = {
|
|||||||
namespace = "servarr"
|
namespace = "servarr"
|
||||||
#replicas = 0
|
#replicas = 0
|
||||||
# dns_nameservers = "10.2.0.1"
|
# 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"]
|
extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/servarr/servarr-db.secret.yaml"]
|
||||||
database = {}
|
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
|
#enabled = false
|
||||||
image = "lscr.io/linuxserver/qbittorrent:latest"
|
image = "lscr.io/linuxserver/qbittorrent:latest"
|
||||||
connected_namespace = "servarr"
|
connected_namespace = "servarr"
|
||||||
service_port = 8080
|
service_port = [8080]
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
PUID = {
|
PUID = {
|
||||||
@@ -1144,7 +1159,7 @@ kubernetes = {
|
|||||||
wikijs = {
|
wikijs = {
|
||||||
#enabled = false
|
#enabled = false
|
||||||
image = "ghcr.io/requarks/wiki:2.5"
|
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"]
|
extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/wikijs/wikijs-db.secret.yaml"]
|
||||||
database = {}
|
database = {}
|
||||||
environment = {
|
environment = {
|
||||||
|
|||||||
Reference in New Issue
Block a user