From a1e05db4b06661929408af2054f4749e682b249e Mon Sep 17 00:00:00 2001 From: Alon Girmonsky <1990761+alongir@users.noreply.github.com> Date: Sat, 2 Nov 2024 09:49:45 -0700 Subject: [PATCH] Improved resource limits and requests Helm templating --- helm-chart/templates/04-hub-deployment.yaml | 8 ++++++++ helm-chart/templates/09-worker-daemon-set.yaml | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/helm-chart/templates/04-hub-deployment.yaml b/helm-chart/templates/04-hub-deployment.yaml index 5bef71628..9025be8d4 100644 --- a/helm-chart/templates/04-hub-deployment.yaml +++ b/helm-chart/templates/04-hub-deployment.yaml @@ -81,11 +81,19 @@ spec: port: 8080 resources: limits: + {{ if ne .Values.tap.resources.hub.limits.cpu "0" }} cpu: {{ .Values.tap.resources.hub.limits.cpu }} + {{ end }} + {{ if ne .Values.tap.resources.hub.limits.memory "0" }} memory: {{ .Values.tap.resources.hub.limits.memory }} + {{ end }} requests: + {{ if ne .Values.tap.resources.hub.requests.cpu "0" }} cpu: {{ .Values.tap.resources.hub.requests.cpu }} + {{ end }} + {{ if ne .Values.tap.resources.hub.requests.memory "0" }} memory: {{ .Values.tap.resources.hub.requests.memory }} + {{ end }} volumeMounts: - name: saml-x509-volume mountPath: "/etc/saml/x509" diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml index 87db7a85b..aeb30f1ba 100644 --- a/helm-chart/templates/09-worker-daemon-set.yaml +++ b/helm-chart/templates/09-worker-daemon-set.yaml @@ -125,11 +125,19 @@ spec: value: '{{ .Values.tap.sentry.environment }}' resources: limits: + {{ if ne .Values.tap.resources.sniffer.limits.cpu "0" }} cpu: {{ .Values.tap.resources.sniffer.limits.cpu }} + {{ end }} + {{ if ne .Values.tap.resources.sniffer.limits.memory "0" }} memory: {{ .Values.tap.resources.sniffer.limits.memory }} + {{ end }} requests: + {{ if ne .Values.tap.resources.sniffer.requests.cpu "0" }} cpu: {{ .Values.tap.resources.sniffer.requests.cpu }} + {{ end }} + {{ if ne .Values.tap.resources.sniffer.requests.memory "0" }} memory: {{ .Values.tap.resources.sniffer.requests.memory }} + {{ end }} securityContext: capabilities: add: @@ -228,11 +236,19 @@ spec: value: '{{ .Values.tap.sentry.environment }}' resources: limits: + {{ if ne .Values.tap.resources.tracer.limits.cpu "0" }} cpu: {{ .Values.tap.resources.tracer.limits.cpu }} + {{ end }} + {{ if ne .Values.tap.resources.tracer.limits.memory "0" }} memory: {{ .Values.tap.resources.tracer.limits.memory }} + {{ end }} requests: + {{ if ne .Values.tap.resources.tracer.requests.cpu "0" }} cpu: {{ .Values.tap.resources.tracer.requests.cpu }} + {{ end }} + {{ if ne .Values.tap.resources.tracer.requests.memory "0" }} memory: {{ .Values.tap.resources.tracer.requests.memory }} + {{ end }} securityContext: capabilities: add: