Merge pull request #315 from owncloud/enable-jobs-in-ci-for-linting

enable maintenance jobs for ci linting
owncloud · Jul 11, 2023 · 567df01 · 567df01
2 parents 1368902 + 15b715e
commit 567df01
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 1 deletion.
diff --git a/charts/ocis/ci/values_greater_equal_1.25.0.yaml b/charts/ocis/ci/values_greater_equal_1.25.0.yaml
@@ -110,6 +110,18 @@ services:
       finalizers:
         - kubernetes.io/pvc-protection
       selectorLabels: {}
+    jobResources:
+      limits:
+        cpu: 100m
+        memory: 128Mi
+      requests:
+        cpu: 100m
+        memory: 128Mi
+    maintenance:
+      cleanUpExpiredUploads:
+        enabled: true
+      purgeExpiredTrashBinItems:
+        enaboled: true
 
   store:
     persistence:
@@ -137,6 +149,16 @@ services:
       finalizers: []
       selectorLabels:
         selector1: foobar
+    jobResources:
+      limits:
+        cpu: 100m
+        memory: 128Mi
+      requests:
+        cpu: 100m
+        memory: 128Mi
+    maintenance:
+      cleanUpOldThumbnails:
+        enabled: true
 
 secretRefs:
   notificationsSmtpSecretRef: "smtp-secret"
diff --git a/charts/ocis/ci/values_pre_1.25.0.yaml b/charts/ocis/ci/values_pre_1.25.0.yaml
@@ -106,6 +106,19 @@ services:
       finalizers:
         - kubernetes.io/pvc-protection
       selectorLabels: {}
+    jobResources:
+      limits:
+        cpu: 100m
+        memory: 128Mi
+      requests:
+        cpu: 100m
+        memory: 128Mi
+    maintenance:
+      cleanUpExpiredUploads:
+        enabled: true
+      purgeExpiredTrashBinItems:
+        enaboled: true
+
 
   store:
     persistence:
@@ -133,6 +146,16 @@ services:
       finalizers: []
       selectorLabels:
         selector1: foobar
+    jobResources:
+      limits:
+        cpu: 100m
+        memory: 128Mi
+      requests:
+        cpu: 100m
+        memory: 128Mi
+    maintenance:
+      cleanUpOldThumbnails:
+        enabled: true
 
 secretRefs:
   notificationsSmtpSecretRef: "smtp-secret"
diff --git a/charts/ocis/templates/idp/deployment.yaml b/charts/ocis/templates/idp/deployment.yaml
@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 {{ include "ocis.metadata" . }}
   annotations:
-    ignore-check.kube-linter.io/env-var-secret : "IDP_ENCRYPTION_SECRET_FILE is no secret, it's the file path to the secret"
+    ignore-check.kube-linter.io/env-var-secret: "IDP_ENCRYPTION_SECRET_FILE is no secret, it's the file path to the secret"
 spec:
   {{- include "ocis.selector" . | nindent 2 }}
   replicas: 1

diff --git a/charts/ocis/templates/thumbnails/jobs.yaml b/charts/ocis/templates/thumbnails/jobs.yaml
@@ -8,6 +8,8 @@ metadata:
   namespace: {{ template "ocis.namespace" . }}
   labels:
     {{- include "ocis.labels" . | nindent 4 }}
+  annotations:
+    ignore-check.kube-linter.io/latest-tag: "using the stable tag on this busybox image is better than having an outdated image"
 spec:
   schedule: "{{ .Values.services.thumbnails.maintenance.cleanUpOldThumbnails.schedule }}"
   successfulJobsHistoryLimit: 3