Merge pull request #1569 from dankova22/stunnel-fix

Upgrade python distro and create symlink to stunnel5

Author: k8s-ci-robot

Dockerfile

@@ -28,7 +28,7 @@ ENV EFS_CLIENT_SOURCE=$client_source
 
 RUN OS=${TARGETOS} ARCH=${TARGETARCH} make $TARGETOS/$TARGETARCH
 
-FROM public.ecr.aws/eks-distro-build-tooling/python:3.9.14-gcc-al2 as rpm-provider
+FROM public.ecr.aws/eks-distro-build-tooling/python:3.11-gcc-al23 as rpm-provider
 
 # Install efs-utils from github by default. It can be overriden to `yum` with --build-arg when building the Docker image.
 # If value of `EFSUTILSSOURCE` build arg is overriden with `yum`, docker will install efs-utils from Amazon Linux 2's yum repo.
@@ -38,7 +38,7 @@ RUN mkdir -p /tmp/rpms && \
     then echo "Installing efs-utils from Amazon Linux 2 yum repo" && \
          yum -y install --downloadonly --downloaddir=/tmp/rpms amazon-efs-utils-1.35.0-1.amzn2.noarch; \
     else echo "Installing efs-utils from github using the latest git tag" && \
-        yum -y install systemd git rpm-build make openssl-devel curl && \
+         yum -y install systemd git rpm-build make openssl-devel curl && \
          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
          source $HOME/.cargo/env && \
          rustup update && \
@@ -55,28 +55,30 @@ RUN mkdir -p /tmp/rpms && \
 RUN pip3 install --user botocore
 
 # This image is equivalent to the eks-distro-minimal-base-python image but with pip installed as well
-FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-python-builder:3.9.14-al2 as rpm-installer
+FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-python-builder:3.11-al23 as rpm-installer
 
 COPY --from=rpm-provider /tmp/rpms/* /tmp/download/
 
 # second param indicates to skip installing dependency rpms, these will be installed manually
 # cd, ls, cat, vim, tcpdump, are for debugging
 RUN clean_install amazon-efs-utils true && \
+    clean_install crypto-policies true && \
     install_binary \
         /usr/bin/cat \
         /usr/bin/cd \
         /usr/bin/df \
         /usr/bin/env \
         /usr/bin/find \
         /usr/bin/grep \
+        /usr/bin/ln \
         /usr/bin/ls \
         /usr/bin/mount \
         /usr/bin/umount \
         /sbin/mount.nfs4 \
         /usr/bin/openssl \
         /usr/bin/sed \
         /usr/bin/stat \
-        /usr/bin/stunnel5 \
+        /usr/bin/stunnel \
         /usr/sbin/tcpdump \
         /usr/bin/which && \
     cleanup "efs-csi"
@@ -88,12 +90,15 @@ RUN clean_install amazon-efs-utils true && \
 # Those static files need to be copied back to the config directory when the driver starts up.
 RUN mv /newroot/etc/amazon/efs /newroot/etc/amazon/efs-static-files
 
-FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-python:3.9.14-al2 AS linux-amazon
+FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-python:3.11-al23 AS linux-amazon
 
 COPY --from=rpm-installer /newroot /
-COPY --from=rpm-provider /root/.local/lib/python3.9/site-packages/ /usr/lib/python3.9/site-packages/
+COPY --from=rpm-provider /root/.local/lib/python3.11/site-packages/ /usr/lib/python3.11/site-packages/
 
 COPY --from=go-builder /go/src/github.com/kubernetes-sigs/aws-efs-csi-driver/bin/aws-efs-csi-driver /bin/aws-efs-csi-driver
 COPY THIRD-PARTY /
 
+# Create a symbolic link for stunnel5 to stunnel (for backward compatibility)
+RUN if [ -f /usr/bin/stunnel ]; then ln -s /usr/bin/stunnel /usr/bin/stunnel5; fi
+
 ENTRYPOINT ["/bin/aws-efs-csi-driver"]