Merge pull request #1770 from DavidXU12345/master

Cherry-pick pre and post release PR v2.2.0

Author: k8s-ci-robot

CHANGELOG-2.x.md

@@ -1,3 +1,11 @@
+# V2.2.0
+* Add revisionHistoryLimit support in charts ([#1760](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1760), [@DavidXU12345](https://github.com/DavidXU12345))
+* Upgrade sidecar to fix CVEs ([#1758](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1758), [@DavidXU12345](https://github.com/DavidXU12345))
+* Add force-unmount-after-timeout configuration to the helm chart ([#1751](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1751), [@brainfair](https://github.com/brainfair))
+* Add opt-in parameter to disable node mutation permissions ([#1739](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1739), [@dankova22](https://github.com/dankova22))
+* feat: Add ability to configure emptyDir params (sizeLimit, medium) ([#1727](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1727), [@mkilchhofer](https://github.com/mkilchhofer))
+* Support whitespace in tag keys and values ([#1716](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1716), [@slackfan](https://github.com/slackfan))
+* feat: added support for externalId in cross-account EFS configuration ([#1690](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1690), [@andylim0221](https://github.com/andylim0221))
 # V2.1.15
 * Golang upgrade ([#1738](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1738), [@DavidXU12345](https://github.com/DavidXU12345))
 * Update efs-utils conf for eu regions DNS ([#1737](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1737), [@dankova22](https://github.com/dankova22))
@@ -28,7 +36,7 @@
 * CVE-2025-22869: bump golang.org/x/crypto to v0.35.0 ([#1611](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1611)), [@kunalmemane](https://github.com/kunalmemane)
 # V2.1.8
 * Remove unused workflow that publishes images to dockerhub ([#1621](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1621), [@jrakas-dev](https://github.com/jrakas-dev))
-*  Return existing access point if one already exists during create workflow ([#1620](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1620), [@jrakas-dev](https://github.com/jrakas-dev))
+* Return existing access point if one already exists during create workflow ([#1620](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1620), [@jrakas-dev](https://github.com/jrakas-dev))
 * Clean install openssl and standardize eks distro ([#1619](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1619), [@dankova22](https://github.com/dankova22))
 * Fix centos image in pod config examples ([#1611](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1611), [@thakurmi](https://github.com/thakurmi))
 # V2.1.7

Makefile

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-VERSION=v2.1.15
+VERSION=v2.2.0
 
 PKG=github.com/kubernetes-sigs/aws-efs-csi-driver
 GIT_COMMIT?=$(shell git rev-parse HEAD)

charts/aws-efs-csi-driver/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Helm chart
+# v3.3.0
+* Bump app/driver version to `v2.2.0`
 # v3.2.6
 * Bump app/driver version to `v2.1.15`
 # v3.2.5

charts/aws-efs-csi-driver/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: aws-efs-csi-driver
-version: 3.2.6
-appVersion: 2.1.15
+version: 3.3.0
+appVersion: 2.2.0
 kubeVersion: ">=1.17.0-0"
 description: "A Helm chart for AWS EFS CSI Driver"
 home: https://github.com/kubernetes-sigs/aws-efs-csi-driver

charts/aws-efs-csi-driver/values.yaml

@@ -11,7 +11,7 @@ portRangeUpperBound: "21049"
 
 image:
   repository: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
-  tag: "v2.1.15"
+  tag: "v2.2.0"
   pullPolicy: IfNotPresent
 
 sidecars:

deploy/kubernetes/base/controller-deployment.yaml

@@ -37,7 +37,7 @@ spec:
         - name: efs-plugin
           securityContext:
             privileged: true
-          image: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.15
+          image: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.2.0
           imagePullPolicy: IfNotPresent
           args:
             - --endpoint=$(CSI_ENDPOINT)

deploy/kubernetes/base/node-daemonset.yaml

@@ -48,7 +48,7 @@ spec:
         - name: efs-plugin
           securityContext:
             privileged: true
-          image: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.15
+          image: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.2.0
           imagePullPolicy: IfNotPresent
           args:
             - --endpoint=$(CSI_ENDPOINT)

deploy/kubernetes/overlays/stable/ecr/kustomization.yaml

@@ -5,7 +5,7 @@ bases:
 images:
   - name: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/aws-efs-csi-driver
-    newTag: v2.1.15
+    newTag: v2.2.0
   - name: public.ecr.aws/csi-components/livenessprobe
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/livenessprobe
     newTag: v2.17.0-eksbuild.2

deploy/kubernetes/overlays/stable/kustomization.yaml

@@ -4,7 +4,7 @@ bases:
   - ../../base
 images:
   - name: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
-    newTag: v2.1.15
+    newTag: v2.2.0
   - name: public.ecr.aws/csi-components/livenessprobe
     newTag: v2.17.0-eksbuild.2
   - name: public.ecr.aws/csi-components/csi-node-driver-registrar

docs/README.md

@@ -33,7 +33,7 @@ For detailed parameter explanations, see the [parameters documentation](paramete
 ### ECR Image
 | Driver Version | [ECR](https://gallery.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver) Image |
 |----------------|-------------------------------------------------------------------------------|
-| v2.1.15        | public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.15               |
+| v2.2.0         | public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.2.0                |
 
 **Note**  
 You can find previous efs-csi-driver versions' images from [here](https://gallery.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver)