Merge pull request #2316 from AndrewSirenko/fix-chart

Fix helm regression with a1CompatibilityDaemonSet & release chart v2.39.2
kubernetes-sigs · Jan 28, 2025 · bb3dea0 · bb3dea0
2 parents 08ac466 + b6e7d78
commit bb3dea0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/charts/aws-ebs-csi-driver/CHANGELOG.md b/charts/aws-ebs-csi-driver/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Helm chart
 
+## v2.39.2
+
+### Urgent Upgrade Notes
+
+Please upgrade from v2.38.1 directly to v2.39.2 to avoid upgrade failures if you are relying on `a1CompatibilityDaemonSet`. 
+
+### Bug or Regression
+- Fix helm regression when `a1CompatibilityDaemonSet=true` ([#2316](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/2316), [@AndrewSirenko](https://github.com/AndrewSirenko))
+
 ## v2.39.1
 
 ### Bug or Regression

diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.39.0
 name: aws-ebs-csi-driver
 description: A Helm chart for AWS EBS CSI Driver
-version: 2.39.1
+version: 2.39.2
 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
@@ -12,7 +12,9 @@
 {{- include "node" (deepCopy $ | mustMerge $args) -}}
 {{- end }}
 {{- if .Values.a1CompatibilityDaemonSet }}
-{{- not .Values.fips | required "FIPS mode not supported for A1 instance family compatibility image" -}}
+{{- if .Values.fips -}}
+{{- fail "FIPS mode not supported for A1 instance family compatibility image" -}}
+{{- end -}}
 {{$args := dict
   "NodeName" "ebs-csi-node-a1compat"
   "Values" (dict