From 6d5dd1a2221314a80b36e1573c0c6749365c93e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Trkan?= Date: Thu, 9 Oct 2025 18:51:17 +0200 Subject: [PATCH] feat(infrastructure): update deployment --- .../maxscale-helm/templates/config.yaml | 2 + 7project/tofu/modules/maxscale/main.tf | 55 ++++++++++--------- 7project/tofu/modules/rabbitmq/main.tf | 10 +++- .../tofu/modules/rabbitmq/rabbit-cluster.yaml | 2 +- 7project/tofu/modules/rabbitmq/rabbit-ui.yaml | 2 +- 5 files changed, 40 insertions(+), 31 deletions(-) diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml b/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml index f7f8d9f..f0fc501 100644 --- a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml +++ b/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml @@ -60,6 +60,8 @@ spec: scrapeTimeout: 10s prometheusRelease: kube-prometheus-stack jobLabel: mariadb-monitoring + auth: + generate: true tls: enabled: true diff --git a/7project/tofu/modules/maxscale/main.tf b/7project/tofu/modules/maxscale/main.tf index af5a401..de78a3f 100644 --- a/7project/tofu/modules/maxscale/main.tf +++ b/7project/tofu/modules/maxscale/main.tf @@ -9,16 +9,16 @@ terraform { version = "3.0.2" } kubernetes = { - source = "hashicorp/kubernetes" + source = "hashicorp/kubernetes" version = "2.38.0" } } } resource "kubernetes_namespace" "mariadb-operator" { - metadata { - name = "mariadb-operator" - } + metadata { + name = "mariadb-operator" + } } locals { @@ -30,46 +30,47 @@ locals { } resource "kubectl_manifest" "secrets" { - yaml_body = local.mariadb_secret_yaml - depends_on = [ kubernetes_namespace.mariadb-operator ] + yaml_body = local.mariadb_secret_yaml + depends_on = [kubernetes_namespace.mariadb-operator] } resource "helm_release" "mariadb-operator-crds" { - name = "mariadb-operator-crds" - repository = "https://helm.mariadb.com/mariadb-operator" - chart = "mariadb-operator-crds" - namespace = "mariadb-operator" - version = "25.8.4" - depends_on = [ kubectl_manifest.secrets ] - timeout = 3600 + name = "mariadb-operator-crds" + repository = "https://helm.mariadb.com/mariadb-operator" + chart = "mariadb-operator-crds" + namespace = "mariadb-operator" + version = "25.8.4" + depends_on = [kubectl_manifest.secrets] + timeout = 3600 } resource "helm_release" "mariadb-operator" { - name = "mariadb-operator" - repository = "https://helm.mariadb.com/mariadb-operator" - chart = "mariadb-operator" - depends_on = [ helm_release.mariadb-operator-crds, kubectl_manifest.secrets ] - namespace = "mariadb-operator" - timeout = 3600 + name = "mariadb-operator" + repository = "https://helm.mariadb.com/mariadb-operator" + chart = "mariadb-operator" + depends_on = [helm_release.mariadb-operator-crds, kubectl_manifest.secrets] + namespace = "mariadb-operator" + version = "25.8.3" + timeout = 3600 } resource "helm_release" "maxscale_helm" { name = "maxscale-helm" chart = "${path.module}/charts/maxscale-helm" version = "1.0.8" - depends_on = [ helm_release.mariadb-operator-crds, kubectl_manifest.secrets ] + depends_on = [helm_release.mariadb-operator-crds, kubectl_manifest.secrets] timeout = 3600 set = [ - { name = "user.name", value = var.mariadb_user_name }, - { name = "user.host", value = var.mariadb_user_host }, - { name = "metallb.maxscale_ip", value = var.maxscale_ip }, - { name = "metallb.service_ip", value = var.service_ip }, - { name = "metallb.primary_ip", value = var.primary_ip }, - { name = "metallb.secondary_ip", value = var.secondary_ip }, - { name = "phpmyadmin.enabled", value = tostring(var.phpmyadmin_enabled) }, + { name = "user.name", value = var.mariadb_user_name }, + { name = "user.host", value = var.mariadb_user_host }, + { name = "metallb.maxscale_ip", value = var.maxscale_ip }, + { name = "metallb.service_ip", value = var.service_ip }, + { name = "metallb.primary_ip", value = var.primary_ip }, + { name = "metallb.secondary_ip", value = var.secondary_ip }, + { name = "phpmyadmin.enabled", value = tostring(var.phpmyadmin_enabled) }, { name = "base_domain", value = var.cloudflare_domain } ] } diff --git a/7project/tofu/modules/rabbitmq/main.tf b/7project/tofu/modules/rabbitmq/main.tf index d104703..9da76f0 100644 --- a/7project/tofu/modules/rabbitmq/main.tf +++ b/7project/tofu/modules/rabbitmq/main.tf @@ -16,6 +16,12 @@ terraform { } } +resource "kubernetes_namespace" "rabbitmq_namespace" { + metadata { + name = "rabbitmq-system" + } +} + resource "helm_release" "rabbitmq_operator" { name = "rabbitmq-cluster-operator" @@ -24,8 +30,7 @@ resource "helm_release" "rabbitmq_operator" { version = "4.4.34" - namespace = "rabbitmq-system" - create_namespace = true + namespace = "rabbitmq-system" # Zde můžete přepsat výchozí hodnoty chartu, pokud by bylo potřeba # Například sledovat jen určité namespace, nastavit tolerations atd. @@ -59,6 +64,7 @@ resource "helm_release" "rabbitmq_operator" { value = "true" } ] + depends_on = [kubernetes_namespace.rabbitmq_namespace] } diff --git a/7project/tofu/modules/rabbitmq/rabbit-cluster.yaml b/7project/tofu/modules/rabbitmq/rabbit-cluster.yaml index 8bd8d95..48220b3 100644 --- a/7project/tofu/modules/rabbitmq/rabbit-cluster.yaml +++ b/7project/tofu/modules/rabbitmq/rabbit-cluster.yaml @@ -2,4 +2,4 @@ apiVersion: rabbitmq.com/v1beta1 kind: RabbitmqCluster metadata: name: 'rabbitmq-cluster' - namespace: "rabbitmq" + namespace: "rabbitmq-system" diff --git a/7project/tofu/modules/rabbitmq/rabbit-ui.yaml b/7project/tofu/modules/rabbitmq/rabbit-ui.yaml index a547e3f..8639bac 100644 --- a/7project/tofu/modules/rabbitmq/rabbit-ui.yaml +++ b/7project/tofu/modules/rabbitmq/rabbit-ui.yaml @@ -2,7 +2,7 @@ apiVersion: networking.cfargotunnel.com/v1alpha1 kind: TunnelBinding metadata: name: rabbit-tunnel-binding - namespace: rabbitmq + namespace: rabbitmq-system subjects: - name: rabbit-gui spec: