From 6b04259ebd3a6737f3c0d7bbd4f0ebe964bd07c9 Mon Sep 17 00:00:00 2001
From: fchinembiri <fchinembiri24@gmail.com>
Date: Thu, 4 Jun 2026 16:04:45 +0200
Subject: [PATCH] fix: next-gen deployment repository and ingress

---
 k8s/argocd-nextgen.yaml                | 36 +++++++++++++++++++++++---
 k8s/nextgen/next-gen-chart/values.yaml |  6 ++---
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/k8s/argocd-nextgen.yaml b/k8s/argocd-nextgen.yaml
index 0eaf587..7ae1c30 100644
--- a/k8s/argocd-nextgen.yaml
+++ b/k8s/argocd-nextgen.yaml
@@ -46,6 +46,35 @@ spec:
       selfHeal: true
 ---
 apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: next-gen-main
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: http://gitea.geocrop.svc.cluster.local:3000/fchinembiri/geocrop-platform..git
+    targetRevision: HEAD
+    path: k8s/nextgen/next-gen-chart
+    helm:
+      parameters:
+        - name: branchName
+          value: main
+        - name: image.tag
+          value: latest
+        - name: ingress.host
+          value: next-gen.techarvest.co.zw
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: nextgen
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+---
+apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
   name: next-gen-branches
@@ -59,9 +88,8 @@ spec:
           tokenRef:
             secretName: gitea-repo-creds
             key: password
-          allBranches: true
         filters:
-          - repositoryMatch: ^next-gen$
+          - repositoryMatch: ^geocrop-platform$
   template:
     metadata:
       name: 'next-gen-{{branch}}'
@@ -69,14 +97,14 @@ spec:
       project: default
       source:
         repoURL: http://gitea.geocrop.svc.cluster.local:3000/fchinembiri/geocrop-platform..git
-        targetRevision: HEAD
+        targetRevision: '{{branch}}'
         path: k8s/nextgen/next-gen-chart
         helm:
           parameters:
             - name: branchName
               value: '{{branch}}'
             - name: image.tag
-              value: '{{branch}}'
+              value: 'latest'
             - name: ingress.host
               value: '{{branch}}.next-gen.techarvest.co.zw'
       destination:
diff --git a/k8s/nextgen/next-gen-chart/values.yaml b/k8s/nextgen/next-gen-chart/values.yaml
index f39a789..ea3579c 100644
--- a/k8s/nextgen/next-gen-chart/values.yaml
+++ b/k8s/nextgen/next-gen-chart/values.yaml
@@ -2,7 +2,7 @@
 replicaCount: 1
 
 image:
-  repository: registry.techarvest.co.zw/next-gen
+  repository: frankchine/geocrop-web
   pullPolicy: IfNotPresent
   tag: "latest"
 
@@ -10,14 +10,14 @@ branchName: "main"
 
 service:
   type: ClusterIP
-  port: 3000
+  port: 80
 
 ingress:
   enabled: true
   className: nginx
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
-  host: "" # Will be overridden by ApplicationSet
+  host: "next-gen.techarvest.co.zw" # Default host
 
 resources:
   limits: