diff --git a/apps/0-project-and-root.yaml b/apps/0-project-and-root.yaml index 6b713eb..553304e 100644 --- a/apps/0-project-and-root.yaml +++ b/apps/0-project-and-root.yaml @@ -6,7 +6,7 @@ metadata: spec: destinations: - server: https://kubernetes.default.svc - namespace: ai + namespace: argocd - server: https://kubernetes.default.svc namespace: argo # # only add if need to deploy into argocd (ehhhhh) @@ -24,7 +24,7 @@ spec: project: ai-stack destination: server: https://kubernetes.default.svc - namespace: ai + namespace: argocd source: repoURL: https://git.ion606.com/ion606/ollama-plus targetRevision: argo diff --git a/apps/argo-templates.yaml b/apps/argo-templates.yaml index dbf18fe..fa3d0e2 100644 --- a/apps/argo-templates.yaml +++ b/apps/argo-templates.yaml @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: argo-templates - namespace: ai + namespace: argocd spec: project: ai-stack destination: @@ -10,7 +10,7 @@ spec: namespace: argo source: repoURL: https://git.ion606.com/ion606/ollama-plus - targetRevision: main + targetRevision: argo path: apps/argo-templates syncPolicy: automated: diff --git a/apps/children/browser.yaml b/apps/children/browser.yaml index 0f655a9..cf4f762 100644 --- a/apps/children/browser.yaml +++ b/apps/children/browser.yaml @@ -2,15 +2,15 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: browser - namespace: ai + namespace: argocd spec: project: ai-stack destination: server: https://kubernetes.default.svc - namespace: ai + namespace: argocd source: repoURL: https://git.ion606.com/ion606/ollama-plus.git - targetRevision: main + targetRevision: argo path: manifests/browser syncPolicy: automated: diff --git a/apps/children/coderunner.yaml b/apps/children/coderunner.yaml index d98bde8..4c562c3 100644 --- a/apps/children/coderunner.yaml +++ b/apps/children/coderunner.yaml @@ -2,17 +2,17 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: coderunner - namespace: ai + namespace: argocd labels: repo.ion606.com/ollama-plus: "true" spec: project: ai-stack destination: server: https://kubernetes.default.svc - namespace: ai + namespace: argocd source: repoURL: https://git.ion606.com/ion606/ollama-plus - targetRevision: main + targetRevision: argo path: manifests/coderunner syncPolicy: automated: diff --git a/apps/children/debug.yaml b/apps/children/debug.yaml index 98a51c7..25c6206 100644 --- a/apps/children/debug.yaml +++ b/apps/children/debug.yaml @@ -2,20 +2,19 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: debug-netshoot - namespace: ai + namespace: argocd labels: repo.ion606.com/ollama-plus: "true" spec: project: ai-stack destination: server: https://kubernetes.default.svc - namespace: ai + namespace: argocd source: repoURL: https://git.ion606.com/ion606/ollama-plus - targetRevision: main + targetRevision: argo path: manifests/debug syncPolicy: automated: prune: true selfHeal: true - diff --git a/apps/children/ollama-scheduler.yaml b/apps/children/ollama-scheduler.yaml index e34f886..1ed6138 100644 --- a/apps/children/ollama-scheduler.yaml +++ b/apps/children/ollama-scheduler.yaml @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: ollama-scheduler - namespace: ai + namespace: argocd labels: repo.ion606.com/ollama-plus: "true" spec: @@ -12,7 +12,7 @@ spec: namespace: argo source: repoURL: https://git.ion606.com/ion606/ollama-plus - targetRevision: main + targetRevision: argo path: manifests/argo-schedules-api syncPolicy: automated: diff --git a/apps/children/openwebui.yaml b/apps/children/openwebui.yaml index 5259821..25d0d20 100644 --- a/apps/children/openwebui.yaml +++ b/apps/children/openwebui.yaml @@ -2,14 +2,14 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: openwebui - namespace: ai + namespace: argocd annotations: argocd.argoproj.io/sync-wave: "0" spec: project: ai-stack destination: server: https://kubernetes.default.svc - namespace: ai + namespace: argocd source: repoURL: https://helm.openwebui.com chart: open-webui diff --git a/apps/children/policy-argo.yaml b/apps/children/policy-argo.yaml index 234fda2..6bbc91f 100644 --- a/apps/children/policy-argo.yaml +++ b/apps/children/policy-argo.yaml @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: policy-argo - namespace: ai + namespace: argocd labels: repo.ion606.com/ollama-plus: "true" spec: @@ -12,10 +12,9 @@ spec: namespace: argo source: repoURL: https://git.ion606.com/ion606/ollama-plus - targetRevision: main + targetRevision: argo path: manifests/policy-argo syncPolicy: automated: prune: true selfHeal: true - diff --git a/apps/children/policy.yaml b/apps/children/policy.yaml index 82ba538..aec189a 100644 --- a/apps/children/policy.yaml +++ b/apps/children/policy.yaml @@ -2,20 +2,19 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: policy - namespace: ai + namespace: argocd labels: repo.ion606.com/ollama-plus: "true" spec: project: ai-stack destination: server: https://kubernetes.default.svc - namespace: ai + namespace: argocd source: repoURL: https://git.ion606.com/ion606/ollama-plus - targetRevision: main + targetRevision: argo path: manifests/policy syncPolicy: automated: prune: true selfHeal: true - diff --git a/apps/children/postgresql.yaml b/apps/children/postgresql.yaml index e3bbfbe..50ef959 100644 --- a/apps/children/postgresql.yaml +++ b/apps/children/postgresql.yaml @@ -1,15 +1,15 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: postgresql - namespace: ai - annotations: - argocd.argoproj.io/sync-wave: "-10" + name: postgresql + namespace: argocd + annotations: + argocd.argoproj.io/sync-wave: "-10" spec: project: ai-stack destination: server: https://kubernetes.default.svc - namespace: ai + namespace: argocd source: repoURL: https://charts.bitnami.com/bitnami chart: postgresql diff --git a/apps/children/rag-server.yaml b/apps/children/rag-server.yaml index 3594237..1c38deb 100644 --- a/apps/children/rag-server.yaml +++ b/apps/children/rag-server.yaml @@ -2,17 +2,17 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: rag-server - namespace: ai + namespace: argocd labels: repo.ion606.com/ollama-plus: "true" spec: project: ai-stack destination: server: https://kubernetes.default.svc - namespace: ai + namespace: argocd source: repoURL: https://git.ion606.com/ion606/ollama-plus - targetRevision: main + targetRevision: argo path: manifests/rag-server syncPolicy: automated: diff --git a/apps/children/searxng.yaml b/apps/children/searxng.yaml index e501c8c..35b2e88 100644 --- a/apps/children/searxng.yaml +++ b/apps/children/searxng.yaml @@ -2,12 +2,12 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: searxng - namespace: ai + namespace: argocd spec: project: ai-stack destination: server: https://kubernetes.default.svc - namespace: ai + namespace: argocd source: repoURL: https://charts.kubito.dev chart: searxng diff --git a/apps/children/tools.yaml b/apps/children/tools.yaml index 6d67871..c5542ae 100644 --- a/apps/children/tools.yaml +++ b/apps/children/tools.yaml @@ -2,17 +2,17 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: name: tools - namespace: ai + namespace: argocd labels: repo.ion606.com/ollama-plus: "true" spec: project: ai-stack destination: server: https://kubernetes.default.svc - namespace: ai + namespace: argocd source: repoURL: https://git.ion606.com/ion606/ollama-plus - targetRevision: main + targetRevision: argo path: manifests/tools syncPolicy: automated: diff --git a/manifests/browser/deployment.yaml b/manifests/browser/deployment.yaml index 5d7711b..77d327a 100644 --- a/manifests/browser/deployment.yaml +++ b/manifests/browser/deployment.yaml @@ -1,39 +1,39 @@ apiVersion: apps/v1 kind: Deployment -metadata: { name: browser, namespace: ai } +metadata: { name: browser, namespace: argocd } spec: - replicas: 1 - selector: { matchLabels: { app: browser } } - template: - metadata: { labels: { app: browser } } - spec: - containers: - - name: browser - image: docker.io/ion606/browser:latest - ports: [{ containerPort: 7788 }] - env: - - { name: WEBUI_IP, value: "0.0.0.0" } - - { name: WEBUI_PORT, value: "7788" } - resources: - requests: { cpu: "250m", memory: "256Mi" } - limits: { cpu: "1", memory: "1Gi" } # hard cap - readinessProbe: - httpGet: { path: "/", port: 7788 } - initialDelaySeconds: 5 - periodSeconds: 10 - livenessProbe: - httpGet: { path: "/", port: 7788 } - initialDelaySeconds: 15 - periodSeconds: 20 + replicas: 1 + selector: { matchLabels: { app: browser } } + template: + metadata: { labels: { app: browser } } + spec: + containers: + - name: browser + image: docker.io/ion606/browser:latest + ports: [{ containerPort: 7788 }] + env: + - { name: WEBUI_IP, value: "0.0.0.0" } + - { name: WEBUI_PORT, value: "7788" } + resources: + requests: { cpu: "250m", memory: "256Mi" } + limits: { cpu: "1", memory: "1Gi" } # hard cap + readinessProbe: + httpGet: { path: "/", port: 7788 } + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + httpGet: { path: "/", port: 7788 } + initialDelaySeconds: 15 + periodSeconds: 20 --- apiVersion: v1 kind: Service -metadata: { name: browser, namespace: ai } +metadata: { name: browser, namespace: argocd } spec: - selector: { app: browser } - ports: - - name: http - port: 7788 - targetPort: 7788 - nodePort: 30788 - type: NodePort \ No newline at end of file + selector: { app: browser } + ports: + - name: http + port: 7788 + targetPort: 7788 + nodePort: 30788 + type: NodePort diff --git a/manifests/coderunner/deployment.yaml b/manifests/coderunner/deployment.yaml index 0fa52b0..60e854c 100644 --- a/manifests/coderunner/deployment.yaml +++ b/manifests/coderunner/deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: { name: coderunner, namespace: ai } +metadata: { name: coderunner, namespace: argocd } spec: replicas: 1 selector: { matchLabels: { app: coderunner } } @@ -32,7 +32,7 @@ spec: --- apiVersion: v1 kind: Service -metadata: { name: coderunner, namespace: ai } +metadata: { name: coderunner, namespace: argocd } spec: selector: { app: coderunner } ports: diff --git a/manifests/coderunner/rbac.yaml b/manifests/coderunner/rbac.yaml index c23cf82..c5ee190 100644 --- a/manifests/coderunner/rbac.yaml +++ b/manifests/coderunner/rbac.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: ServiceAccount -metadata: { name: coderunner-sa, namespace: ai } +metadata: { name: coderunner-sa, namespace: argocd } --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: { name: coderunner-job-role, namespace: ai } +metadata: { name: coderunner-job-role, namespace: argocd } rules: - apiGroups: ["batch"] resources: ["jobs"] @@ -16,11 +16,11 @@ rules: --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: { name: coderunner-job-rb, namespace: ai } +metadata: { name: coderunner-job-rb, namespace: argocd } subjects: - kind: ServiceAccount name: coderunner-sa - namespace: ai + namespace: argocd roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/manifests/debug/netshoot.yaml b/manifests/debug/netshoot.yaml index c387b90..a600604 100644 --- a/manifests/debug/netshoot.yaml +++ b/manifests/debug/netshoot.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: netshoot - namespace: ai + namespace: argocd spec: replicas: 1 selector: diff --git a/manifests/policy/allow-browser-ingress.yaml b/manifests/policy/allow-browser-ingress.yaml index 9c06596..df7fca0 100644 --- a/manifests/policy/allow-browser-ingress.yaml +++ b/manifests/policy/allow-browser-ingress.yaml @@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: name: allow-browser-ingress - namespace: ai + namespace: argocd spec: podSelector: matchLabels: @@ -14,4 +14,3 @@ spec: cidr: 0.0.0.0/0 ports: - { protocol: TCP, port: 7788 } - diff --git a/manifests/policy/allow-common-egress.yaml b/manifests/policy/allow-common-egress.yaml index 6f27bd2..2ad5784 100644 --- a/manifests/policy/allow-common-egress.yaml +++ b/manifests/policy/allow-common-egress.yaml @@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: name: allow-common-egress - namespace: ai + namespace: argocd spec: podSelector: {} policyTypes: ["Egress"] @@ -23,4 +23,3 @@ spec: kubernetes.io/metadata.name: ai ports: - { protocol: TCP, port: 5432 } - diff --git a/manifests/policy/allow-https-egress.yaml b/manifests/policy/allow-https-egress.yaml index db12dd6..95fdf2b 100644 --- a/manifests/policy/allow-https-egress.yaml +++ b/manifests/policy/allow-https-egress.yaml @@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: name: allow-https-egress - namespace: ai + namespace: argocd spec: podSelector: {} policyTypes: ["Egress"] diff --git a/manifests/policy/allow-openwebui-ingress.yaml b/manifests/policy/allow-openwebui-ingress.yaml index 980e16f..3d68977 100644 --- a/manifests/policy/allow-openwebui-ingress.yaml +++ b/manifests/policy/allow-openwebui-ingress.yaml @@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: name: allow-openwebui-ingress - namespace: ai + namespace: argocd spec: # Select the Open WebUI pods deployed by the Helm release "openwebui" podSelector: @@ -17,4 +17,3 @@ spec: # Open WebUI typically listens on 8080 (chart default), sometimes 80 - { protocol: TCP, port: 8080 } - { protocol: TCP, port: 80 } - diff --git a/manifests/policy/default-deny.yaml b/manifests/policy/default-deny.yaml index 292b504..4023359 100644 --- a/manifests/policy/default-deny.yaml +++ b/manifests/policy/default-deny.yaml @@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: name: default-deny-all - namespace: ai + namespace: argocd spec: podSelector: {} # die policyTypes: ["Ingress", "Egress"] diff --git a/manifests/rag-server/deployment.yaml b/manifests/rag-server/deployment.yaml index 02575ea..21ac6fb 100644 --- a/manifests/rag-server/deployment.yaml +++ b/manifests/rag-server/deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: { name: rag-server, namespace: ai } +metadata: { name: rag-server, namespace: argocd } spec: replicas: 1 selector: { matchLabels: { app: rag-server } } @@ -30,7 +30,7 @@ spec: --- apiVersion: v1 kind: Service -metadata: { name: rag-server, namespace: ai } +metadata: { name: rag-server, namespace: argocd } spec: selector: { app: rag-server } ports: diff --git a/manifests/tools/deployment.yaml b/manifests/tools/deployment.yaml index 6a4a9d5..ae73e55 100644 --- a/manifests/tools/deployment.yaml +++ b/manifests/tools/deployment.yaml @@ -1,37 +1,37 @@ apiVersion: apps/v1 kind: Deployment -metadata: { name: tools, namespace: ai } +metadata: { name: tools, namespace: argocd } spec: - replicas: 1 - selector: { matchLabels: { app: tools } } - template: - metadata: { labels: { app: tools } } - spec: - containers: - - name: tools - image: docker.io/ion606/tools:latest - ports: [{ containerPort: 1331 }] - env: - - { name: HOST, value: "0.0.0.0" } - - { name: PORT, value: "1331" } - - { name: ROKU_IP, value: "192.0.2.10" } - readinessProbe: - httpGet: { path: "/roku/openapi.json", port: 1331 } - livenessProbe: - httpGet: { path: "/roku/openapi.json", port: 1331 } - initialDelaySeconds: 10 - resources: - requests: { cpu: "100m", memory: "128Mi" } - limits: { cpu: "500m", memory: "512Mi" } + replicas: 1 + selector: { matchLabels: { app: tools } } + template: + metadata: { labels: { app: tools } } + spec: + containers: + - name: tools + image: docker.io/ion606/tools:latest + ports: [{ containerPort: 1331 }] + env: + - { name: HOST, value: "0.0.0.0" } + - { name: PORT, value: "1331" } + - { name: ROKU_IP, value: "192.0.2.10" } + readinessProbe: + httpGet: { path: "/roku/openapi.json", port: 1331 } + livenessProbe: + httpGet: { path: "/roku/openapi.json", port: 1331 } + initialDelaySeconds: 10 + resources: + requests: { cpu: "100m", memory: "128Mi" } + limits: { cpu: "500m", memory: "512Mi" } --- apiVersion: v1 kind: Service -metadata: { name: tools, namespace: ai } +metadata: { name: tools, namespace: argocd } spec: - selector: { app: tools } - ports: - - name: http - port: 1331 - targetPort: 1331 - nodePort: 31331 - type: NodePort \ No newline at end of file + selector: { app: tools } + ports: + - name: http + port: 1331 + targetPort: 1331 + nodePort: 31331 + type: NodePort