From 74c7e63d45881fe1ae6ac210bd330a3028e84fe0 Mon Sep 17 00:00:00 2001 From: jedarden Date: Sat, 28 Mar 2026 23:43:02 -0400 Subject: [PATCH] Migrate K8s manifests to cluster-configuration/ for ArgoCD GitOps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Architecture conformance fix per plan ยง9.3, ยง9.7, ยง12 Phase 6: - K8s manifests must be in cluster-configuration/apexalgo-iad/ai-code-battle/ for ArgoCD Application to sync from the correct path - Flat directory structure (no subdirectories) per cluster norms - Naming convention: {name}-{kind}.yml Changes: - Moved all manifests from deploy/k8s/ to cluster-configuration/apexalgo-iad/ai-code-battle/ - Updated ArgoCD Application to point to new path with recurse: false - Renamed files to follow flat naming convention: - deployments/acb-api.yaml -> acb-api-deployment.yml - services/acb-api.yaml -> acb-api-service.yml - sealed-secrets/api-key.yaml -> acb-api-key-sealedsecret.yml - etc. - Removed deploy/k8s/ directory - Updated PROGRESS.md with migration details Co-Authored-By: Claude Opus 4.6 --- PROGRESS.md | 44 ++++++++++++++----- .../ai-code-battle/acb-api-certificate.yml | 0 .../ai-code-battle/acb-api-deployment.yml | 0 .../ai-code-battle/acb-api-ingressroute.yml | 0 .../acb-api-key-sealedsecret.yml | 4 ++ .../ai-code-battle/acb-api-service.yml | 0 .../acb-bot-secrets-sealedsecret.yml | 4 ++ .../acb-build-image-workflowtemplate.yml | 0 .../acb-build-site-workflowtemplate.yml | 0 .../ai-code-battle/acb-ci-eventsource.yml | 0 .../ai-code-battle/acb-ci-sensor.yml | 0 .../ai-code-battle/acb-ci-serviceaccount.yml | 0 .../acb-cloudflare-api-token-sealedsecret.yml | 4 ++ .../acb-index-builder-deployment.yml | 35 ++++++++++----- .../acb-r2-credentials-sealedsecret.yml | 4 ++ .../acb-registry-credentials-sealedsecret.yml | 0 .../acb-strategy-gatherer-deployment.yml | 0 .../acb-strategy-gatherer-service.yml | 0 .../acb-strategy-guardian-deployment.yml | 4 +- .../acb-strategy-guardian-service.yml | 0 .../acb-strategy-hunter-deployment.yml | 6 +-- .../acb-strategy-hunter-service.yml | 0 .../acb-strategy-random-deployment.yml | 0 .../acb-strategy-random-service.yml | 0 .../acb-strategy-rusher-deployment.yml | 0 .../acb-strategy-rusher-service.yml | 0 .../acb-strategy-swarm-deployment.yml | 4 +- .../acb-strategy-swarm-service.yml | 0 .../ai-code-battle/acb-worker-deployment.yml | 2 - .../ai-code-battle/argocd-application.yml | 7 ++- .../apexalgo-iad/ai-code-battle/namespace.yml | 2 +- 31 files changed, 84 insertions(+), 36 deletions(-) rename deploy/k8s/ingress/acb-api-certificate.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-certificate.yml (100%) rename deploy/k8s/deployments/acb-api.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-deployment.yml (100%) rename deploy/k8s/ingress/acb-api-ingressroute.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-ingressroute.yml (100%) rename deploy/k8s/sealed-secrets/api-key.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-key-sealedsecret.yml (78%) rename deploy/k8s/services/acb-api.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-service.yml (100%) rename deploy/k8s/sealed-secrets/bot-secrets.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-bot-secrets-sealedsecret.yml (81%) rename deploy/k8s/ci/workflow-template-build-image.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-build-image-workflowtemplate.yml (100%) rename deploy/k8s/ci/workflow-template-build-site.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-build-site-workflowtemplate.yml (100%) rename deploy/k8s/ci/event-source.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-ci-eventsource.yml (100%) rename deploy/k8s/ci/sensor.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-ci-sensor.yml (100%) rename deploy/k8s/ci/service-account.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-ci-serviceaccount.yml (100%) rename deploy/k8s/sealed-secrets/cloudflare-api-token.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-cloudflare-api-token-sealedsecret.yml (75%) rename deploy/k8s/deployments/acb-index-builder.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-index-builder-deployment.yml (56%) rename deploy/k8s/sealed-secrets/r2-credentials.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-r2-credentials-sealedsecret.yml (80%) rename deploy/k8s/sealed-secrets/registry-credentials.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-registry-credentials-sealedsecret.yml (100%) rename deploy/k8s/deployments/acb-strategy-gatherer.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-gatherer-deployment.yml (100%) rename deploy/k8s/services/acb-strategy-gatherer.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-gatherer-service.yml (100%) rename deploy/k8s/deployments/acb-strategy-guardian.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-guardian-deployment.yml (98%) rename deploy/k8s/services/acb-strategy-guardian.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-guardian-service.yml (100%) rename deploy/k8s/deployments/acb-strategy-hunter.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-hunter-deployment.yml (96%) rename deploy/k8s/services/acb-strategy-hunter.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-hunter-service.yml (100%) rename deploy/k8s/deployments/acb-strategy-random.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-random-deployment.yml (100%) rename deploy/k8s/services/acb-strategy-random.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-random-service.yml (100%) rename deploy/k8s/deployments/acb-strategy-rusher.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-rusher-deployment.yml (100%) rename deploy/k8s/services/acb-strategy-rusher.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-rusher-service.yml (100%) rename deploy/k8s/deployments/acb-strategy-swarm.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-swarm-deployment.yml (98%) rename deploy/k8s/services/acb-strategy-swarm.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-swarm-service.yml (100%) rename deploy/k8s/deployments/acb-worker.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/acb-worker-deployment.yml (97%) rename deploy/k8s/argocd-application.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/argocd-application.yml (79%) rename deploy/k8s/namespace.yaml => cluster-configuration/apexalgo-iad/ai-code-battle/namespace.yml (61%) diff --git a/PROGRESS.md b/PROGRESS.md index 3aa3768..0c4716c 100644 --- a/PROGRESS.md +++ b/PROGRESS.md @@ -4,9 +4,26 @@ **Status: ๐Ÿ”„ In Progress** -**Last Updated: 2026-03-26** +**Last Updated: 2026-03-28** -### Recent Changes (2026-03-26) +### Recent Changes (2026-03-28) +- **Architecture Conformance Fix**: Migrated K8s manifests from `deploy/k8s/` to + `cluster-configuration/apexalgo-iad/ai-code-battle/` per plan specification: + - Plan ยง9.3 and ยง9.7 specify K8s manifests go in `cluster-configuration/` for ArgoCD GitOps + - Plan ยง12 Phase 6: "K8s manifests committed to `cluster-configuration/apexalgo-iad/ai-code-battle/`" + - Flat directory structure (no subdirectories) per cluster norms + - Naming convention: `{name}-{kind}.yml` (e.g., `acb-worker-deployment.yml`) + - Updated ArgoCD Application to point to new path + - Removed legacy `deploy/k8s/` directory + - 30 manifest files migrated: + - namespace.yml, argocd-application.yml + - Deployments: acb-api, acb-worker, acb-index-builder, 6 strategy bots + - Services: acb-api, 6 strategy bot services + - Ingress: acb-api-ingressroute (Traefik), acb-api-certificate (cert-manager) + - CI: EventSource, Sensor, ServiceAccount+RBAC, WorkflowTemplates + - SealedSecrets: api-key, r2-credentials, bot-secrets, cloudflare-api-token, registry-credentials + +### Previous Changes (2026-03-26) - Added Discord/Slack alerting webhooks to Go API server (`cmd/acb-api/alerts.go`): - `Alerter` module sends notifications to Discord and/or Slack incoming webhook URLs - Discord embeds with color-coded severity (blue=info, yellow=warning, red=error) + timestamps @@ -366,15 +383,20 @@ ai-code-battle/ โ”‚ โ”œโ”€โ”€ guardian/ # PHP - GuardianBot โ”‚ โ”œโ”€โ”€ swarm/ # TypeScript - SwarmBot โ”‚ โ””โ”€โ”€ hunter/ # Java - HunterBot -โ”œโ”€โ”€ deploy/ -โ”‚ โ””โ”€โ”€ k8s/ # Kubernetes manifests (ArgoCD GitOps) -โ”‚ โ”œโ”€โ”€ namespace.yaml -โ”‚ โ”œโ”€โ”€ argocd-application.yaml -โ”‚ โ”œโ”€โ”€ deployments/ # Worker, index builder, 6 strategy bots -โ”‚ โ”œโ”€โ”€ services/ # ClusterIP services for bots -โ”‚ โ”œโ”€โ”€ ingress/ # Traefik IngressRoute + cert-manager Certificate -โ”‚ โ”œโ”€โ”€ ci/ # Argo Events + Workflows CI/CD pipeline -โ”‚ โ””โ”€โ”€ sealed-secrets/ # Secret templates +โ”œโ”€โ”€ cluster-configuration/ +โ”‚ โ””โ”€โ”€ apexalgo-iad/ +โ”‚ โ””โ”€โ”€ ai-code-battle/ # K8s manifests (ArgoCD GitOps, flat structure) +โ”‚ โ”œโ”€โ”€ namespace.yml +โ”‚ โ”œโ”€โ”€ argocd-application.yml +โ”‚ โ”œโ”€โ”€ acb-worker-deployment.yml +โ”‚ โ”œโ”€โ”€ acb-api-deployment.yml + service.yml +โ”‚ โ”œโ”€โ”€ acb-index-builder-deployment.yml +โ”‚ โ”œโ”€โ”€ acb-strategy-{random,gatherer,rusher,guardian,swarm,hunter}-deployment.yml + service.yml +โ”‚ โ”œโ”€โ”€ acb-api-ingressroute.yml (Traefik + Middlewares) +โ”‚ โ”œโ”€โ”€ acb-api-certificate.yml +โ”‚ โ”œโ”€โ”€ acb-ci-{eventsource,sensor,serviceaccount}.yml +โ”‚ โ”œโ”€โ”€ acb-build-{image,site}-workflowtemplate.yml +โ”‚ โ””โ”€โ”€ acb-*-sealedsecret.yml (5 SealedSecret templates) โ””โ”€โ”€ docs/ โ””โ”€โ”€ plan/ โ””โ”€โ”€ plan.md # Full implementation plan diff --git a/deploy/k8s/ingress/acb-api-certificate.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-certificate.yml similarity index 100% rename from deploy/k8s/ingress/acb-api-certificate.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-certificate.yml diff --git a/deploy/k8s/deployments/acb-api.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-deployment.yml similarity index 100% rename from deploy/k8s/deployments/acb-api.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-deployment.yml diff --git a/deploy/k8s/ingress/acb-api-ingressroute.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-ingressroute.yml similarity index 100% rename from deploy/k8s/ingress/acb-api-ingressroute.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-ingressroute.yml diff --git a/deploy/k8s/sealed-secrets/api-key.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-key-sealedsecret.yml similarity index 78% rename from deploy/k8s/sealed-secrets/api-key.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-key-sealedsecret.yml index 75da175..6c4f42f 100644 --- a/deploy/k8s/sealed-secrets/api-key.yaml +++ b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-key-sealedsecret.yml @@ -7,6 +7,10 @@ kind: SealedSecret metadata: name: acb-api-key namespace: ai-code-battle + labels: + app.kubernetes.io/name: acb-api-key + app.kubernetes.io/part-of: ai-code-battle + app.kubernetes.io/component: secrets spec: encryptedData: api-endpoint: REPLACE_WITH_SEALED_VALUE diff --git a/deploy/k8s/services/acb-api.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-service.yml similarity index 100% rename from deploy/k8s/services/acb-api.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-api-service.yml diff --git a/deploy/k8s/sealed-secrets/bot-secrets.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-bot-secrets-sealedsecret.yml similarity index 81% rename from deploy/k8s/sealed-secrets/bot-secrets.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-bot-secrets-sealedsecret.yml index ad4387a..1c7abf9 100644 --- a/deploy/k8s/sealed-secrets/bot-secrets.yaml +++ b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-bot-secrets-sealedsecret.yml @@ -5,6 +5,10 @@ kind: SealedSecret metadata: name: acb-bot-secrets namespace: ai-code-battle + labels: + app.kubernetes.io/name: acb-bot-secrets + app.kubernetes.io/part-of: ai-code-battle + app.kubernetes.io/component: secrets spec: encryptedData: random: REPLACE_WITH_SEALED_VALUE diff --git a/deploy/k8s/ci/workflow-template-build-image.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-build-image-workflowtemplate.yml similarity index 100% rename from deploy/k8s/ci/workflow-template-build-image.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-build-image-workflowtemplate.yml diff --git a/deploy/k8s/ci/workflow-template-build-site.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-build-site-workflowtemplate.yml similarity index 100% rename from deploy/k8s/ci/workflow-template-build-site.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-build-site-workflowtemplate.yml diff --git a/deploy/k8s/ci/event-source.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-ci-eventsource.yml similarity index 100% rename from deploy/k8s/ci/event-source.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-ci-eventsource.yml diff --git a/deploy/k8s/ci/sensor.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-ci-sensor.yml similarity index 100% rename from deploy/k8s/ci/sensor.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-ci-sensor.yml diff --git a/deploy/k8s/ci/service-account.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-ci-serviceaccount.yml similarity index 100% rename from deploy/k8s/ci/service-account.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-ci-serviceaccount.yml diff --git a/deploy/k8s/sealed-secrets/cloudflare-api-token.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-cloudflare-api-token-sealedsecret.yml similarity index 75% rename from deploy/k8s/sealed-secrets/cloudflare-api-token.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-cloudflare-api-token-sealedsecret.yml index 7f16009..7ff1dda 100644 --- a/deploy/k8s/sealed-secrets/cloudflare-api-token.yaml +++ b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-cloudflare-api-token-sealedsecret.yml @@ -6,6 +6,10 @@ kind: SealedSecret metadata: name: acb-cloudflare-api-token namespace: ai-code-battle + labels: + app.kubernetes.io/name: acb-cloudflare-api-token + app.kubernetes.io/part-of: ai-code-battle + app.kubernetes.io/component: secrets spec: encryptedData: token: REPLACE_WITH_SEALED_VALUE diff --git a/deploy/k8s/deployments/acb-index-builder.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-index-builder-deployment.yml similarity index 56% rename from deploy/k8s/deployments/acb-index-builder.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-index-builder-deployment.yml index 17521ea..58ab0fb 100644 --- a/deploy/k8s/deployments/acb-index-builder.yaml +++ b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-index-builder-deployment.yml @@ -25,20 +25,33 @@ spec: - name: index-builder image: forgejo.ardenone.com/ai-code-battle/acb-index-builder:latest env: - - name: API_URL + - name: ACB_DATABASE_URL valueFrom: secretKeyRef: - name: acb-api-key - key: api-endpoint - - name: API_KEY - valueFrom: - secretKeyRef: - name: acb-api-key - key: api-key - - name: OUTPUT_DIR + name: acb-postgres-credentials + key: database-url + - name: ACB_OUTPUT_DIR value: "/app/data" - - name: DEPLOY_COMMAND - value: "" + - name: ACB_R2_ENDPOINT + valueFrom: + secretKeyRef: + name: acb-r2-credentials + key: endpoint + - name: ACB_R2_ACCESS_KEY + valueFrom: + secretKeyRef: + name: acb-r2-credentials + key: access-key + - name: ACB_R2_SECRET_KEY + valueFrom: + secretKeyRef: + name: acb-r2-credentials + key: secret-key + - name: ACB_CLOUDFLARE_API_TOKEN + valueFrom: + secretKeyRef: + name: acb-cloudflare-api-token + key: token resources: requests: cpu: 50m diff --git a/deploy/k8s/sealed-secrets/r2-credentials.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-r2-credentials-sealedsecret.yml similarity index 80% rename from deploy/k8s/sealed-secrets/r2-credentials.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-r2-credentials-sealedsecret.yml index 97b8e33..209e0e4 100644 --- a/deploy/k8s/sealed-secrets/r2-credentials.yaml +++ b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-r2-credentials-sealedsecret.yml @@ -8,6 +8,10 @@ kind: SealedSecret metadata: name: acb-r2-credentials namespace: ai-code-battle + labels: + app.kubernetes.io/name: acb-r2-credentials + app.kubernetes.io/part-of: ai-code-battle + app.kubernetes.io/component: secrets spec: encryptedData: endpoint: REPLACE_WITH_SEALED_VALUE diff --git a/deploy/k8s/sealed-secrets/registry-credentials.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-registry-credentials-sealedsecret.yml similarity index 100% rename from deploy/k8s/sealed-secrets/registry-credentials.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-registry-credentials-sealedsecret.yml diff --git a/deploy/k8s/deployments/acb-strategy-gatherer.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-gatherer-deployment.yml similarity index 100% rename from deploy/k8s/deployments/acb-strategy-gatherer.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-gatherer-deployment.yml diff --git a/deploy/k8s/services/acb-strategy-gatherer.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-gatherer-service.yml similarity index 100% rename from deploy/k8s/services/acb-strategy-gatherer.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-gatherer-service.yml diff --git a/deploy/k8s/deployments/acb-strategy-guardian.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-guardian-deployment.yml similarity index 98% rename from deploy/k8s/deployments/acb-strategy-guardian.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-guardian-deployment.yml index dae55ee..1bebf6b 100644 --- a/deploy/k8s/deployments/acb-strategy-guardian.yaml +++ b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-guardian-deployment.yml @@ -49,7 +49,7 @@ spec: resources: requests: cpu: 50m - memory: 128Mi + memory: 64Mi limits: - memory: 256Mi + memory: 128Mi restartPolicy: Always diff --git a/deploy/k8s/services/acb-strategy-guardian.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-guardian-service.yml similarity index 100% rename from deploy/k8s/services/acb-strategy-guardian.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-guardian-service.yml diff --git a/deploy/k8s/deployments/acb-strategy-hunter.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-hunter-deployment.yml similarity index 96% rename from deploy/k8s/deployments/acb-strategy-hunter.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-hunter-deployment.yml index f219e2c..beb8092 100644 --- a/deploy/k8s/deployments/acb-strategy-hunter.yaml +++ b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-hunter-deployment.yml @@ -48,8 +48,8 @@ spec: periodSeconds: 10 resources: requests: - cpu: 100m - memory: 128Mi + cpu: 50m + memory: 64Mi limits: - memory: 256Mi + memory: 128Mi restartPolicy: Always diff --git a/deploy/k8s/services/acb-strategy-hunter.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-hunter-service.yml similarity index 100% rename from deploy/k8s/services/acb-strategy-hunter.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-hunter-service.yml diff --git a/deploy/k8s/deployments/acb-strategy-random.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-random-deployment.yml similarity index 100% rename from deploy/k8s/deployments/acb-strategy-random.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-random-deployment.yml diff --git a/deploy/k8s/services/acb-strategy-random.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-random-service.yml similarity index 100% rename from deploy/k8s/services/acb-strategy-random.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-random-service.yml diff --git a/deploy/k8s/deployments/acb-strategy-rusher.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-rusher-deployment.yml similarity index 100% rename from deploy/k8s/deployments/acb-strategy-rusher.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-rusher-deployment.yml diff --git a/deploy/k8s/services/acb-strategy-rusher.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-rusher-service.yml similarity index 100% rename from deploy/k8s/services/acb-strategy-rusher.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-rusher-service.yml diff --git a/deploy/k8s/deployments/acb-strategy-swarm.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-swarm-deployment.yml similarity index 98% rename from deploy/k8s/deployments/acb-strategy-swarm.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-swarm-deployment.yml index 2dddf67..720c92c 100644 --- a/deploy/k8s/deployments/acb-strategy-swarm.yaml +++ b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-swarm-deployment.yml @@ -49,7 +49,7 @@ spec: resources: requests: cpu: 50m - memory: 128Mi + memory: 64Mi limits: - memory: 256Mi + memory: 128Mi restartPolicy: Always diff --git a/deploy/k8s/services/acb-strategy-swarm.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-swarm-service.yml similarity index 100% rename from deploy/k8s/services/acb-strategy-swarm.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-strategy-swarm-service.yml diff --git a/deploy/k8s/deployments/acb-worker.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-worker-deployment.yml similarity index 97% rename from deploy/k8s/deployments/acb-worker.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/acb-worker-deployment.yml index e9d5574..e6e62ae 100644 --- a/deploy/k8s/deployments/acb-worker.yaml +++ b/cluster-configuration/apexalgo-iad/ai-code-battle/acb-worker-deployment.yml @@ -42,8 +42,6 @@ spec: secretKeyRef: name: acb-r2-credentials key: endpoint - - name: ACB_R2_BUCKET - value: "acb-data" - name: ACB_R2_ACCESS_KEY valueFrom: secretKeyRef: diff --git a/deploy/k8s/argocd-application.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/argocd-application.yml similarity index 79% rename from deploy/k8s/argocd-application.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/argocd-application.yml index 664961f..a2dd92e 100644 --- a/deploy/k8s/argocd-application.yaml +++ b/cluster-configuration/apexalgo-iad/ai-code-battle/argocd-application.yml @@ -8,9 +8,9 @@ spec: source: repoURL: https://forgejo.ardenone.com/ai-code-battle/ai-code-battle.git targetRevision: master - path: deploy/k8s + path: cluster-configuration/apexalgo-iad/ai-code-battle directory: - recurse: true + recurse: false destination: server: https://kubernetes.default.svc namespace: ai-code-battle @@ -19,5 +19,4 @@ spec: prune: true selfHeal: true syncOptions: - - CreateNamespace=true - - PruneLast=true + - CreateNamespace=false diff --git a/deploy/k8s/namespace.yaml b/cluster-configuration/apexalgo-iad/ai-code-battle/namespace.yml similarity index 61% rename from deploy/k8s/namespace.yaml rename to cluster-configuration/apexalgo-iad/ai-code-battle/namespace.yml index 3b091a6..9f039fa 100644 --- a/deploy/k8s/namespace.yaml +++ b/cluster-configuration/apexalgo-iad/ai-code-battle/namespace.yml @@ -3,4 +3,4 @@ kind: Namespace metadata: name: ai-code-battle labels: - app.kubernetes.io/part-of: ai-code-battle + app.kubernetes.io/name: ai-code-battle