From 96ebc27001a2990975add813b5a63d21a83a61a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Trkan?= Date: Wed, 12 Nov 2025 17:34:50 +0100 Subject: [PATCH] updates --- 7project/report.md | 2 +- 7project/tofu/main.tf | 8 ---- 7project/tofu/modules/argocd/argocd-ui.yaml | 14 ------- 7project/tofu/modules/argocd/main.tf | 39 ------------------- 7project/tofu/modules/argocd/variables.tf | 12 ------ .../maxscale/charts/maxscale-helm/Chart.yaml | 2 +- .../maxscale-helm/templates/config.yaml | 7 ++++ 7project/tofu/modules/maxscale/main.tf | 2 +- 8 files changed, 10 insertions(+), 76 deletions(-) delete mode 100644 7project/tofu/modules/argocd/argocd-ui.yaml delete mode 100644 7project/tofu/modules/argocd/main.tf delete mode 100644 7project/tofu/modules/argocd/variables.tf diff --git a/7project/report.md b/7project/report.md index efd4c47..595123c 100644 --- a/7project/report.md +++ b/7project/report.md @@ -34,7 +34,7 @@ the application is packaged via a Helm chart. flowchart LR proc_queue[Message Queue] --> proc_queue_worker[Worker Service] proc_queue_worker --> ext_mail[(Email Service)] - proc_cron[Task planner] --> proc_queue + proc_cron[Cron] --> svc proc_queue_worker --> ext_bank[(Bank API)] proc_queue_worker --> db client[Client/Frontend] <--> svc[Backend API] diff --git a/7project/tofu/main.tf b/7project/tofu/main.tf index 2b54f81..49940f9 100644 --- a/7project/tofu/main.tf +++ b/7project/tofu/main.tf @@ -105,14 +105,6 @@ module "database" { s3_key_secret = var.s3_key_secret } -#module "argocd" { -# source = "${path.module}/modules/argocd" -# depends_on = [module.storage, module.loadbalancer, module.cloudflare] - -# argocd_admin_password = var.argocd_admin_password -# cloudflare_domain = var.cloudflare_domain -#} - #module "redis" { # source = "${path.module}/modules/redis" # depends_on = [module.storage] diff --git a/7project/tofu/modules/argocd/argocd-ui.yaml b/7project/tofu/modules/argocd/argocd-ui.yaml deleted file mode 100644 index e9f5c6b..0000000 --- a/7project/tofu/modules/argocd/argocd-ui.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: networking.cfargotunnel.com/v1alpha1 -kind: TunnelBinding -metadata: - name: argocd-tunnel-binding - namespace: argocd -subjects: - - name: argocd-server - spec: - target: https://argocd-server.argocd.svc.cluster.local - fqdn: argocd.${base_domain} - noTlsVerify: true -tunnelRef: - kind: ClusterTunnel - name: cluster-tunnel \ No newline at end of file diff --git a/7project/tofu/modules/argocd/main.tf b/7project/tofu/modules/argocd/main.tf deleted file mode 100644 index 2f45506..0000000 --- a/7project/tofu/modules/argocd/main.tf +++ /dev/null @@ -1,39 +0,0 @@ -terraform { - required_providers { - kubectl = { - source = "gavinbunney/kubectl" - version = "1.19.0" - } - helm = { - source = "hashicorp/helm" - version = "3.0.2" - } - kubernetes = { - source = "hashicorp/kubernetes" - version = "2.38.0" - } - } -} - -resource "kubernetes_namespace" "argocd" { - metadata { - name = "argocd" - } -} - -resource "helm_release" "argocd" { - name = "argocd" - namespace = "argocd" - repository = "https://argoproj.github.io/argo-helm" - chart = "argo-cd" - depends_on = [kubernetes_namespace.argocd] -} - -resource "kubectl_manifest" "argocd-tunnel-bind" { - depends_on = [helm_release.argocd] - - yaml_body = templatefile("${path.module}/argocd-ui.yaml", { - base_domain = var.cloudflare_domain - }) -} - diff --git a/7project/tofu/modules/argocd/variables.tf b/7project/tofu/modules/argocd/variables.tf deleted file mode 100644 index ba8b168..0000000 --- a/7project/tofu/modules/argocd/variables.tf +++ /dev/null @@ -1,12 +0,0 @@ -variable "argocd_admin_password" { - type = string - nullable = false - sensitive = true - description = "ArgoCD admin password" -} - -variable "cloudflare_domain" { - type = string - default = "Base cloudflare domain, e.g. example.com" - nullable = false -} \ No newline at end of file diff --git a/7project/tofu/modules/maxscale/charts/maxscale-helm/Chart.yaml b/7project/tofu/modules/maxscale/charts/maxscale-helm/Chart.yaml index e0aa74a..2b06f2c 100644 --- a/7project/tofu/modules/maxscale/charts/maxscale-helm/Chart.yaml +++ b/7project/tofu/modules/maxscale/charts/maxscale-helm/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: maxscale-helm -version: 1.0.14 +version: 1.0.15 description: Helm chart for MaxScale related Kubernetes manifests 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 f0fc501..df97912 100644 --- a/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml +++ b/7project/tofu/modules/maxscale/charts/maxscale-helm/templates/config.yaml @@ -154,6 +154,13 @@ spec: memory: 128Mi limits: memory: 1Gi + monitor: + interval: 2s + cooperativeMonitoring: majority_of_all + params: + auto_failover: "true" + auto_rejoin: "true" + switchover_on_low_disk_space: "true" livenessProbe: initialDelaySeconds: 20 diff --git a/7project/tofu/modules/maxscale/main.tf b/7project/tofu/modules/maxscale/main.tf index fe71b90..300bb2a 100644 --- a/7project/tofu/modules/maxscale/main.tf +++ b/7project/tofu/modules/maxscale/main.tf @@ -59,7 +59,7 @@ resource "helm_release" "mariadb-operator" { resource "helm_release" "maxscale_helm" { name = "maxscale-helm" chart = "${path.module}/charts/maxscale-helm" - version = "1.0.14" + version = "1.0.15" depends_on = [helm_release.mariadb-operator-crds, kubectl_manifest.secrets] timeout = 3600