From e81e5840c83819e0997044b9ac6bd3a1f81703c6 Mon Sep 17 00:00:00 2001 From: dntosas Date: Tue, 9 Feb 2021 10:40:21 +0200 Subject: [PATCH] [chart] Allow resources override for node DaemonSet CSI controller and node have different needs in a manner of capacity so in this commit we enable users to define specific resources for the node component. This will allow users not to reserve not needed resources on all of their instances as node is a DaemonSet and may not need as much CPU/Memory as the controller Pods. Signed-off-by: dntosas --- charts/aws-ebs-csi-driver/Chart.yaml | 2 +- charts/aws-ebs-csi-driver/templates/node.yaml | 6 +++--- charts/aws-ebs-csi-driver/values.yaml | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml index 13a922b431..4ac72eafb9 100644 --- a/charts/aws-ebs-csi-driver/Chart.yaml +++ b/charts/aws-ebs-csi-driver/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.9.0" name: aws-ebs-csi-driver description: A Helm chart for AWS EBS CSI Driver -version: 0.9.4 +version: 0.9.5 kubeVersion: ">=1.17.0-0" home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver sources: diff --git a/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/aws-ebs-csi-driver/templates/node.yaml index b32958d16a..17dd1ac962 100644 --- a/charts/aws-ebs-csi-driver/templates/node.yaml +++ b/charts/aws-ebs-csi-driver/templates/node.yaml @@ -80,7 +80,7 @@ spec: timeoutSeconds: 3 periodSeconds: 10 failureThreshold: 5 - {{- with .Values.resources }} + {{- with .Values.node.resources }} resources: {{ toYaml . | nindent 12 }} {{- end }} - name: node-driver-registrar @@ -103,7 +103,7 @@ spec: mountPath: /csi - name: registration-dir mountPath: /registration - {{- with .Values.resources }} + {{- with .Values.node.resources }} resources: {{ toYaml . | nindent 12 }} {{- end }} - name: liveness-probe @@ -113,7 +113,7 @@ spec: volumeMounts: - name: plugin-dir mountPath: /csi - {{- with .Values.resources }} + {{- with .Values.node.resources }} resources: {{ toYaml . | nindent 12 }} {{- end }} volumes: diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml index bb4a609beb..adf3d000f0 100644 --- a/charts/aws-ebs-csi-driver/values.yaml +++ b/charts/aws-ebs-csi-driver/values.yaml @@ -91,6 +91,7 @@ node: podAnnotations: {} tolerateAllTaints: true tolerations: [] + resources: {} serviceAccount: controller: