Skip to content

Commit

Permalink
Merge pull request #122 from owncloud/per-service-settings
Browse files Browse the repository at this point in the history 
introduce per service settings
  • Loading branch information
@wkloucek
wkloucek authored Nov 29, 2022
2 parents c19a261 + c161c7d commit 7b2bd76
Show file tree
Hide file tree
Showing 31 changed files with 853 additions and 193 deletions.
338 changes: 337 additions & 1 deletion charts/ocis/docs/values-desc-table.adoc
View file

Large diffs are not rendered by default.

310 changes: 229 additions & 81 deletions charts/ocis/docs/values.adoc.yaml
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion charts/ocis/templates/app-provider/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions charts/ocis/templates/app-registry/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/audit/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.audit.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -57,4 +58,4 @@ spec:
- name: AUDIT_LOG_TO_CONSOLE
value: "true"

resources: {{ toYaml .Values.resources | nindent 12 }}
resources: {{ toYaml .resources | nindent 12 }}
3 changes: 2 additions & 1 deletion charts/ocis/templates/auth-basic/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/auth-machine/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/frontend/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "frontend" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.frontend.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/gateway/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "gateway" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.gateway.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -128,7 +129,7 @@ spec:
periodSeconds: 20
failureThreshold: 3

resources: {{ toYaml .Values.resources | nindent 12 }}
resources: {{ toYaml .resources | nindent 12 }}
ports:
- name: grpc
containerPort: 9142
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/graph/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "graph" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.graph.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/groups/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "groups" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.groups.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions charts/ocis/templates/idm/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/idp/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/nats/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "nats" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.nats.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/notifications/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/ocdav/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "ocdav" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.ocdav.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/ocs/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "ocs" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.ocs.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/proxy/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "proxy" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.proxy.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/search/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "search" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.search.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/settings/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "settings" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.settings.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/sharing/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "sharing" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.sharing.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/storage-publiclink/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/storage-shares/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/storage-system/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/storage-users/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -146,7 +147,7 @@ spec:
periodSeconds: 20
failureThreshold: 3

resources: {{ toYaml .Values.resources | nindent 12 }}
resources: {{ toYaml .resources | nindent 12 }}
ports:
- name: grpc
containerPort: 9157
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/store/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "store" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.store.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/ocis/templates/thumbnails/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $_ := set . "appName" "thumbnails" -}}
{{- $_ := set . "resources" (default (default (dict) .Values.resources) .Values.services.thumbnails.resources) -}}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 7b2bd76

Please sign in to comment.