Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 29162a150a | |||
| b4f2ec3ce4 |
@@ -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,10 +24,10 @@ 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
|
||||
targetRevision: argo-2
|
||||
path: apps/children
|
||||
syncPolicy:
|
||||
automated:
|
||||
|
||||
@@ -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-2
|
||||
path: apps/argo-templates
|
||||
syncPolicy:
|
||||
automated:
|
||||
|
||||
@@ -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-2
|
||||
path: manifests/browser
|
||||
syncPolicy:
|
||||
automated:
|
||||
|
||||
@@ -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-2
|
||||
path: manifests/coderunner
|
||||
syncPolicy:
|
||||
automated:
|
||||
|
||||
@@ -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-2
|
||||
path: manifests/debug
|
||||
syncPolicy:
|
||||
automated:
|
||||
prune: true
|
||||
selfHeal: true
|
||||
|
||||
|
||||
@@ -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-2
|
||||
path: manifests/argo-schedules-api
|
||||
syncPolicy:
|
||||
automated:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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-2
|
||||
path: manifests/policy-argo
|
||||
syncPolicy:
|
||||
automated:
|
||||
prune: true
|
||||
selfHeal: true
|
||||
|
||||
|
||||
@@ -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-2
|
||||
path: manifests/policy
|
||||
syncPolicy:
|
||||
automated:
|
||||
prune: true
|
||||
selfHeal: true
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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-2
|
||||
path: manifests/rag-server
|
||||
syncPolicy:
|
||||
automated:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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-2
|
||||
path: manifests/tools
|
||||
syncPolicy:
|
||||
automated:
|
||||
|
||||
@@ -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
|
||||
selector: { app: browser }
|
||||
ports:
|
||||
- name: http
|
||||
port: 7788
|
||||
targetPort: 7788
|
||||
nodePort: 30788
|
||||
type: NodePort
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -2,7 +2,7 @@ apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: netshoot
|
||||
namespace: ai
|
||||
namespace: argocd
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
|
||||
@@ -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 }
|
||||
|
||||
|
||||
@@ -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 }
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
|
||||
kind: NetworkPolicy
|
||||
metadata:
|
||||
name: allow-https-egress
|
||||
namespace: ai
|
||||
namespace: argocd
|
||||
spec:
|
||||
podSelector: {}
|
||||
policyTypes: ["Egress"]
|
||||
|
||||
@@ -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 }
|
||||
|
||||
|
||||
@@ -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"]
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
selector: { app: tools }
|
||||
ports:
|
||||
- name: http
|
||||
port: 1331
|
||||
targetPort: 1331
|
||||
nodePort: 31331
|
||||
type: NodePort
|
||||
|
||||
Reference in New Issue
Block a user