change naming of svc to make them unique and quite some work on bitwarden

This commit is contained in:
2025-11-25 23:02:26 +00:00
parent 594d0af218
commit 3b933c8fe1
2 changed files with 267 additions and 25 deletions
+2 -2
View File
@@ -237,7 +237,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") name = replace("${port.value}${each.key}", "/(.{0,15})(.*)/", "$1")
} }
} }
@@ -339,7 +339,7 @@ resource "kubernetes_deployment_v1" "automatic" {
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") name = replace("${port.value}${each.key}", "/(.{0,15})(.*)/", "$1")
} }
} }
+244 -2
View File
@@ -643,7 +643,7 @@ kubernetes = {
#enabled = false #enabled = false
name = "tika" name = "tika"
connected_namespace = "paperless" connected_namespace = "paperless"
image = "ghcr.io/paperless-ngx/tika" image = "docker.io/apache/tika:latest"
service_port = [9998] service_port = [9998]
requirements = { requirements = {
limits-cpu = "1" limits-cpu = "1"
@@ -2088,7 +2088,7 @@ kubernetes = {
replicas = 0 replicas = 0
name = "bitwarden-admin" name = "bitwarden-admin"
image = "bitwarden/admin:2024.5.0" image = "bitwarden/admin:2024.5.0"
extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/config.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/global.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/global.override.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/mssql.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/mssql.override.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/uid.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/bitwarden-identity-cert-password.secret.yml"] extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/config.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/global.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/global.override.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/mssql.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/mssql.override.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/uid.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/bitwarden-identity-cert-password.secret.yml","/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/identity-svc.svc.yaml"]
service_port = [5000] service_port = [5000]
config_map_ref = ["global.env", "uid.env", "global.override.env"] config_map_ref = ["global.env", "uid.env", "global.override.env"]
environment = {} environment = {}
@@ -2176,7 +2176,249 @@ kubernetes = {
} }
} }
}
bitwarden-events = {
#enabled = false
connected_namespace = "bitwardent"
replicas = 0
name = "bitwarden-events"
image = "bitwarden/events:2024.5.0"
service_port = [5000]
config_map_ref = ["global.env", "uid.env", "global.override.env"]
environment = {}
pvc = {
bitwarden-ca-certificates = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/ca-certificates"
name = "bitwarden-ca-certificates"
}
bitwarden-logs = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/logs"
name = "bitwarden-logs"
sub_path = "events"
}
}
}
bitwarden-icons = {
#enabled = false
connected_namespace = "bitwardent"
replicas = 0
name = "bitwarden-icons"
image = "bitwarden/icons:2024.5.0"
service_port = [5000]
config_map_ref = ["global.env", "uid.env"]
environment = {}
pvc = {
bitwarden-ca-certificates = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/ca-certificates"
name = "bitwarden-ca-certificates"
}
bitwarden-logs = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/logs"
name = "bitwarden-logs"
sub_path = "icons"
}
}
}
bitwarden-identity = {
#enabled = false
connected_namespace = "bitwardent"
replicas = 0
name = "bitwarden-identity"
image = "gitea.tryton.geeraert.eu/pi-ux-ce/bitbetter_identity:2024.5.0"
service_port = [5000]
config_map_ref = ["global.env", "uid.env", "global.override.env"]
environment = {}
pvc = {
bitwarden-identity = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/identity"
name = "bitwarden-identity"
}
bitwarden-ca-certificates = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/ca-certificates"
name = "bitwarden-ca-certificates"
}
bitwarden-core = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/core"
name = "bitwarden-core"
}
bitwarden-logs = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/logs"
name = "bitwarden-logs"
sub_path = "identity"
}
}
}
bitwarden-mssql = {
#enabled = false
connected_namespace = "bitwardent"
replicas = 0
name = "bitwarden-mssql"
image = "bitwarden/mssql:2024.5.0"
service_port = [1433, 5000]
config_map_ref = ["mssql.env", "uid.env", "mssql.override.env"]
environment = {}
pvc = {
bitwarden-mssql = {
pvc = true
pvc_size = "2Mi"
mount_path = "/var/opt/mssql/data"
name = "bitwarden-mssql"
sub_path = "data"
}
bitwarden-logs = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/logs"
name = "bitwarden-logs"
sub_path = "mssql"
}
}
}
bitwarden-nginx = {
#enabled = false
connected_namespace = "bitwardent"
replicas = 0
name = "bitwarden-nginx"
image = "bitwarden/nginx:2024.5.0"
service_port = [5000, 8080, 8443]
config_map_ref = ["uid.env"]
environment = {}
pvc = {
bitwarden-nginx = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/nginx"
name = "bitwarden-nginx"
}
bitwarden-letsencrypt = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/letsencrypt"
name = "bitwarden-letsencrypt"
}
bitwarden-ssl = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/ssl"
name = "bitwarden-ssl"
}
bitwarden-logs = {
pvc = true
pvc_size = "2Mi"
mount_path = "/var/log/nginx"
name = "bitwarden-logs"
sub_path = "nginx"
}
}
}
bitwarden-notifications = {
#enabled = false
connected_namespace = "bitwardent"
replicas = 0
name = "bitwarden-notifications"
image = "bitwarden/notifications:2024.5.0"
service_port = [5000]
config_map_ref = ["global.env", "uid.env", "global.override.env"]
environment = {}
pvc = {
bitwarden-ca-certificates = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/ca-certificates"
name = "bitwarden-ca-certificates"
}
bitwarden-logs = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/logs"
name = "bitwarden-logs"
sub_path = "notifications"
}
}
}
bitwarden-sso = {
#enabled = false
connected_namespace = "bitwardent"
replicas = 0
name = "bitwarden-sso"
image = "bitwarden/sso:2024.5.0"
service_port = [5000]
config_map_ref = ["global.env", "uid.env", "global.override.env"]
environment = {}
pvc = {
bitwarden-identity = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/identity"
name = "bitwarden-identity"
}
bitwarden-core = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/core"
name = "bitwarden-core"
}
bitwarden-ca-certificates = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/ca-certificates"
name = "bitwarden-ca-certificates"
}
bitwarden-logs = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/logs"
name = "bitwarden-logs"
sub_path = "sso"
}
}
}
bitwarden-web = {
#enabled = false
connected_namespace = "bitwardent"
replicas = 0
name = "bitwarden-web"
image = "bitwarden/web:2024.5.0"
service_port = [5000]
config_map_ref = ["global.env", "uid.env"]
environment = {}
pvc = {
bitwarden-web = {
pvc = true
pvc_size = "2Mi"
mount_path = "/etc/bitwarden/web"
name = "bitwarden-web"
}
}
} }
sharelatex = { sharelatex = {
enabled = false enabled = false