owncloud · wkloucek · Nov 29, 2022 · Nov 14, 2022 · Nov 14, 2022 · Nov 14, 2022
diff --git a/charts/ocis/docs/values-desc-table.adoc b/charts/ocis/docs/values-desc-table.adoc
diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml
diff --git a/charts/ocis/templates/app-provider/deployment.yaml b/charts/ocis/templates/app-provider/deployment.yaml
@@ -2,6 +2,7 @@
 {{- range $officeSuite := .Values.features.appsIntegration.wopiIntegration.officeSuites }}
 {{ if $officeSuite.enabled }}
 {{- $_ := set $ "appName"  (print "app-provider-" (regexReplaceAll "\\W+" (lower $officeSuite.name) "_")) -}}
+{{- $_ := set $ "resources" (default (default (dict) $.Values.resources) $.Values.services.appProvider.resources) -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -97,7 +98,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml $.Values.resources | nindent 12 }}
+          resources: {{ toYaml $.resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9164

diff --git a/charts/ocis/templates/app-registry/deployment.yaml b/charts/ocis/templates/app-registry/deployment.yaml
@@ -1,5 +1,6 @@
-{{- $_ := set . "appName" "app-registry" -}}
 {{ if .Values.features.appsIntegration.enabled }}
+{{- $_ := set . "appName" "app-registry" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.appRegistry.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -78,7 +79,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: http
               containerPort: 9242

diff --git a/charts/ocis/templates/audit/deployment.yaml b/charts/ocis/templates/audit/deployment.yaml
@@ -1,3 +1,4 @@
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.audit.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -57,4 +58,4 @@ spec:
             - name: AUDIT_LOG_TO_CONSOLE
               value: "true"
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
diff --git a/charts/ocis/templates/auth-basic/deployment.yaml b/charts/ocis/templates/auth-basic/deployment.yaml
@@ -1,5 +1,6 @@
 {{- $_ := set . "appName" "auth-basic" -}}
 {{ if .Values.features.basicAuthentication }}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.authBasic.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -166,7 +167,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9146

diff --git a/charts/ocis/templates/auth-machine/deployment.yaml b/charts/ocis/templates/auth-machine/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "auth-machine" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.authMachine.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -83,7 +84,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9166

diff --git a/charts/ocis/templates/frontend/deployment.yaml b/charts/ocis/templates/frontend/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "frontend" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.frontend.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -98,7 +99,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: http
               containerPort: 9140

diff --git a/charts/ocis/templates/gateway/deployment.yaml b/charts/ocis/templates/gateway/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "gateway" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.gateway.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -122,7 +123,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9142

diff --git a/charts/ocis/templates/graph/deployment.yaml b/charts/ocis/templates/graph/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "graph" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.graph.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -155,7 +156,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: http
               containerPort: 9120

diff --git a/charts/ocis/templates/groups/deployment.yaml b/charts/ocis/templates/groups/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "groups" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.groups.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -164,7 +165,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9160

diff --git a/charts/ocis/templates/idm/deployment.yaml b/charts/ocis/templates/idm/deployment.yaml
@@ -1,5 +1,6 @@
 {{- $_ := set . "appName" "idm" -}}
 {{- if not .Values.features.externalUserManagement.enabled }}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.idm.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -43,7 +44,7 @@ spec:
             runAsGroup: {{ .Values.securityContext.runAsGroup }}
             readOnlyRootFilesystem: true
           command: ["mkdir", "-p", "/var/lib/ocis/idm"]
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           volumeMounts:
           - name: idm-data
             mountPath: /var/lib/ocis
@@ -132,7 +133,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: ldaps
               containerPort: 9235

diff --git a/charts/ocis/templates/idp/deployment.yaml b/charts/ocis/templates/idp/deployment.yaml
@@ -1,5 +1,6 @@
 {{- $_ := set . "appName" "idp" -}}
 {{- if not .Values.features.externalUserManagement.enabled }}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.idp.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -87,7 +88,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: http
               containerPort: 9130

diff --git a/charts/ocis/templates/nats/deployment.yaml b/charts/ocis/templates/nats/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "nats" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.nats.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -82,7 +83,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: nats
               containerPort: 9233

diff --git a/charts/ocis/templates/notifications/deployment.yaml b/charts/ocis/templates/notifications/deployment.yaml
@@ -1,5 +1,6 @@
 {{- $_ := set . "appName" "notifications" -}}
 {{- if .Values.features.emailNotifications.enabled }}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.notifications.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -107,7 +108,7 @@ spec:
           #   periodSeconds: 20
           #   failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           # TODO: This service does not currently provide a debug port, re-enable this once that is implemented
           # ports:
           #   - name: metrics-debug

diff --git a/charts/ocis/templates/ocdav/deployment.yaml b/charts/ocis/templates/ocdav/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "ocdav" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.ocdav.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -89,7 +90,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: http
               containerPort: 8080

diff --git a/charts/ocis/templates/ocs/deployment.yaml b/charts/ocis/templates/ocs/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "ocs" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.ocs.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -90,7 +91,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: http
               containerPort: 9110

diff --git a/charts/ocis/templates/proxy/deployment.yaml b/charts/ocis/templates/proxy/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "proxy" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.proxy.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -111,7 +112,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: http
               containerPort: 9200

diff --git a/charts/ocis/templates/search/deployment.yaml b/charts/ocis/templates/search/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "search" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.search.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -91,7 +92,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9220

diff --git a/charts/ocis/templates/settings/deployment.yaml b/charts/ocis/templates/settings/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "settings" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.settings.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -102,7 +103,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: http
               containerPort: 9190

diff --git a/charts/ocis/templates/sharing/deployment.yaml b/charts/ocis/templates/sharing/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "sharing" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.sharing.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -111,7 +112,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9150

diff --git a/charts/ocis/templates/storage-publiclink/deployment.yaml b/charts/ocis/templates/storage-publiclink/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "storage-publiclink" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.storagePublicLink.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -77,7 +78,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9178

diff --git a/charts/ocis/templates/storage-shares/deployment.yaml b/charts/ocis/templates/storage-shares/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "storage-shares" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.storageShares.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -80,7 +81,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9154

diff --git a/charts/ocis/templates/storage-system/deployment.yaml b/charts/ocis/templates/storage-system/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "storage-system" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.storageSystem.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -109,7 +110,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9215

diff --git a/charts/ocis/templates/storage-users/deployment.yaml b/charts/ocis/templates/storage-users/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "storage-users" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.storageUsers.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -140,7 +141,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9157

diff --git a/charts/ocis/templates/store/deployment.yaml b/charts/ocis/templates/store/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "store" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.store.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -78,7 +79,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9460

diff --git a/charts/ocis/templates/thumbnails/deployment.yaml b/charts/ocis/templates/thumbnails/deployment.yaml
@@ -1,4 +1,5 @@
 {{- $_ := set . "appName" "thumbnails" -}}
+{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.thumbnails.resources) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -100,7 +101,7 @@ spec:
             periodSeconds: 20
             failureThreshold: 3
 
-          resources: {{ toYaml .Values.resources | nindent 12 }}
+          resources: {{ toYaml .resources | nindent 12 }}
           ports:
             - name: grpc
               containerPort: 9185