From 8590f55a49c8ab9d6a12aacb15b40002abaa530c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 14 Mar 2023 13:00:59 +0100 Subject: [PATCH 1/3] define resource limits for webapp & backend --- deployment/src/kubernetes/templates/backend/Deployment.yaml | 5 +++++ deployment/src/kubernetes/templates/webapp/Deployment.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/deployment/src/kubernetes/templates/backend/Deployment.yaml b/deployment/src/kubernetes/templates/backend/Deployment.yaml index f475a0173..c92a63d3a 100644 --- a/deployment/src/kubernetes/templates/backend/Deployment.yaml +++ b/deployment/src/kubernetes/templates/backend/Deployment.yaml @@ -39,6 +39,11 @@ spec: name: configmap-{{ .Release.Name }}-backend - secretRef: name: secret-{{ .Release.Name }}-backend + resources: + limits: + memory: 2G + requests: + memory: 1G ports: - containerPort: 4000 protocol: TCP diff --git a/deployment/src/kubernetes/templates/webapp/Deployment.yaml b/deployment/src/kubernetes/templates/webapp/Deployment.yaml index a334738ec..260aabae6 100644 --- a/deployment/src/kubernetes/templates/webapp/Deployment.yaml +++ b/deployment/src/kubernetes/templates/webapp/Deployment.yaml @@ -40,5 +40,10 @@ spec: name: configmap-{{ .Release.Name }}-webapp - secretRef: name: secret-{{ .Release.Name }}-webapp + resources: + limits: + memory: 2G + requests: + memory: 1G restartPolicy: {{ .Values.WEBAPP.CONTAINER_RESTART_POLICY }} terminationGracePeriodSeconds: {{ .Values.WEBAPP.CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS }} \ No newline at end of file From 50d9b1acd91890c3a1971c1dadea04efb4eb64ee Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 16 Mar 2023 12:01:07 +0100 Subject: [PATCH 2/3] ressource limits for every service in values.yml --- .../example/kubernetes/values.template.yaml | 8 ++++++-- .../src/kubernetes/templates/backend/Deployment.yaml | 6 +++--- .../src/kubernetes/templates/maintenance/Deployment.yaml | 5 +++++ .../src/kubernetes/templates/webapp/Deployment.yaml | 6 +++--- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/deployment/configurations/example/kubernetes/values.template.yaml b/deployment/configurations/example/kubernetes/values.template.yaml index 86c02310c..4171b2f47 100644 --- a/deployment/configurations/example/kubernetes/values.template.yaml +++ b/deployment/configurations/example/kubernetes/values.template.yaml @@ -38,6 +38,8 @@ BACKEND: CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS: "30" DOCKER_IMAGE_PULL_POLICY: "Always" STORAGE_UPLOADS: "25Gi" + RESOURCE_REQUESTS_MEMORY: "1G" + RESOURCE_LIMITS_MEMORY: "2G" WEBAPP: # change all the below if needed @@ -54,6 +56,8 @@ WEBAPP: CONTAINER_RESTART_POLICY: "Always" CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS: "30" DOCKER_IMAGE_PULL_POLICY: "Always" + RESOURCE_REQUESTS_MEMORY: "1G" + RESOURCE_LIMITS_MEMORY: "2G" NEO4J: # most likely you don't need to change this @@ -63,9 +67,7 @@ NEO4J: CONTAINER_RESTART_POLICY: "Always" CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS: "30" STORAGE: "5Gi" - # RESOURCE_REQUESTS_MEMORY configures the memory available for requests. RESOURCE_REQUESTS_MEMORY: "2G" - # RESOURCE_LIMITS_MEMORY configures the memory limits available. RESOURCE_LIMITS_MEMORY: "4G" # required for Neo4j Enterprice version #ACCEPT_LICENSE_AGREEMENT: "yes" @@ -94,6 +96,8 @@ MAINTENANCE: CONTAINER_RESTART_POLICY: "Always" CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS: "30" DOCKER_IMAGE_PULL_POLICY: "Always" + RESOURCE_REQUESTS_MEMORY: "500M" + RESOURCE_LIMITS_MEMORY: "1G" LETSENCRYPT: # change all the below if needed diff --git a/deployment/src/kubernetes/templates/backend/Deployment.yaml b/deployment/src/kubernetes/templates/backend/Deployment.yaml index c92a63d3a..7125363f5 100644 --- a/deployment/src/kubernetes/templates/backend/Deployment.yaml +++ b/deployment/src/kubernetes/templates/backend/Deployment.yaml @@ -40,10 +40,10 @@ spec: - secretRef: name: secret-{{ .Release.Name }}-backend resources: - limits: - memory: 2G requests: - memory: 1G + memory: {{ .Values.BACKEND.RESOURCE_REQUESTS_MEMORY | default "1G" | quote }} + limits: + memory: {{ .Values.BACKEND.RESOURCE_LIMITS_MEMORY | default "2G" | quote }} ports: - containerPort: 4000 protocol: TCP diff --git a/deployment/src/kubernetes/templates/maintenance/Deployment.yaml b/deployment/src/kubernetes/templates/maintenance/Deployment.yaml index fd1aa311a..ec37552d1 100644 --- a/deployment/src/kubernetes/templates/maintenance/Deployment.yaml +++ b/deployment/src/kubernetes/templates/maintenance/Deployment.yaml @@ -34,6 +34,11 @@ spec: name: configmap-{{ .Release.Name }}-webapp - secretRef: name: secret-{{ .Release.Name }}-webapp + resources: + requests: + memory: {{ .Values.MAINTENANCE.RESOURCE_REQUESTS_MEMORY | default "500M" | quote }} + limits: + memory: {{ .Values.MAINTENANCE.RESOURCE_LIMITS_MEMORY | default "1G" | quote }} ports: - containerPort: 80 restartPolicy: {{ .Values.MAINTENANCE.CONTAINER_RESTART_POLICY }} diff --git a/deployment/src/kubernetes/templates/webapp/Deployment.yaml b/deployment/src/kubernetes/templates/webapp/Deployment.yaml index 260aabae6..9dbe6aefb 100644 --- a/deployment/src/kubernetes/templates/webapp/Deployment.yaml +++ b/deployment/src/kubernetes/templates/webapp/Deployment.yaml @@ -41,9 +41,9 @@ spec: - secretRef: name: secret-{{ .Release.Name }}-webapp resources: - limits: - memory: 2G requests: - memory: 1G + memory: {{ .Values.WEBAPP.RESOURCE_REQUESTS_MEMORY | default "1G" | quote }} + limits: + memory: {{ .Values.WEBAPP.RESOURCE_LIMITS_MEMORY | default "2G" | quote }} restartPolicy: {{ .Values.WEBAPP.CONTAINER_RESTART_POLICY }} terminationGracePeriodSeconds: {{ .Values.WEBAPP.CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS }} \ No newline at end of file From ac96b1e0df1046f768e76268e4657bfd4cd6787d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 13 Apr 2023 09:03:11 +0200 Subject: [PATCH 3/3] update stage.ocelot.social --- deployment/configurations/stage.ocelot.social | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/configurations/stage.ocelot.social b/deployment/configurations/stage.ocelot.social index 540bd503b..b3f7838c2 160000 --- a/deployment/configurations/stage.ocelot.social +++ b/deployment/configurations/stage.ocelot.social @@ -1 +1 @@ -Subproject commit 540bd503b9401c1608ccda77bdd23fe47ba008fb +Subproject commit b3f7838c2612a81b031c2ab7b372d0c66e8b9466