From 4a6628a3e895c583cd0ad86cc9748ab07283d8f8 Mon Sep 17 00:00:00 2001 From: Volodymyr Stoiko Date: Tue, 5 Nov 2024 23:03:21 +0200 Subject: [PATCH] Fix helm resource requests/limits templates (#1639) --- helm-chart/templates/04-hub-deployment.yaml | 8 ++++---- helm-chart/templates/09-worker-daemon-set.yaml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/helm-chart/templates/04-hub-deployment.yaml b/helm-chart/templates/04-hub-deployment.yaml index 9025be8d4..b25d78e8e 100644 --- a/helm-chart/templates/04-hub-deployment.yaml +++ b/helm-chart/templates/04-hub-deployment.yaml @@ -81,17 +81,17 @@ spec: port: 8080 resources: limits: - {{ if ne .Values.tap.resources.hub.limits.cpu "0" }} + {{ if ne (toString .Values.tap.resources.hub.limits.cpu) "0" }} cpu: {{ .Values.tap.resources.hub.limits.cpu }} {{ end }} - {{ if ne .Values.tap.resources.hub.limits.memory "0" }} + {{ if ne (toString .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" }} + {{ if ne (toString .Values.tap.resources.hub.requests.cpu) "0" }} cpu: {{ .Values.tap.resources.hub.requests.cpu }} {{ end }} - {{ if ne .Values.tap.resources.hub.requests.memory "0" }} + {{ if ne (toString .Values.tap.resources.hub.requests.memor) "0" }} memory: {{ .Values.tap.resources.hub.requests.memory }} {{ end }} volumeMounts: diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml index aeb30f1ba..d4d3d31c2 100644 --- a/helm-chart/templates/09-worker-daemon-set.yaml +++ b/helm-chart/templates/09-worker-daemon-set.yaml @@ -125,17 +125,17 @@ spec: value: '{{ .Values.tap.sentry.environment }}' resources: limits: - {{ if ne .Values.tap.resources.sniffer.limits.cpu "0" }} + {{ if ne (toString .Values.tap.resources.sniffer.limits.cpu) "0" }} cpu: {{ .Values.tap.resources.sniffer.limits.cpu }} {{ end }} - {{ if ne .Values.tap.resources.sniffer.limits.memory "0" }} + {{ if ne (toString .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" }} + {{ if ne (toString .Values.tap.resources.sniffer.requests.cpu) "0" }} cpu: {{ .Values.tap.resources.sniffer.requests.cpu }} {{ end }} - {{ if ne .Values.tap.resources.sniffer.requests.memory "0" }} + {{ if ne (toString .Values.tap.resources.sniffer.requests.memory) "0" }} memory: {{ .Values.tap.resources.sniffer.requests.memory }} {{ end }} securityContext: @@ -236,17 +236,17 @@ spec: value: '{{ .Values.tap.sentry.environment }}' resources: limits: - {{ if ne .Values.tap.resources.tracer.limits.cpu "0" }} + {{ if ne (toString .Values.tap.resources.tracer.limits.cpu) "0" }} cpu: {{ .Values.tap.resources.tracer.limits.cpu }} {{ end }} - {{ if ne .Values.tap.resources.tracer.limits.memory "0" }} + {{ if ne (toString .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" }} + {{ if ne (toString .Values.tap.resources.tracer.requests.cpu) "0" }} cpu: {{ .Values.tap.resources.tracer.requests.cpu }} {{ end }} - {{ if ne .Values.tap.resources.tracer.requests.memory "0" }} + {{ if ne (toString .Values.tap.resources.tracer.requests.memory) "0" }} memory: {{ .Values.tap.resources.tracer.requests.memory }} {{ end }} securityContext: