add inline ingress and rename ai to gpu

konstructio · Oct 10, 2024 · c2d2279 · c2d2279
1 parent 30b7120
commit c2d2279
Show file tree

Hide file tree

Showing 52 changed files with 30 additions and 118 deletions.
diff --git a/civo-github/templates/ai-cluster/ingress-for-ai/ollama-ingress.yaml b/civo-github/templates/ai-cluster/ingress-for-ai/ollama-ingress.yaml
diff --git a/civo-github/templates/ai-cluster/ollama-ingress.yaml b/civo-github/templates/ai-cluster/ollama-ingress.yaml
diff --git a/...emplates/ai-cluster/0-providerconfig.yaml → ...mplates/gpu-cluster/0-providerconfig.yaml b/...emplates/ai-cluster/0-providerconfig.yaml → ...mplates/gpu-cluster/0-providerconfig.yaml
diff --git a/...mplates/ai-cluster/10-infrastructure.yaml → ...plates/gpu-cluster/10-infrastructure.yaml b/...mplates/ai-cluster/10-infrastructure.yaml → ...plates/gpu-cluster/10-infrastructure.yaml
diff --git a/...ates/ai-cluster/20-argocd-connection.yaml → ...tes/gpu-cluster/20-argocd-connection.yaml b/...ates/ai-cluster/20-argocd-connection.yaml → ...tes/gpu-cluster/20-argocd-connection.yaml
diff --git a/...templates/ai-cluster/30-cert-manager.yaml → ...emplates/gpu-cluster/30-cert-manager.yaml b/...templates/ai-cluster/30-cert-manager.yaml → ...emplates/gpu-cluster/30-cert-manager.yaml
diff --git a/...templates/ai-cluster/30-external-dns.yaml → ...emplates/gpu-cluster/30-external-dns.yaml b/...templates/ai-cluster/30-external-dns.yaml → ...emplates/gpu-cluster/30-external-dns.yaml
diff --git a/...cluster/30-external-secrets-operator.yaml → ...cluster/30-external-secrets-operator.yaml b/...cluster/30-external-secrets-operator.yaml → ...cluster/30-external-secrets-operator.yaml
diff --git a/...emplates/ai-cluster/30-ingress-nginx.yaml → ...mplates/gpu-cluster/30-ingress-nginx.yaml b/...emplates/ai-cluster/30-ingress-nginx.yaml → ...mplates/gpu-cluster/30-ingress-nginx.yaml
diff --git a/...hub/templates/ai-cluster/30-reloader.yaml → ...ub/templates/gpu-cluster/30-reloader.yaml b/...hub/templates/ai-cluster/30-reloader.yaml → ...ub/templates/gpu-cluster/30-reloader.yaml
diff --git a/...ster/40-cloudflare-origin-issuer-crd.yaml → ...ster/40-cloudflare-origin-issuer-crd.yaml b/...ster/40-cloudflare-origin-issuer-crd.yaml → ...ster/40-cloudflare-origin-issuer-crd.yaml
diff --git a/...mplates/ai-cluster/40-clusterissuers.yaml → ...plates/gpu-cluster/40-clusterissuers.yaml b/...mplates/ai-cluster/40-clusterissuers.yaml → ...plates/gpu-cluster/40-clusterissuers.yaml
diff --git a/...tes/ai-cluster/40-clustersecretstore.yaml → ...es/gpu-cluster/40-clustersecretstore.yaml b/...tes/ai-cluster/40-clustersecretstore.yaml → ...es/gpu-cluster/40-clustersecretstore.yaml
diff --git a/...uster/41-cloudflare-origin-ca-issuer.yaml → ...uster/41-cloudflare-origin-ca-issuer.yaml b/...uster/41-cloudflare-origin-ca-issuer.yaml → ...uster/41-cloudflare-origin-ca-issuer.yaml
diff --git a/...-cluster/45-cloudflare-origin-issuer.yaml → ...-cluster/45-cloudflare-origin-issuer.yaml b/...-cluster/45-cloudflare-origin-issuer.yaml → ...-cluster/45-cloudflare-origin-issuer.yaml
diff --git a/.../templates/ai-cluster/45-environment.yaml → ...templates/gpu-cluster/45-environment.yaml b/.../templates/ai-cluster/45-environment.yaml → ...templates/gpu-cluster/45-environment.yaml
diff --git a/...-cluster/appproject-workload-cluster.yaml → ...-cluster/appproject-workload-cluster.yaml b/...-cluster/appproject-workload-cluster.yaml → ...-cluster/appproject-workload-cluster.yaml
diff --git a/...-cluster/cert-issuers/clusterissuers.yaml → ...-cluster/cert-issuers/clusterissuers.yaml b/...-cluster/cert-issuers/clusterissuers.yaml → ...-cluster/cert-issuers/clusterissuers.yaml
diff --git a/...lare-origin-issuer/cloudflare-issuer.yaml → ...lare-origin-issuer/cloudflare-issuer.yaml b/...lare-origin-issuer/cloudflare-issuer.yaml → ...lare-origin-issuer/cloudflare-issuer.yaml
diff --git a/...ster-secret-store/clustersecretstore.yaml → ...ster-secret-store/clustersecretstore.yaml b/...ster-secret-store/clustersecretstore.yaml → ...ster-secret-store/clustersecretstore.yaml
diff --git a/...lates/ai-cluster/infrastructure/wait.yaml → ...ates/gpu-cluster/infrastructure/wait.yaml b/...lates/ai-cluster/infrastructure/wait.yaml → ...ates/gpu-cluster/infrastructure/wait.yaml
diff --git a/.../ai-cluster/infrastructure/workspace.yaml → ...gpu-cluster/infrastructure/workspace.yaml b/.../ai-cluster/infrastructure/workspace.yaml → ...gpu-cluster/infrastructure/workspace.yaml
diff --git a/...itlab/templates/ai-cluster/ollama-ui.yaml → ...thub/templates/gpu-cluster/ollama-ui.yaml b/...itlab/templates/ai-cluster/ollama-ui.yaml → ...thub/templates/gpu-cluster/ollama-ui.yaml
@@ -4,7 +4,7 @@ metadata:
   name: <WORKLOAD_CLUSTER_NAME>-openwebui
   namespace: argocd
   annotations:
-    argocd.argoproj.io/sync-wave: '30'
+    argocd.argoproj.io/sync-wave: '50'
 spec:
   project: <WORKLOAD_CLUSTER_NAME>
   source:
@@ -28,13 +28,20 @@ spec:
           - "--gpus all"
         extraHosts:
           - "host.docker.internal:host-gateway"
-        volumeMounts:
-          - name: openwebui-data
-            mountPath: /app/backend/data
-        volumes:
-          - name: openwebui-data
-            persistentVolumeClaim:
-              claimName: open-webui-pvc
+        persistentVolume:
+            enabled: true
+            size: 50Gi
+        ingress:
+          enabled: true
+          class: "nginx"
+          annotations: 
+            nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+            nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+            cert-manager.io/cluster-issuer: "letsencrypt-prod"
+          host: "ollama.<DOMAIN_NAME>"
+          tls: true
+          existingSecret: "<WORKLOAD_CLUSTER_NAME>-ollama-http-ingress"
+        
   destination:
     name: <WORKLOAD_CLUSTER_NAME>
     namespace: openwebui

diff --git a/...uster/provider-config/providerconfig.yaml → ...uster/provider-config/providerconfig.yaml b/...uster/provider-config/providerconfig.yaml → ...uster/provider-config/providerconfig.yaml
diff --git a/...ai-cluster/registry-workload-cluster.yaml → ...pu-cluster/registry-workload-cluster.yaml b/...ai-cluster/registry-workload-cluster.yaml → ...pu-cluster/registry-workload-cluster.yaml
diff --git a/...orkload-cluster-environment/metaphor.yaml → ...orkload-cluster-environment/metaphor.yaml b/...orkload-cluster-environment/metaphor.yaml → ...orkload-cluster-environment/metaphor.yaml
diff --git a/civo-gitlab/templates/ai-cluster/ingress-for-ai/ollama-ingress.yaml b/civo-gitlab/templates/ai-cluster/ingress-for-ai/ollama-ingress.yaml
diff --git a/civo-gitlab/templates/ai-cluster/ollama-ingress.yaml b/civo-gitlab/templates/ai-cluster/ollama-ingress.yaml
diff --git a/...emplates/ai-cluster/0-providerconfig.yaml → ...mplates/gpu-cluster/0-providerconfig.yaml b/...emplates/ai-cluster/0-providerconfig.yaml → ...mplates/gpu-cluster/0-providerconfig.yaml
diff --git a/...mplates/ai-cluster/10-infrastructure.yaml → ...plates/gpu-cluster/10-infrastructure.yaml b/...mplates/ai-cluster/10-infrastructure.yaml → ...plates/gpu-cluster/10-infrastructure.yaml
diff --git a/...ates/ai-cluster/20-argocd-connection.yaml → ...tes/gpu-cluster/20-argocd-connection.yaml b/...ates/ai-cluster/20-argocd-connection.yaml → ...tes/gpu-cluster/20-argocd-connection.yaml
diff --git a/...templates/ai-cluster/30-cert-manager.yaml → ...emplates/gpu-cluster/30-cert-manager.yaml b/...templates/ai-cluster/30-cert-manager.yaml → ...emplates/gpu-cluster/30-cert-manager.yaml
diff --git a/...templates/ai-cluster/30-external-dns.yaml → ...emplates/gpu-cluster/30-external-dns.yaml b/...templates/ai-cluster/30-external-dns.yaml → ...emplates/gpu-cluster/30-external-dns.yaml
diff --git a/...cluster/30-external-secrets-operator.yaml → ...cluster/30-external-secrets-operator.yaml b/...cluster/30-external-secrets-operator.yaml → ...cluster/30-external-secrets-operator.yaml
diff --git a/...emplates/ai-cluster/30-ingress-nginx.yaml → ...mplates/gpu-cluster/30-ingress-nginx.yaml b/...emplates/ai-cluster/30-ingress-nginx.yaml → ...mplates/gpu-cluster/30-ingress-nginx.yaml
diff --git a/...lab/templates/ai-cluster/30-reloader.yaml → ...ab/templates/gpu-cluster/30-reloader.yaml b/...lab/templates/ai-cluster/30-reloader.yaml → ...ab/templates/gpu-cluster/30-reloader.yaml
diff --git a/...ster/40-cloudflare-origin-issuer-crd.yaml → ...ster/40-cloudflare-origin-issuer-crd.yaml b/...ster/40-cloudflare-origin-issuer-crd.yaml → ...ster/40-cloudflare-origin-issuer-crd.yaml
diff --git a/...mplates/ai-cluster/40-clusterissuers.yaml → ...plates/gpu-cluster/40-clusterissuers.yaml b/...mplates/ai-cluster/40-clusterissuers.yaml → ...plates/gpu-cluster/40-clusterissuers.yaml
diff --git a/...tes/ai-cluster/40-clustersecretstore.yaml → ...es/gpu-cluster/40-clustersecretstore.yaml b/...tes/ai-cluster/40-clustersecretstore.yaml → ...es/gpu-cluster/40-clustersecretstore.yaml
diff --git a/...uster/41-cloudflare-origin-ca-issuer.yaml → ...uster/41-cloudflare-origin-ca-issuer.yaml b/...uster/41-cloudflare-origin-ca-issuer.yaml → ...uster/41-cloudflare-origin-ca-issuer.yaml
diff --git a/...-cluster/45-cloudflare-origin-issuer.yaml → ...-cluster/45-cloudflare-origin-issuer.yaml b/...-cluster/45-cloudflare-origin-issuer.yaml → ...-cluster/45-cloudflare-origin-issuer.yaml
diff --git a/.../templates/ai-cluster/45-environment.yaml → ...templates/gpu-cluster/45-environment.yaml b/.../templates/ai-cluster/45-environment.yaml → ...templates/gpu-cluster/45-environment.yaml
diff --git a/...-cluster/appproject-workload-cluster.yaml → ...-cluster/appproject-workload-cluster.yaml b/...-cluster/appproject-workload-cluster.yaml → ...-cluster/appproject-workload-cluster.yaml
diff --git a/...-cluster/cert-issuers/clusterissuers.yaml → ...-cluster/cert-issuers/clusterissuers.yaml b/...-cluster/cert-issuers/clusterissuers.yaml → ...-cluster/cert-issuers/clusterissuers.yaml
diff --git a/...lare-origin-issuer/cloudflare-issuer.yaml → ...lare-origin-issuer/cloudflare-issuer.yaml b/...lare-origin-issuer/cloudflare-issuer.yaml → ...lare-origin-issuer/cloudflare-issuer.yaml
diff --git a/...ster-secret-store/clustersecretstore.yaml → ...ster-secret-store/clustersecretstore.yaml b/...ster-secret-store/clustersecretstore.yaml → ...ster-secret-store/clustersecretstore.yaml
diff --git a/...lates/ai-cluster/infrastructure/wait.yaml → ...ates/gpu-cluster/infrastructure/wait.yaml b/...lates/ai-cluster/infrastructure/wait.yaml → ...ates/gpu-cluster/infrastructure/wait.yaml
diff --git a/.../ai-cluster/infrastructure/workspace.yaml → ...gpu-cluster/infrastructure/workspace.yaml b/.../ai-cluster/infrastructure/workspace.yaml → ...gpu-cluster/infrastructure/workspace.yaml
diff --git a/...ithub/templates/ai-cluster/ollama-ui.yaml → ...tlab/templates/gpu-cluster/ollama-ui.yaml b/...ithub/templates/ai-cluster/ollama-ui.yaml → ...tlab/templates/gpu-cluster/ollama-ui.yaml
@@ -4,7 +4,7 @@ metadata:
   name: <WORKLOAD_CLUSTER_NAME>-openwebui
   namespace: argocd
   annotations:
-    argocd.argoproj.io/sync-wave: '30'
+    argocd.argoproj.io/sync-wave: '50'
 spec:
   project: <WORKLOAD_CLUSTER_NAME>
   source:
@@ -28,13 +28,20 @@ spec:
           - "--gpus all"
         extraHosts:
           - "host.docker.internal:host-gateway"
-        volumeMounts:
-          - name: openwebui-data
-            mountPath: /app/backend/data
-        volumes:
-          - name: openwebui-data
-            persistentVolumeClaim:
-              claimName: open-webui-pvc
+        persistentVolume:
+            enabled: true
+            size: 50Gi
+        ingress:
+          enabled: true
+          class: "nginx"
+          annotations: 
+            nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+            nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+            cert-manager.io/cluster-issuer: "letsencrypt-prod"
+          host: "ollama.<DOMAIN_NAME>"
+          tls: true
+          existingSecret: "<WORKLOAD_CLUSTER_NAME>-ollama-http-ingress"
+        
   destination:
     name: <WORKLOAD_CLUSTER_NAME>
     namespace: openwebui

diff --git a/...uster/provider-config/providerconfig.yaml → ...uster/provider-config/providerconfig.yaml b/...uster/provider-config/providerconfig.yaml → ...uster/provider-config/providerconfig.yaml
diff --git a/...ai-cluster/registry-workload-cluster.yaml → ...pu-cluster/registry-workload-cluster.yaml b/...ai-cluster/registry-workload-cluster.yaml → ...pu-cluster/registry-workload-cluster.yaml
diff --git a/...orkload-cluster-environment/metaphor.yaml → ...orkload-cluster-environment/metaphor.yaml b/...orkload-cluster-environment/metaphor.yaml → ...orkload-cluster-environment/metaphor.yaml