diff --git a/charts/phrasea/Chart.yaml b/charts/phrasea/Chart.yaml index c3afd67..f1febe1 100644 --- a/charts/phrasea/Chart.yaml +++ b/charts/phrasea/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 1.3.1 +version: 1.4.0-alpha1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. diff --git a/charts/phrasea/templates/api-php-deployment.yml b/charts/phrasea/templates/api-php-deployment.yml index 526a9e5..0bc137b 100644 --- a/charts/phrasea/templates/api-php-deployment.yml +++ b/charts/phrasea/templates/api-php-deployment.yml @@ -8,7 +8,7 @@ kind: Deployment metadata: name: {{ $appName }}-api-php spec: - replicas: 1 + replicas: {{(index $.Values $appName).api.replicas}} selector: matchLabels: app: phrasea @@ -34,6 +34,13 @@ spec: {{- if not (eq "latest" $.Values.repository.tag) }} imagePullPolicy: Always {{- end }} + resources: + requests: + memory: {{(index $.Values $appName).api.resources.requests.memory}} + cpu: {{(index $.Values $appName).api.resources.requests.cpu}} + limits: + memory: {{(index $.Values $appName).api.resources.limits.memory}} + cpu: {{(index $.Values $appName).api.resources.limits.cpu}} terminationMessagePolicy: FallbackToLogsOnError volumeMounts: - name: configs diff --git a/charts/phrasea/templates/worker-deployment.yml b/charts/phrasea/templates/worker-deployment.yml index 53a00e7..8e29246 100644 --- a/charts/phrasea/templates/worker-deployment.yml +++ b/charts/phrasea/templates/worker-deployment.yml @@ -8,7 +8,7 @@ kind: Deployment metadata: name: {{ $appName }}-worker spec: - replicas: 1 + replicas: {{(index $.Values $appName).worker.replicas}} selector: matchLabels: app: phrasea @@ -32,6 +32,13 @@ spec: {{- if not (eq "latest" $.Values.repository.tag) }} imagePullPolicy: Always {{- end }} + resources: + requests: + memory: {{(index $.Values $appName).worker.resources.requests.memory}} + cpu: {{(index $.Values $appName).worker.resources.requests.cpu}} + limits: + memory: {{(index $.Values $appName).worker.resources.limits.memory}} + cpu: {{(index $.Values $appName).worker.resources.limits.cpu}} terminationMessagePolicy: FallbackToLogsOnError volumeMounts: - name: configs diff --git a/charts/phrasea/values.yaml b/charts/phrasea/values.yaml index 53dddcb..72c073a 100644 --- a/charts/phrasea/values.yaml +++ b/charts/phrasea/values.yaml @@ -74,6 +74,14 @@ databox: tls: [] hostname: baseUrl: + replicas: 1 + resources: + requests: + cpu: "50m" + memory: "256Mi" + limits: + cpu: "2000m" + memory: "2048Mi" config: requestSignatureTtl: 86400 s3Storage: @@ -115,6 +123,15 @@ databox: tls: [] oauthClient: id: databox-app + worker: + replicas: 1 + resources: + requests: + cpu: "50m" + memory: "256Mi" + limits: + cpu: "2000m" + memory: "4096Mi" rabbitmq: vhost: databox database: