GA v1.8.0 merge develop to master branch (#422)

IBM · Dec 16, 2021 · bc216b9 · bc216b9
1 parent 9ce398e
commit bc216b9
Show file tree

Hide file tree

Showing 121 changed files with 2,848 additions and 2,307 deletions.
diff --git a/Dockerfile-csi-controller b/Dockerfile-csi-controller
@@ -12,10 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+FROM registry.access.redhat.com/ubi8/python-38:1-75.1638364053 as builder
+COPY controller/requirements.txt /tmp/
+USER root
+RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
+USER default
+RUN pip3 install --ignore-installed --default-timeout=100 --upgrade pip==21.2.4
+# avoid default boringssl lib, since it does not support z systems
+ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True
+RUN pip3 install -r /tmp/requirements.txt
+
+
 FROM registry.access.redhat.com/ubi8/python-38:1-68
 MAINTAINER IBM Storage
 
-ARG VERSION=1.7.0
+ARG VERSION=1.8.0
 ARG BUILD_NUMBER=0
 
 ###Required Labels
@@ -29,13 +40,7 @@ LABEL name="IBM block storage CSI driver controller" \
       io.k8s.description="The IBM block storage CSI driver enables container orchestrators, such as Kubernetes and OpenShift, to manage the life-cycle of persistent storage." \
       io.openshift.tags=ibm,csi,ibm-block-csi-driver,ibm-block-csi-node
 
-COPY controller/requirements.txt /driver/controller/
-RUN pip3 install --default-timeout=100 --upgrade pip==19.3.1
-# avoid default boringssl lib, since it does not support z systems
-ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True
-ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
-RUN pip3 install -r /driver/controller/requirements.txt
-
+COPY --from=builder /opt/app-root /opt/app-root
 COPY ./common /driver/common
 COPY ./controller /driver/controller
 COPY ./LICENSE /licenses/
@@ -47,5 +52,3 @@ ENV PYTHONPATH=/driver
 # Note: UBI runs with app-user by default.
 
 ENTRYPOINT ["/driver/controller/scripts/entrypoint.sh"]
-
-
diff --git a/Dockerfile-csi-controller.test b/Dockerfile-csi-controller.test
@@ -16,19 +16,24 @@
 #    This Dockerfile.test is for running the csi controller local tests inside a container.
 #    Its similar to the Dockerfile, but with additional requirements-tests.txt and ENTRYPOINT to run the local tests.
 
-FROM registry.access.redhat.com/ubi8/python-38:1-68
-
-COPY controller/requirements.txt /driver/controller/
-RUN pip3 install --upgrade pip==19.3.1
+FROM registry.access.redhat.com/ubi8/python-38:1-75.1638364053 as builder
+COPY controller/requirements.txt /tmp/
+USER root
+RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
+USER default
+RUN pip3 install --ignore-installed --default-timeout=100 --upgrade pip==21.2.4
 # avoid default boringssl lib, since it does not support z systems
 ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True
-ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
-RUN pip3 install -r /driver/controller/requirements.txt
+RUN pip3 install -r /tmp/requirements.txt
 
 # Requires to run local testing
-COPY controller/requirements-tests.txt /driver/controller/
-RUN pip3 install -r /driver/controller/requirements-tests.txt
+COPY controller/requirements-tests.txt /tmp/
+RUN pip3 install -r /tmp/requirements-tests.txt
+
+
+FROM registry.access.redhat.com/ubi8/python-38:1-68
 
+COPY --from=builder /opt/app-root /opt/app-root
 COPY ./common /driver/common
 COPY ./controller /driver/controller
 USER root

diff --git a/Dockerfile-csi-node b/Dockerfile-csi-node
@@ -27,10 +27,10 @@ COPY . .
 RUN make ibm-block-csi-driver
 
 # Final stage
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4-208
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5-204
 MAINTAINER IBM Storage
 
-ARG VERSION=1.7.0
+ARG VERSION=1.8.0
 ARG BUILD_NUMBER=0
 
 LABEL name="IBM block storage CSI driver node" \
@@ -67,6 +67,7 @@ RUN    ln -s /chroot/chroot-host-wrapper.sh /chroot/blkid \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/multipath \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/multipathd \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/mount \
+    && ln -s /chroot/chroot-host-wrapper.sh /chroot/nvme \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/resize2fs \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/sg_inq \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/umount \

diff --git a/Dockerfile-csi-test b/Dockerfile-csi-test
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.11
+FROM golang:1.16
 
 ARG CSI_PARAMS=csi_params