From 8558f58a5a61cef76c558e5caeabd28dca50c2a9 Mon Sep 17 00:00:00 2001 From: Connor Catlett Date: Mon, 16 Sep 2024 17:25:56 +0000 Subject: [PATCH] Fix csi-attacher crash due to VAC feature gate on wrong sidecar Signed-off-by: Connor Catlett --- charts/aws-ebs-csi-driver/CHANGELOG.md | 3 +++ charts/aws-ebs-csi-driver/Chart.yaml | 2 +- charts/aws-ebs-csi-driver/templates/controller.yaml | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/charts/aws-ebs-csi-driver/CHANGELOG.md b/charts/aws-ebs-csi-driver/CHANGELOG.md index d15a9dd9d6..148c6aefe2 100644 --- a/charts/aws-ebs-csi-driver/CHANGELOG.md +++ b/charts/aws-ebs-csi-driver/CHANGELOG.md @@ -1,4 +1,7 @@ # Helm chart +## v2.35.1 +* Fix an issue causing the `csi-attacher` container to get stuck in `CrashLoopBackoff` on clusters with VAC enabled. Users with a VAC-enabled cluster are strongly encouraged to skip `v2.35.0` and/or upgrade directly to `v2.35.1` or later. + ## v2.35.0 * Bump driver version to `v1.35.0` * Add reservedVolumeAttachments to windows nodes ([#2134](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/2134),[@AndrewSirenko](https://github.com/AndrewSirenko)) diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml index 0c60b88b50..bb7de97ad9 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.35.0 name: aws-ebs-csi-driver description: A Helm chart for AWS EBS CSI Driver -version: 2.35.0 +version: 2.35.1 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/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml index f5d42f89ca..30dbf4de5f 100644 --- a/charts/aws-ebs-csi-driver/templates/controller.yaml +++ b/charts/aws-ebs-csi-driver/templates/controller.yaml @@ -290,9 +290,6 @@ spec: {{- if not (regexMatch "(-retry-interval-max)" (join " " .Values.sidecars.attacher.additionalArgs)) }} - --retry-interval-max=5m {{- end }} - {{- if .Capabilities.APIVersions.Has "storage.k8s.io/v1beta1/VolumeAttributesClass" }} - - --feature-gates=VolumeAttributesClass=true - {{- end }} {{- range .Values.sidecars.attacher.additionalArgs }} - {{ . }} {{- end }} @@ -455,6 +452,9 @@ spec: {{- if not (regexMatch "(-retry-interval-max)" (join " " .Values.sidecars.resizer.additionalArgs)) }} - --retry-interval-max=30m {{- end }} + {{- if .Capabilities.APIVersions.Has "storage.k8s.io/v1beta1/VolumeAttributesClass" }} + - --feature-gates=VolumeAttributesClass=true + {{- end }} {{- range .Values.sidecars.resizer.additionalArgs }} - {{ . }} {{- end }}