DEPLOY-276: Add resources to each pod definition.

This commit is contained in:
Sergiu-Alexandru Vidrascu
2017-12-19 18:22:39 +02:00
parent 5925f7ce00
commit 9c9e7424fb
5 changed files with 29 additions and 8 deletions

View File

@@ -7,4 +7,4 @@ dependencies:
- name: nginx-ingress - name: nginx-ingress
version: ^0.8.21 version: ^0.8.21
repository: https://kubernetes-charts.storage.googleapis.com repository: https://kubernetes-charts.storage.googleapis.com
condition: nginx-ingress.enabled condition: alfresco-content-services.nginx-ingress.enabled

View File

@@ -26,6 +26,8 @@ spec:
name: {{ template "content-services.fullname" . }}-repository-configmap name: {{ template "content-services.fullname" . }}-repository-configmap
ports: ports:
- containerPort: {{ .Values.repository.image.internalPort }} - containerPort: {{ .Values.repository.image.internalPort }}
resources:
{{ toYaml .Values.repository.resources | indent 12 }}
initContainers: initContainers:
- name: init-postgres - name: init-postgres
image: busybox image: busybox

View File

@@ -23,6 +23,8 @@ spec:
imagePullPolicy: {{ .Values.share.image.pullPolicy }} imagePullPolicy: {{ .Values.share.image.pullPolicy }}
ports: ports:
- containerPort: {{ .Values.share.image.internalPort }} - containerPort: {{ .Values.share.image.internalPort }}
resources:
{{ toYaml .Values.share.resources | indent 12 }}
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ template "content-services.fullname" . }}-share-configmap name: {{ template "content-services.fullname" . }}-share-configmap

View File

@@ -26,3 +26,5 @@ spec:
name: {{ template "content-services.fullname" . }}-solr-configmap name: {{ template "content-services.fullname" . }}-solr-configmap
ports: ports:
- containerPort: {{ .Values.solr.image.internalPort }} - containerPort: {{ .Values.solr.image.internalPort }}
resources:
{{ toYaml .Values.solr.resources | indent 12 }}

View File

@@ -21,6 +21,11 @@ repository:
JAVA_OPTS: " -Dsolr.base.url=/solr JAVA_OPTS: " -Dsolr.base.url=/solr
-Dsolr.secureComms=none -Dsolr.secureComms=none
-Dindex.subsystem.name=solr6" -Dindex.subsystem.name=solr6"
resources:
requests:
memory: "1000Mi"
limits:
memory: "4000Mi"
share: share:
replicaCount: 1 replicaCount: 1
@@ -35,6 +40,11 @@ share:
externalPort: 80 externalPort: 80
ingress: ingress:
path: /share path: /share
resources:
requests:
memory: "500Mi"
limits:
memory: "1000Mi"
solr: solr:
replicaCount: 1 replicaCount: 1
@@ -51,21 +61,26 @@ solr:
path: /solr path: /solr
environment: environment:
SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
resources:
requests:
memory: "250Mi"
limits:
memory: "500Mi"
postgresql: postgresql:
## If true, install the postgresql chart alongside Alfresco Content Services ## If true, install the postgresql chart alongside Alfresco Content Services
enabled: true enabled: true
nameOverride: postgresql-acs nameOverride: postgresql-acs
imageTag: "9.4.12" imageTag: "9.4.12"
postgresUser: alfresco postgresUser: alfresco
postgresPassword: alfresco postgresPassword: alfresco
postgresDatabase: alfresco postgresDatabase: alfresco
persistence: persistence:
enabled: false enabled: false
resources:
requests:
memory: "250Mi"
limits:
memory: "500Mi"
nginx-ingress: replicaCount: 1
## If true, install the nginx-ingress chart alongside Alfresco Content Services
enabled: true