From cb17431e998eb431694eee68b556a148dbf271ae Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Sat, 23 Mar 2024 10:04:05 +0200
Subject: [PATCH] fix(nextcloud): fix gpu allocation (#19409)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [x] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [x] ⚖️ My code follows the style guidelines of this project
- [x] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [x] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [x] ⬆️ I increased versions for any altered app according to semantic
versioning
- [x] I made sure the title starts with `feat(chart-name):`,
`fix(chart-name):` or `chore(chart-name):`

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
---
 charts/premium/nextcloud/Chart.yaml                   |  2 +-
 charts/premium/nextcloud/templates/_cronjobs.tpl      |  2 ++
 charts/premium/nextcloud/templates/_initPerms.tpl     |  2 ++
 charts/premium/nextcloud/templates/_waitNextcloud.tpl |  2 ++
 charts/premium/nextcloud/values.yaml                  | 11 +++++++++++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/charts/premium/nextcloud/Chart.yaml b/charts/premium/nextcloud/Chart.yaml
index 23c7c646bbb..5f83a4cd163 100644
--- a/charts/premium/nextcloud/Chart.yaml
+++ b/charts/premium/nextcloud/Chart.yaml
@@ -50,4 +50,4 @@ sources:
   - https://github.com/truecharts/containers/tree/master/apps/nextcloud-imaginary
   - https://github.com/truecharts/containers/tree/master/apps/nextcloud-push-notify
 type: application
-version: 29.8.0
+version: 29.8.1
diff --git a/charts/premium/nextcloud/templates/_cronjobs.tpl b/charts/premium/nextcloud/templates/_cronjobs.tpl
index 0fa050dba68..a12fd4db35c 100644
--- a/charts/premium/nextcloud/templates/_cronjobs.tpl
+++ b/charts/premium/nextcloud/templates/_cronjobs.tpl
@@ -14,6 +14,8 @@
         enabled: true
         primary: true
         imageSelector: image
+        resources:
+          excludeExtra: true
         command:
           - /bin/bash
           - -c
diff --git a/charts/premium/nextcloud/templates/_initPerms.tpl b/charts/premium/nextcloud/templates/_initPerms.tpl
index ed94790ad93..d4211675c78 100644
--- a/charts/premium/nextcloud/templates/_initPerms.tpl
+++ b/charts/premium/nextcloud/templates/_initPerms.tpl
@@ -5,6 +5,8 @@
 enabled: true
 type: install
 imageSelector: alpineImage
+resources:
+  excludeExtra: true
 securityContext:
   runAsUser: 0
   runAsGroup: 0
diff --git a/charts/premium/nextcloud/templates/_waitNextcloud.tpl b/charts/premium/nextcloud/templates/_waitNextcloud.tpl
index 24946d640e8..adcd8f0dea4 100644
--- a/charts/premium/nextcloud/templates/_waitNextcloud.tpl
+++ b/charts/premium/nextcloud/templates/_waitNextcloud.tpl
@@ -4,6 +4,8 @@
 enabled: true
 type: init
 imageSelector: image
+resources:
+  excludeExtra: true
 securityContext:
 command: /bin/sh
 args:
diff --git a/charts/premium/nextcloud/values.yaml b/charts/premium/nextcloud/values.yaml
index f6d22571728..126d04d3f02 100644
--- a/charts/premium/nextcloud/values.yaml
+++ b/charts/premium/nextcloud/values.yaml
@@ -22,6 +22,7 @@ collaboraImage:
   repository: collabora/code
   pullPolicy: IfNotPresent
   tag: 23.05.9.4.1@sha256:18768e665a817a06d17a608bcb0744dd0275e72d805644cad5ad1923f7d623b5
+
 nextcloud:
   # Initial Credentials
   credentials:
@@ -167,6 +168,8 @@ workload:
           enabled: true
           primary: true
           imageSelector: nginxImage
+          resources:
+            excludeExtra: true
           probes:
             readiness:
               enabled: true
@@ -195,6 +198,8 @@ workload:
           primary: true
           enabled: true
           imageSelector: hpbImage
+          resources:
+            excludeExtra: true
           envFrom:
             - configMapRef:
                 name: hpb-config
@@ -226,6 +231,8 @@ workload:
           primary: true
           enabled: true
           imageSelector: imaginaryImage
+          resources:
+            excludeExtra: true
           command: imaginary
           args:
             - -p
@@ -260,6 +267,8 @@ workload:
           primary: true
           enabled: true
           imageSelector: clamavImage
+          resources:
+            excludeExtra: true
           # FIXME: https://github.com/Cisco-Talos/clamav/issues/478
           securityContext:
             runAsUser: 0
@@ -293,6 +302,8 @@ workload:
           primary: true
           enabled: true
           imageSelector: collaboraImage
+          resources:
+            excludeExtra: true
           securityContext:
             runAsUser: 100
             runAsGroup: 102