mirror of
https://github.com/dat515-2025/Group-8.git
synced 2026-03-22 06:57:47 +01:00
updates
Some checks are pending
Deploy Prod / Run Python Tests (push) Waiting to run
Deploy Prod / Build and push image (reusable) (push) Blocked by required conditions
Deploy Prod / Generate Production URLs (push) Blocked by required conditions
Deploy Prod / Frontend - Build and Deploy to Cloudflare Pages (prod) (push) Blocked by required conditions
Deploy Prod / Helm upgrade/install (prod) (push) Blocked by required conditions
Some checks are pending
Deploy Prod / Run Python Tests (push) Waiting to run
Deploy Prod / Build and push image (reusable) (push) Blocked by required conditions
Deploy Prod / Generate Production URLs (push) Blocked by required conditions
Deploy Prod / Frontend - Build and Deploy to Cloudflare Pages (prod) (push) Blocked by required conditions
Deploy Prod / Helm upgrade/install (prod) (push) Blocked by required conditions
This commit is contained in:
@@ -34,7 +34,7 @@ the application is packaged via a Helm chart.
|
|||||||
flowchart LR
|
flowchart LR
|
||||||
proc_queue[Message Queue] --> proc_queue_worker[Worker Service]
|
proc_queue[Message Queue] --> proc_queue_worker[Worker Service]
|
||||||
proc_queue_worker --> ext_mail[(Email 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 --> ext_bank[(Bank API)]
|
||||||
proc_queue_worker --> db
|
proc_queue_worker --> db
|
||||||
client[Client/Frontend] <--> svc[Backend API]
|
client[Client/Frontend] <--> svc[Backend API]
|
||||||
|
|||||||
@@ -105,14 +105,6 @@ module "database" {
|
|||||||
s3_key_secret = var.s3_key_secret
|
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" {
|
#module "redis" {
|
||||||
# source = "${path.module}/modules/redis"
|
# source = "${path.module}/modules/redis"
|
||||||
# depends_on = [module.storage]
|
# depends_on = [module.storage]
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -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
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
name: maxscale-helm
|
name: maxscale-helm
|
||||||
version: 1.0.14
|
version: 1.0.15
|
||||||
description: Helm chart for MaxScale related Kubernetes manifests
|
description: Helm chart for MaxScale related Kubernetes manifests
|
||||||
|
|||||||
@@ -154,6 +154,13 @@ spec:
|
|||||||
memory: 128Mi
|
memory: 128Mi
|
||||||
limits:
|
limits:
|
||||||
memory: 1Gi
|
memory: 1Gi
|
||||||
|
monitor:
|
||||||
|
interval: 2s
|
||||||
|
cooperativeMonitoring: majority_of_all
|
||||||
|
params:
|
||||||
|
auto_failover: "true"
|
||||||
|
auto_rejoin: "true"
|
||||||
|
switchover_on_low_disk_space: "true"
|
||||||
|
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
initialDelaySeconds: 20
|
initialDelaySeconds: 20
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ resource "helm_release" "mariadb-operator" {
|
|||||||
resource "helm_release" "maxscale_helm" {
|
resource "helm_release" "maxscale_helm" {
|
||||||
name = "maxscale-helm"
|
name = "maxscale-helm"
|
||||||
chart = "${path.module}/charts/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]
|
depends_on = [helm_release.mariadb-operator-crds, kubectl_manifest.secrets]
|
||||||
timeout = 3600
|
timeout = 3600
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user