From 689cba777d8753df05ea03e1e8ce83a6e1b0981f Mon Sep 17 00:00:00 2001 From: Karim Atwa Date: Fri, 6 Dec 2024 14:55:39 +0100 Subject: [PATCH 1/3] chore: update cp and pl requests and limits avoiding guaranteed QoS policy --- helm-chart/Chart.yaml | 2 +- helm-chart/templates/deployment.yaml | 9 ++++++--- helm-chart/values.yaml | 10 +++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml index 0b727a9..595260a 100644 --- a/helm-chart/Chart.yaml +++ b/helm-chart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 appVersion: "1.0" -version: 1.0.1 +version: 1.0.2 name: enterprise-locations-packages description: Official Gatling Enterprise Helm chart for Private Locations & Packages home: https://gatling.io diff --git a/helm-chart/templates/deployment.yaml b/helm-chart/templates/deployment.yaml index d3bcfa6..b59758e 100644 --- a/helm-chart/templates/deployment.yaml +++ b/helm-chart/templates/deployment.yaml @@ -61,10 +61,13 @@ spec: env: {{ toYaml .Values.controlPlane.env | nindent 12 }} {{- end }} - {{- if .Values.controlPlane.resources }} resources: - {{ toYaml .Values.controlPlane.resources | nindent 12 }} - {{- end }} + requests: + memory: {{ .Values.controlPlane.resources.requests.memory | default "512Mi" }} + cpu: {{ .Values.controlPlane.resources.requests.cpu | default "1" }} + limits: + memory: {{ .Values.controlPlane.resources.limits.memory | default "1024Mi" }} + cpu: {{ .Values.controlPlane.resources.limits.cpu | default "2" }} volumeMounts: - mountPath: /app/conf/ name: "{{ .Values.controlPlane.name }}-conf-volume" diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 081e341..dc3f857 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -45,8 +45,8 @@ controlPlane: cpu: "1" # Resource limits for the container limits: - memory: "512Mi" - cpu: "1" + memory: "1024Mi" + cpu: "2" # Security context for the pod or container securityContext: {} #enterpriseCloud: @@ -86,11 +86,11 @@ privateLocations: # Resource requests for the container limits": memory: "512Mi" - cpu: "4" + cpu: "1" # Resource limits for the container requests: - memory: "512Mi" - cpu: "4" + memory: "1024Mi" + cpu: "2" # Security context for the pod or container securityContext: sysctls: [] # List of sysctls to set in the pod From 292877f7eb3272dae875448eaf01f2edf5c1b7fc Mon Sep 17 00:00:00 2001 From: Karim Atwa Date: Fri, 6 Dec 2024 15:25:07 +0100 Subject: [PATCH 2/3] chore: set resources to ensure cp as guaranteed QoS & lg as burstable QoS --- helm-chart/templates/deployment.yaml | 6 +++--- helm-chart/values.yaml | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/helm-chart/templates/deployment.yaml b/helm-chart/templates/deployment.yaml index b59758e..1d0f2d0 100644 --- a/helm-chart/templates/deployment.yaml +++ b/helm-chart/templates/deployment.yaml @@ -63,11 +63,11 @@ spec: {{- end }} resources: requests: - memory: {{ .Values.controlPlane.resources.requests.memory | default "512Mi" }} + memory: {{ .Values.controlPlane.resources.requests.memory | default "1Gi" }} cpu: {{ .Values.controlPlane.resources.requests.cpu | default "1" }} limits: - memory: {{ .Values.controlPlane.resources.limits.memory | default "1024Mi" }} - cpu: {{ .Values.controlPlane.resources.limits.cpu | default "2" }} + memory: {{ .Values.controlPlane.resources.limits.memory | default "1Gi" }} + cpu: {{ .Values.controlPlane.resources.limits.cpu | default "1" }} volumeMounts: - mountPath: /app/conf/ name: "{{ .Values.controlPlane.name }}-conf-volume" diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index dc3f857..e5d3faf 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -41,12 +41,12 @@ controlPlane: resources: # Resource requests for the container requests: - memory: "512Mi" + memory: "1Gi" cpu: "1" # Resource limits for the container limits: - memory: "1024Mi" - cpu: "2" + memory: "1Gi" + cpu: "1" # Security context for the pod or container securityContext: {} #enterpriseCloud: @@ -85,12 +85,12 @@ privateLocations: resources: # Resource requests for the container limits": - memory: "512Mi" - cpu: "1" + memory: "2Gi" + cpu: "2" # Resource limits for the container requests: - memory: "1024Mi" - cpu: "2" + memory: "1Gi" + cpu: "1" # Security context for the pod or container securityContext: sysctls: [] # List of sysctls to set in the pod From e688243e92d21454f1916e3d090d19dc8011b87f Mon Sep 17 00:00:00 2001 From: Karim Atwa Date: Fri, 6 Dec 2024 15:44:13 +0100 Subject: [PATCH 3/3] chore: downgrade helm v1.0.2 to v1.0.1 --- helm-chart/Chart.yaml | 2 +- helm-chart/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml index 595260a..0b727a9 100644 --- a/helm-chart/Chart.yaml +++ b/helm-chart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 appVersion: "1.0" -version: 1.0.2 +version: 1.0.1 name: enterprise-locations-packages description: Official Gatling Enterprise Helm chart for Private Locations & Packages home: https://gatling.io diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index e5d3faf..dd4e0fa 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -38,7 +38,7 @@ controlPlane: affinity: {} # Tolerations to allow pods to be scheduled on tainted nodes tolerations: {} - resources: + resources: # Recommended: Guaranteed QoS class. # Resource requests for the container requests: memory: "1Gi" @@ -82,7 +82,7 @@ privateLocations: containers: - env: [] # Environment variables for the container name: gatling-container # Name of the container - resources: + resources: # Recommended: Burstable QoS class. # Resource requests for the container limits": memory: "2Gi"