STOR-2403: Rebase to upstream v2.1.8 for OCP 4.20

CHANGELOG-2.x.md

@@ -1,3 +1,16 @@
+# 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))
+* 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
+* Adding additional checks and multi threaded testing to ensure concurrent createVolume and deleteVolume calls are handled correctly ([#1592] (https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1592), [@dluthcke](https://github.com/dluthcke))
+* Clarifying Note when uninstalling CSI driver ([#1599] (https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1599), [@dluthcke](https://github.com/dluthcke))
+* Update README.md to include uninstall instructions ([#1597] (https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1596), [@dluthcke](https://github.com/dluthcke))
+* Updating sidecar versions ([#1596](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1596), [@dluthcke](https://github.com/dluthcke))
+* Update K8s version to mitigate CVE-2025-0426 ([#1594](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1594), [@mskanth97](https://github.com/mskanth972))
+# V2.1.6
+Remove libwrap=no from stunnel config on startup for newer stunnel compatibility ([#1586](https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1586/commits/5151feef34da86595a9ccc7e3c960aea537a61dc), [@dankova22](https://github.com/dankova22))
 # V2.1.5
 * Upgrade golang.net (v0.25.0 -> v0.33.0) ([#1562]https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1562)
 * Updated Python distribution to latest version and add symlink to stunnel5 to ensure compatibility ([#1569]https://github.com/kubernetes-sigs/aws-efs-csi-driver/pull/1569/files)

Dockerfile

@@ -63,6 +63,7 @@ COPY --from=rpm-provider /tmp/rpms/* /tmp/download/
 # cd, ls, cat, vim, tcpdump, are for debugging
 RUN clean_install amazon-efs-utils true && \
     clean_install crypto-policies true && \
+    clean_install "openssl-3.0.8 openssl-libs-3.0.8" true && \
     install_binary \
         /usr/bin/cat \
         /usr/bin/cd \
@@ -75,7 +76,6 @@ RUN clean_install amazon-efs-utils true && \
         /usr/bin/mount \
         /usr/bin/umount \
         /sbin/mount.nfs4 \
-        /usr/bin/openssl \
         /usr/bin/sed \
         /usr/bin/stat \
         /usr/bin/stunnel \

Makefile

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

OWNERS_ALIASES

@@ -6,3 +6,5 @@ aliases:
     - dobsonj
     - RomanBednar
     - mpatlasov
+    - dfajmon
+    - rhrmo

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

@@ -1,4 +1,10 @@
 # Helm chart
+# v3.1.8
+* Bump app/driver version to `v2.1.7`
+# v3.1.7
+* Bump app/driver version to `v2.1.6`
+# v3.1.6
+* Bump app/driver version to `v2.1.5`
 # v3.1.5
 * Bump app/driver version to `v2.1.4`
 # v3.1.4

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

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: aws-efs-csi-driver
-version: 3.1.5
-appVersion: 2.1.4
+version: 3.1.8
+appVersion: 2.1.7
 kubeVersion: ">=1.17.0-0"
 description: "A Helm chart for AWS EFS CSI Driver"
 home: https://github.com/kubernetes-sigs/aws-efs-csi-driver
@@ -15,4 +15,4 @@ maintainers:
   - name: leakingtapan
     url: https://github.com/leakingtapan
   - name: krmichel
-    url: https://github.com/krmichel
+    url: https://github.com/krmichel

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

@@ -11,14 +11,14 @@ portRangeUpperBound: "21049"
 
 image:
   repository: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
-  tag: "v2.1.4"
+  tag: "v2.1.7"
   pullPolicy: IfNotPresent
 
 sidecars:
   livenessProbe:
     image:
       repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
-      tag: v2.14.0-eks-1-31-5
+      tag: v2.14.0-eks-1-32-6
       pullPolicy: IfNotPresent
     resources: {}
     securityContext:
@@ -27,7 +27,7 @@ sidecars:
   nodeDriverRegistrar:
     image:
       repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
-      tag: v2.12.0-eks-1-31-5
+      tag: v2.13.0-eks-1-32-6
       pullPolicy: IfNotPresent
     resources: {}
     securityContext:
@@ -36,7 +36,7 @@ sidecars:
   csiProvisioner:
     image:
       repository: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
-      tag: v5.1.0-eks-1-31-5
+      tag: v5.2.0-eks-1-32-6
       pullPolicy: IfNotPresent
     resources: {}
     securityContext:

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.4
+          image: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.7
           imagePullPolicy: IfNotPresent
           args:
             - --endpoint=$(CSI_ENDPOINT)
@@ -69,7 +69,7 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: csi-provisioner
-          image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v5.1.0-eks-1-31-5
+          image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v5.2.0-eks-1-32-6
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=$(ADDRESS)
@@ -87,7 +87,7 @@ spec:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
         - name: liveness-probe
-          image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-31-5
+          image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-32-6
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=/csi/csi.sock

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.4
+          image: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.7
           imagePullPolicy: IfNotPresent
           args:
             - --endpoint=$(CSI_ENDPOINT)
@@ -91,7 +91,7 @@ spec:
             periodSeconds: 2
             failureThreshold: 5
         - name: csi-driver-registrar
-          image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.12.0-eks-1-31-5
+          image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.13.0-eks-1-32-6
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=$(ADDRESS)
@@ -115,7 +115,7 @@ spec:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
         - name: liveness-probe
-          image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-31-5
+          image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.14.0-eks-1-32-6
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=/csi/csi.sock

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

@@ -5,13 +5,13 @@ 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.4
+    newTag: v2.1.7
   - name: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/livenessprobe
-    newTag: v2.14.0-eks-1-31-5
+    newTag: v2.14.0-eks-1-32-6
   - name: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-node-driver-registrar
-    newTag: v2.12.0-eks-1-31-5
+    newTag: v2.13.0-eks-1-32-6
   - name: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-provisioner
-    newTag: v5.1.0-eks-1-31-5
+    newTag: v5.2.0-eks-1-32-6

deploy/kubernetes/overlays/stable/kustomization.yaml

@@ -4,10 +4,10 @@ bases:
   - ../../base
 images:
   - name: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
-    newTag: v2.1.4
+    newTag: v2.1.7
   - name: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
-    newTag: v2.14.0-eks-1-31-5
+    newTag: v2.14.0-eks-1-32-6
   - name: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
-    newTag: v2.12.0-eks-1-31-5
+    newTag: v2.13.0-eks-1-32-6
   - name: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
-    newTag: v5.1.0-eks-1-31-5
+    newTag: v5.2.0-eks-1-32-6

docs/README.md

@@ -89,6 +89,9 @@ The following sections are Kubernetes specific. If you are a Kubernetes user, us
 | Amazon EFS CSI Driver Version | Image                            |
 |-------------------------------|----------------------------------|
 | master branch                 | amazon/aws-efs-csi-driver:master |
+| v2.1.8                        | amazon/aws-efs-csi-driver:v2.1.8 |
+| v2.1.7                        | amazon/aws-efs-csi-driver:v2.1.7 |
+| v2.1.6                        | amazon/aws-efs-csi-driver:v2.1.6 |
 | v2.1.5                        | amazon/aws-efs-csi-driver:v2.1.5 |
 | v2.1.4                        | amazon/aws-efs-csi-driver:v2.1.4 |
 | v2.1.3                        | amazon/aws-efs-csi-driver:v2.1.3 |
@@ -155,7 +158,7 @@ The following sections are Kubernetes specific. If you are a Kubernetes user, us
 ### ECR Image
 | Driver Version | [ECR](https://gallery.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver) Image |
 |----------------|-------------------------------------------------------------------------------|
-| v2.1.5         | public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.5                |
+| v2.1.8         | public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver:v2.1.8                |
 
 **Note**  
 You can find previous efs-csi-driver versions' images from [here](https://gallery.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver)
@@ -380,11 +383,29 @@ If you want to update to a specific version, first customize the driver yaml fil
 kubectl kustomize "github.com/kubernetes-sigs/aws-efs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-2.0" > driver.yaml
 ```
 
-Then, update all lines referencing `image: amazon/aws-efs-csi-driver` to the desired version (e.g., to `image: amazon/aws-efs-csi-driver:v2.1.5`) in the yaml file, and deploy driver yaml again:
+Then, update all lines referencing `image: amazon/aws-efs-csi-driver` to the desired version (e.g., to `image: amazon/aws-efs-csi-driver:v2.1.8`) in the yaml file, and deploy driver yaml again:
 ```sh
 kubectl apply -f driver.yaml
 ```
 
+### Uninstalling the Amazon EFS CSI Driver
+
+Note: While the aws-efs-csi-driver daemonsets and controller are deleted from the cluster no new EFS PVCs will be able to be created, new pods that are created which use an EFS PV volume will not function (because the PV will not mount), and any existing pods with mounted PVs will not be able to access EFS until the driver is successfully re-installed (either manually, or through the [EKS add-on system](https://docs.aws.amazon.com/eks/latest/userguide/efs-csi.html#efs-install-driver)).
+
+Uninstall the self-managed EFS CSI Driver with either Helm or Kustomize, depending on your installation method. If you are using the driver as a managed EKS add-on, see the [EKS Documentation](https://docs.aws.amazon.com/eks/latest/userguide/efs-csi.html#efs-install-driver).
+
+**Helm**
+
+```
+helm uninstall aws-efs-csi-driver --namespace kube-system
+```
+
+**Kustomize**
+
+```
+kubectl delete -k "github.com/kubernetes-sigs/aws-efs-csi-driver/deploy/kubernetes/overlays/stable/?ref=<YOUR-CSI-DRIVER-RELEASE-OR-TAG>"
+```
+
 ### Examples
 Before following the examples, you need to:
 * Get yourself familiar with how to setup Kubernetes on AWS and how to [create Amazon EFS file system](https://docs.aws.amazon.com/efs/latest/ug/getting-started.html).

examples/kubernetes/access_points/specs/example.yaml

@@ -67,7 +67,7 @@ metadata:
 spec:
   containers:
   - name: app
-    image: centos
+    image: centos:7
     command: ["/bin/sh"]
     args: ["-c", "while true; do echo $(date -u) >> /data-dir1/out.txt; sleep 5; done"]
     volumeMounts:

examples/kubernetes/cross_account_mount/specs/pod-static-prov.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: app
-    image: centos
+    image: centos:7
     command: ["/bin/sh"]
     args: ["-c", "while true; do echo $(date -u) >> /data/out.txt; sleep 5; done"]
     volumeMounts:

examples/kubernetes/cross_account_mount/specs/pod.yaml

@@ -18,7 +18,7 @@ metadata:
 spec:
   containers:
     - name: app
-      image: centos
+      image: centos:7
       command: ["/bin/sh"]
       args: ["-c", "while true; do echo $(date -u) >> /data/out; sleep 5; done"]
       volumeMounts:

examples/kubernetes/dynamic_provisioning/specs/pod.yaml

@@ -18,7 +18,7 @@ metadata:
 spec:
   containers:
     - name: app
-      image: centos
+      image: centos:7
       command: ["/bin/sh"]
       args: ["-c", "while true; do echo $(date -u) >> /data/out; sleep 5; done"]
       volumeMounts:

examples/kubernetes/encryption_in_transit/specs/pod.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: app
-    image: centos
+    image: centos:7
     command: ["/bin/sh"]
     args: ["-c", "while true; do echo $(date -u) >> /data/out.txt; sleep 5; done"]
     volumeMounts:

examples/kubernetes/static_provisioning/specs/pod.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: app
-    image: centos
+    image: centos:7
     command: ["/bin/sh"]
     args: ["-c", "while true; do echo $(date -u) >> /data/out.txt; sleep 5; done"]
     volumeMounts:

examples/kubernetes/volume_path/specs/example.yaml

@@ -71,7 +71,7 @@ metadata:
 spec:
   containers:
   - name: app
-    image: centos
+    image: centos:7
     command: ["/bin/sh"]
     args: ["-c", "while true; do echo $(date -u) >> /data-dir1/out.txt; sleep 5; done"]
     volumeMounts: