From 8b5200785f136f06c2e0d1ca8bf5dd5ad14cecb2 Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Thu, 29 Feb 2024 11:26:10 -0500 Subject: [PATCH] nxtcloud setup --- k8s/apps/nextcloud/values.yaml | 7 ++--- k8s/apps/webapps/templates/deploy-apps.yaml | 2 ++ k8s/argoapps/apps-values/webapps.yaml | 33 +++++++++++---------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/k8s/apps/nextcloud/values.yaml b/k8s/apps/nextcloud/values.yaml index dc219cb..8889446 100644 --- a/k8s/apps/nextcloud/values.yaml +++ b/k8s/apps/nextcloud/values.yaml @@ -15,10 +15,9 @@ nextcloud: resources: requests: cpu: "500m" - memory: "1Gi" + memory: "100Mi" ephemeral-storage: "40Ki" limits: - memory: 5Gi ephemeral-storage: "40Mi" nextcloud: @@ -70,10 +69,9 @@ nextcloud: resources: requests: cpu: "500m" - memory: "5Gi" + memory: "2Gi" ephemeral-storage: "20Mi" limits: - memory: 10Gi ephemeral-storage: "200Mi" hpa: @@ -90,5 +88,4 @@ nextcloud: memory: "256Mi" ephemeral-storage: "100Ki" limits: - memory: 1Gi ephemeral-storage: "100Mi" diff --git a/k8s/apps/webapps/templates/deploy-apps.yaml b/k8s/apps/webapps/templates/deploy-apps.yaml index 3bd32bb..8fcd876 100644 --- a/k8s/apps/webapps/templates/deploy-apps.yaml +++ b/k8s/apps/webapps/templates/deploy-apps.yaml @@ -1,4 +1,5 @@ {{ range $k, $v := .Values.apps }} +{{ if ($v.enabled | default true ) }} --- kind: Service apiVersion: v1 @@ -117,4 +118,5 @@ spec: envFrom: {{ ($v.envFrom | default list) | toJson }} env: {{ ($v.env | default list) | toJson }} volumeMounts: {{ ($v.volumeMounts | default list) | toJson }} +{{ end }} {{ end }} \ No newline at end of file diff --git a/k8s/argoapps/apps-values/webapps.yaml b/k8s/argoapps/apps-values/webapps.yaml index 0edac87..c35da2e 100644 --- a/k8s/argoapps/apps-values/webapps.yaml +++ b/k8s/argoapps/apps-values/webapps.yaml @@ -1,7 +1,8 @@ apps: quirky: + enabled: true ingress: - middleware: apps-ingresses-https-redirect + middleware: apps-ingresses-https-redirect repo: ghcr.io/asosnovsky/quirky tag: "latest" podResources: @@ -20,9 +21,10 @@ apps: - med - low ollama: + enabled: false ingress: - middleware: apps-ingresses-chain-authentik - repo: ollama/ollama + middleware: apps-ingresses-chain-authentik + repo: ollama/ollama tag: "latest" podResources: limits: @@ -36,19 +38,20 @@ apps: tcp: web: 11434 volumes: - - name: config - persistentVolumeClaim: - claimName: {{ .Values.storage.ollama.name }} + - name: config + persistentVolumeClaim: + claimName: { { .Values.storage.ollama.name } } volumeMounts: - - name: config - mountPath: /root/.ollama + - name: config + mountPath: /root/.ollama capacity: - med - high ollama-web: + enabled: false ingress: - middleware: apps-ingresses-chain-authentik - repo: ghcr.io/ollama-webui/ollama-webui + middleware: apps-ingresses-chain-authentik + repo: ghcr.io/ollama-webui/ollama-webui tag: "main" podResources: limits: @@ -66,12 +69,12 @@ apps: tcp: web: 8080 volumes: - - name: config - persistentVolumeClaim: - claimName: {{ .Values.storage.ollamaWebGui.name }} + - name: config + persistentVolumeClaim: + claimName: { { .Values.storage.ollamaWebGui.name } } volumeMounts: - - name: config - mountPath: /app/backend/data + - name: config + mountPath: /app/backend/data capacity: - med - low