diff --git a/infra/k8s/gitlab/runner-values.yaml b/infra/k8s/gitlab/runner-values.yaml index f87d46d76..2fabf3125 100644 --- a/infra/k8s/gitlab/runner-values.yaml +++ b/infra/k8s/gitlab/runner-values.yaml @@ -2,7 +2,7 @@ # Runner manager pod lives on gitlab node pool # Build pods spawn on ci-build pool (scale-to-zero) -gitlabUrl: https://gitlab.fxhnt.ai +gitlabUrl: https://git.fxhnt.ai # runnerToken set via --set at install time replicas: 1 diff --git a/infra/k8s/gitlab/values.yaml b/infra/k8s/gitlab/values.yaml index 8c634afb5..c2209e3c8 100644 --- a/infra/k8s/gitlab/values.yaml +++ b/infra/k8s/gitlab/values.yaml @@ -7,9 +7,9 @@ global: hosts: domain: fxhnt.ai gitlab: - name: gitlab.fxhnt.ai + name: git.fxhnt.ai registry: - name: gitlab.fxhnt.ai + name: git.fxhnt.ai ingress: enabled: false configureCertmanager: false diff --git a/infra/k8s/services/api-gateway.yaml b/infra/k8s/services/api-gateway.yaml index 763fecfdc..97d96a825 100644 --- a/infra/k8s/services/api-gateway.yaml +++ b/infra/k8s/services/api-gateway.yaml @@ -20,7 +20,7 @@ spec: - name: gitlab-registry containers: - name: api-gateway - image: gitlab.fxhnt.ai:5050/foxhunt/foxhunt/api_gateway:latest + image: git.fxhnt.ai:5050/foxhunt/foxhunt/api_gateway:latest ports: - containerPort: 50051 name: grpc diff --git a/infra/k8s/services/backtesting-service.yaml b/infra/k8s/services/backtesting-service.yaml index 666e05f1f..83e4dd315 100644 --- a/infra/k8s/services/backtesting-service.yaml +++ b/infra/k8s/services/backtesting-service.yaml @@ -20,7 +20,7 @@ spec: - name: gitlab-registry containers: - name: backtesting-service - image: gitlab.fxhnt.ai:5050/foxhunt/foxhunt/backtesting_service:latest + image: git.fxhnt.ai:5050/foxhunt/foxhunt/backtesting_service:latest ports: - containerPort: 50053 name: grpc diff --git a/infra/k8s/services/broker-gateway.yaml b/infra/k8s/services/broker-gateway.yaml index 2c0d89127..e4a78a7ae 100644 --- a/infra/k8s/services/broker-gateway.yaml +++ b/infra/k8s/services/broker-gateway.yaml @@ -20,7 +20,7 @@ spec: - name: gitlab-registry containers: - name: broker-gateway - image: gitlab.fxhnt.ai:5050/foxhunt/foxhunt/broker_gateway_service:latest + image: git.fxhnt.ai:5050/foxhunt/foxhunt/broker_gateway_service:latest ports: - containerPort: 50056 name: grpc diff --git a/infra/k8s/services/ml-training-service-gpu.yaml b/infra/k8s/services/ml-training-service-gpu.yaml index 3817260af..ae5736ebb 100644 --- a/infra/k8s/services/ml-training-service-gpu.yaml +++ b/infra/k8s/services/ml-training-service-gpu.yaml @@ -29,7 +29,7 @@ spec: - name: gitlab-registry containers: - name: ml-training-service - image: gitlab.fxhnt.ai:5050/foxhunt/foxhunt/ml_training_service:latest + image: git.fxhnt.ai:5050/foxhunt/foxhunt/ml_training_service:latest ports: - containerPort: 50053 name: grpc diff --git a/infra/k8s/services/ml-training-service.yaml b/infra/k8s/services/ml-training-service.yaml index 71a2571ce..e91de0ea3 100644 --- a/infra/k8s/services/ml-training-service.yaml +++ b/infra/k8s/services/ml-training-service.yaml @@ -20,7 +20,7 @@ spec: - name: gitlab-registry containers: - name: ml-training-service - image: gitlab.fxhnt.ai:5050/foxhunt/foxhunt/ml_training_service:latest + image: git.fxhnt.ai:5050/foxhunt/foxhunt/ml_training_service:latest ports: - containerPort: 50053 name: grpc diff --git a/infra/k8s/services/trading-agent-service.yaml b/infra/k8s/services/trading-agent-service.yaml index 5909756c9..df7533cc2 100644 --- a/infra/k8s/services/trading-agent-service.yaml +++ b/infra/k8s/services/trading-agent-service.yaml @@ -20,7 +20,7 @@ spec: - name: gitlab-registry containers: - name: trading-agent-service - image: gitlab.fxhnt.ai:5050/foxhunt/foxhunt/trading_agent_service:latest + image: git.fxhnt.ai:5050/foxhunt/foxhunt/trading_agent_service:latest ports: - containerPort: 50055 name: grpc diff --git a/infra/k8s/services/trading-service-gpu.yaml b/infra/k8s/services/trading-service-gpu.yaml index 0fd7162b8..2ff3c504f 100644 --- a/infra/k8s/services/trading-service-gpu.yaml +++ b/infra/k8s/services/trading-service-gpu.yaml @@ -29,7 +29,7 @@ spec: - name: gitlab-registry containers: - name: trading-service - image: gitlab.fxhnt.ai:5050/foxhunt/foxhunt/trading_service:latest + image: git.fxhnt.ai:5050/foxhunt/foxhunt/trading_service:latest ports: - containerPort: 50051 name: grpc diff --git a/infra/k8s/services/trading-service.yaml b/infra/k8s/services/trading-service.yaml index 954b64b0a..1b9ce633f 100644 --- a/infra/k8s/services/trading-service.yaml +++ b/infra/k8s/services/trading-service.yaml @@ -20,7 +20,7 @@ spec: - name: gitlab-registry containers: - name: trading-service - image: gitlab.fxhnt.ai:5050/foxhunt/foxhunt/trading_service:latest + image: git.fxhnt.ai:5050/foxhunt/foxhunt/trading_service:latest ports: - containerPort: 50051 name: grpc diff --git a/infra/k8s/services/web-gateway.yaml b/infra/k8s/services/web-gateway.yaml index 07b1a5dc7..81e3c10a7 100644 --- a/infra/k8s/services/web-gateway.yaml +++ b/infra/k8s/services/web-gateway.yaml @@ -20,7 +20,7 @@ spec: - name: gitlab-registry containers: - name: web-gateway - image: gitlab.fxhnt.ai:5050/foxhunt/foxhunt/web-gateway:latest + image: git.fxhnt.ai:5050/foxhunt/foxhunt/web-gateway:latest ports: - containerPort: 3000 name: http diff --git a/infra/live/production/dns/terragrunt.hcl b/infra/live/production/dns/terragrunt.hcl new file mode 100644 index 000000000..f3b543b77 --- /dev/null +++ b/infra/live/production/dns/terragrunt.hcl @@ -0,0 +1,14 @@ +include "root" { + path = find_in_parent_folders() +} + +terraform { + source = "../../../modules/dns" +} + +inputs = { + dns_zone = "fxhnt.ai" + # Tailscale subnet router IP — GitLab CE is accessed via this + # Update this after deploying GitLab and finding the routable IP + git_ip = "PLACEHOLDER_UPDATE_AFTER_DEPLOY" +} diff --git a/infra/modules/dns/main.tf b/infra/modules/dns/main.tf new file mode 100644 index 000000000..f6165e2b6 --- /dev/null +++ b/infra/modules/dns/main.tf @@ -0,0 +1,9 @@ +# DNS records for fxhnt.ai zone (Scaleway DNS) + +resource "scaleway_domain_record" "git" { + dns_zone = var.dns_zone + name = "git" + type = "A" + data = var.git_ip + ttl = 300 +} diff --git a/infra/modules/dns/outputs.tf b/infra/modules/dns/outputs.tf new file mode 100644 index 000000000..9473c4078 --- /dev/null +++ b/infra/modules/dns/outputs.tf @@ -0,0 +1,4 @@ +output "git_fqdn" { + description = "FQDN for the GitLab instance" + value = "${scaleway_domain_record.git.name}.${scaleway_domain_record.git.dns_zone}" +} diff --git a/infra/modules/dns/variables.tf b/infra/modules/dns/variables.tf new file mode 100644 index 000000000..fcb240a95 --- /dev/null +++ b/infra/modules/dns/variables.tf @@ -0,0 +1,10 @@ +variable "dns_zone" { + description = "DNS zone to manage records in" + type = string + default = "fxhnt.ai" +} + +variable "git_ip" { + description = "IP address for git.fxhnt.ai (Tailscale subnet router or ClusterIP)" + type = string +}