From da0df42aa1399bf58af39034eb4207c9ad9ef315 Mon Sep 17 00:00:00 2001 From: Drew Sirenko <68304519+AndrewSirenko@users.noreply.github.com> Date: Tue, 20 Feb 2024 13:09:59 -0500 Subject: [PATCH 1/3] Expose node.reservedVolumeAttachments in helm chart --- charts/aws-ebs-csi-driver/templates/_node.tpl | 3 +++ charts/aws-ebs-csi-driver/values.yaml | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/charts/aws-ebs-csi-driver/templates/_node.tpl b/charts/aws-ebs-csi-driver/templates/_node.tpl index aefe87e273..e4d84af680 100644 --- a/charts/aws-ebs-csi-driver/templates/_node.tpl +++ b/charts/aws-ebs-csi-driver/templates/_node.tpl @@ -67,6 +67,9 @@ spec: args: - node - --endpoint=$(CSI_ENDPOINT) + {{- with .Values.node.reservedVolumeAttachments }} + - --reserved-volume-attachments={{ . }} + {{- end }} {{- with .Values.node.volumeAttachLimit }} - --volume-attach-limit={{ . }} {{- end }} diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml index c1f700cce0..133a7d4168 100644 --- a/charts/aws-ebs-csi-driver/values.yaml +++ b/charts/aws-ebs-csi-driver/values.yaml @@ -377,7 +377,12 @@ node: # Enable the linux daemonset creation enableLinux: true enableWindows: false + # The number of attachment slots to reserve for system use (and not to be used for CSI volumes) + # When this parameter is not specified (or set to -1), the EBS CSI Driver will attempt to determine the number of reserved slots via heuristic + # Cannot be specified at the same time as `node.volumeAttachLimit` + reservedVolumeAttachments: # The "maximum number of attachable volumes" per node + # Cannot be specified at the same time as `node.reservedVolumeAttachments` volumeAttachLimit: updateStrategy: type: RollingUpdate From f715fd5896b0803b87b82c90178650db13296a39 Mon Sep 17 00:00:00 2001 From: Drew Sirenko <68304519+AndrewSirenko@users.noreply.github.com> Date: Tue, 20 Feb 2024 13:10:07 -0500 Subject: [PATCH 2/3] Expose node.additionalArgs in helm chart --- charts/aws-ebs-csi-driver/templates/_node.tpl | 3 +++ charts/aws-ebs-csi-driver/values.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/charts/aws-ebs-csi-driver/templates/_node.tpl b/charts/aws-ebs-csi-driver/templates/_node.tpl index e4d84af680..d62485dfde 100644 --- a/charts/aws-ebs-csi-driver/templates/_node.tpl +++ b/charts/aws-ebs-csi-driver/templates/_node.tpl @@ -80,6 +80,9 @@ spec: {{- if .Values.node.otelTracing }} - --enable-otel-tracing=true {{- end}} + {{- range .Values.node.additionalArgs }} + - {{ . }} + {{- end }} env: - name: CSI_ENDPOINT value: unix:/csi/csi.sock diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml index 133a7d4168..83ea5c339b 100644 --- a/charts/aws-ebs-csi-driver/values.yaml +++ b/charts/aws-ebs-csi-driver/values.yaml @@ -332,6 +332,7 @@ node: loggingFormat: text logLevel: 2 priorityClassName: + additionalArgs: [] affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: From 36de60a5605a674191746e07cef3284bf5fe36e5 Mon Sep 17 00:00:00 2001 From: Drew Sirenko <68304519+AndrewSirenko@users.noreply.github.com> Date: Tue, 20 Feb 2024 13:10:19 -0500 Subject: [PATCH 3/3] Release helm chart v2.28.1 --- charts/aws-ebs-csi-driver/CHANGELOG.md | 4 ++++ charts/aws-ebs-csi-driver/Chart.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/aws-ebs-csi-driver/CHANGELOG.md b/charts/aws-ebs-csi-driver/CHANGELOG.md index 6ffa069f6a..bf59abb04e 100644 --- a/charts/aws-ebs-csi-driver/CHANGELOG.md +++ b/charts/aws-ebs-csi-driver/CHANGELOG.md @@ -1,4 +1,8 @@ # Helm chart +## v2.28.1 +* Add `reservedVolumeAttachments` that overrides heuristic-determined reserved attachments via `--reserved-volume-attachments` CLI option from [PR #1919](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1919) through Helm ([#1939](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1939), [@AndrewSirenko](https://github.com/AndrewSirenko)) +* Add `additionalArgs` parameter to node daemonSet ([#1939](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1939), [@AndrewSirenko](https://github.com/AndrewSirenko)) + ## v2.28.0 ### Urgent Upgrade Notes *(No, really, you MUST read this before you upgrade)* diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml index 435d157893..e6bd4b7404 100644 --- a/charts/aws-ebs-csi-driver/Chart.yaml +++ b/charts/aws-ebs-csi-driver/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 1.28.0 name: aws-ebs-csi-driver description: A Helm chart for AWS EBS CSI Driver -version: 2.28.0 +version: 2.28.1 kubeVersion: ">=1.17.0-0" home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver sources: