From c5fad71e8aa1501e0a470ef20313bed255599433 Mon Sep 17 00:00:00 2001 From: Jocelyn Thode Date: Thu, 1 Jun 2023 10:53:13 +0200 Subject: [PATCH] =?UTF-8?q?fix(http-add-on):=20Fix=20resources=20variables?= =?UTF-8?q?=20for=20the=20http-add-on=20deploym=E2=80=A6=20(#454)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- http-add-on/templates/deployment-interceptor.yaml | 2 +- http-add-on/templates/deployment-operator.yaml | 2 +- http-add-on/templates/deployment-scaler.yaml | 2 +- http-add-on/values.yaml | 10 +++++++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/http-add-on/templates/deployment-interceptor.yaml b/http-add-on/templates/deployment-interceptor.yaml index 7dadf29e..857ee886 100644 --- a/http-add-on/templates/deployment-interceptor.yaml +++ b/http-add-on/templates/deployment-interceptor.yaml @@ -82,7 +82,7 @@ spec: - containerPort: {{ .Values.interceptor.proxy.port }} name: inter-proxy resources: - {{- toYaml .Values.resources | nindent 12 }} + {{- toYaml .Values.interceptor.resources | nindent 10 }} terminationGracePeriodSeconds: 10 {{- with .Values.interceptor.nodeSelector }} nodeSelector: diff --git a/http-add-on/templates/deployment-operator.yaml b/http-add-on/templates/deployment-operator.yaml index a93192e0..60389953 100644 --- a/http-add-on/templates/deployment-operator.yaml +++ b/http-add-on/templates/deployment-operator.yaml @@ -73,7 +73,7 @@ spec: - containerPort: {{ .Values.operator.adminPort }} name: admin-http resources: - {{- toYaml .Values.resources | nindent 12 }} + {{- toYaml .Values.operator.resources | nindent 10 }} terminationGracePeriodSeconds: 10 {{- with .Values.operator.nodeSelector }} nodeSelector: diff --git a/http-add-on/templates/deployment-scaler.yaml b/http-add-on/templates/deployment-scaler.yaml index e7fdb648..90423b37 100644 --- a/http-add-on/templates/deployment-scaler.yaml +++ b/http-add-on/templates/deployment-scaler.yaml @@ -68,7 +68,7 @@ spec: - name: KEDA_HTTP_SCALER_TARGET_PENDING_REQUESTS_INTERCEPTOR value: "{{ default 200 .Values.scaler.pendingRequestsInterceptor }}" resources: - {{- toYaml .Values.resources | nindent 12 }} + {{- toYaml .Values.scaler.resources | nindent 10 }} terminationGracePeriodSeconds: 10 {{- with .Values.scaler.nodeSelector }} nodeSelector: diff --git a/http-add-on/values.yaml b/http-add-on/values.yaml index baf961bd..9c2de7c7 100644 --- a/http-add-on/values.yaml +++ b/http-add-on/values.yaml @@ -41,6 +41,13 @@ scaler: nodeSelector: {} tolerations: [] affinity: {} + resources: + limits: + cpu: 0.5 + memory: 64Mi + requests: + cpu: 250m + memory: 20Mi interceptor: # the image pull secrets for the interceptor @@ -154,4 +161,5 @@ images: rbac: # install aggregate roles for edit and view - aggregateToDefaultRoles: false \ No newline at end of file + aggregateToDefaultRoles: false +