Merge pull request #1654 from dankova22/pre-rel-2.1.9-clean

Cherry pick PRs for release 2.1.9

Author: dankova22

Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM public.ecr.aws/eks-distro-build-tooling/golang:1.22.9 as go-builder
+FROM public.ecr.aws/eks-distro-build-tooling/golang:1.23.0 as go-builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-efs-csi-driver
 
 ARG TARGETOS
@@ -63,7 +63,6 @@ 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 \
@@ -76,6 +75,7 @@ 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

@@ -129,7 +129,7 @@ test-e2e:
 .PHONY: test-e2e-external-eks
 test-e2e-external-eks:
 	CLUSTER_TYPE=eksctl \
-	K8S_VERSION="1.25" \
+	K8S_VERSION="1.27" \
 	DRIVER_NAME=aws-efs-csi-driver \
 	HELM_VALUES_FILE="./hack/values_eksctl.yaml" \
 	CONTAINER_NAME=efs-plugin \

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

@@ -18,7 +18,7 @@ sidecars:
   livenessProbe:
     image:
       repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
-      tag: v2.14.0-eks-1-32-6
+      tag: v2.15.0-eks-1-33-3
       pullPolicy: IfNotPresent
     resources: {}
     securityContext:
@@ -27,7 +27,7 @@ sidecars:
   nodeDriverRegistrar:
     image:
       repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
-      tag: v2.13.0-eks-1-32-6
+      tag: v2.13.0-eks-1-33-3
       pullPolicy: IfNotPresent
     resources: {}
     securityContext:
@@ -36,7 +36,7 @@ sidecars:
   csiProvisioner:
     image:
       repository: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
-      tag: v5.2.0-eks-1-32-6
+      tag: v5.2.0-eks-1-33-3
       pullPolicy: IfNotPresent
     resources: {}
     securityContext:

deploy/kubernetes/base/controller-deployment.yaml

@@ -69,7 +69,7 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: csi-provisioner
-          image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v5.2.0-eks-1-32-6
+          image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v5.2.0-eks-1-33-3
           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-32-6
+          image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.15.0-eks-1-33-3
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=/csi/csi.sock

deploy/kubernetes/base/node-daemonset.yaml

@@ -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.13.0-eks-1-32-6
+          image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.13.0-eks-1-33-3
           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-32-6
+          image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.15.0-eks-1-33-3
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=/csi/csi.sock

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

@@ -8,10 +8,10 @@ images:
     newTag: v2.1.8
   - 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-32-6
+    newTag: v2.15.0-eks-1-33-3
   - 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.13.0-eks-1-32-6
+    newTag: v2.13.0-eks-1-33-3
   - name: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-provisioner
-    newTag: v5.2.0-eks-1-32-6
+    newTag: v5.2.0-eks-1-33-3

deploy/kubernetes/overlays/stable/kustomization.yaml

@@ -6,8 +6,8 @@ images:
   - name: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
     newTag: v2.1.8
   - name: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
-    newTag: v2.14.0-eks-1-32-6
+    newTag: v2.15.0-eks-1-33-3
   - name: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
-    newTag: v2.13.0-eks-1-32-6
+    newTag: v2.13.0-eks-1-33-3
   - name: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
-    newTag: v5.2.0-eks-1-32-6
+    newTag: v5.2.0-eks-1-33-3

examples/kubernetes/access_points/specs/example.yaml

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