GA v1.7.0 merge develop to master branch (#381)

IBM · Sep 30, 2021 · 9ce398e · 9ce398e
1 parent 10fad19
commit 9ce398e
Show file tree

Hide file tree

Showing 123 changed files with 4,455 additions and 2,344 deletions.
diff --git a/Dockerfile-csi-controller b/Dockerfile-csi-controller
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM registry.access.redhat.com/ubi8/python-38:1-60
+FROM registry.access.redhat.com/ubi8/python-38:1-68
 MAINTAINER IBM Storage
 
-ARG VERSION=1.6.0
+ARG VERSION=1.7.0
 ARG BUILD_NUMBER=0
 
 ###Required Labels
@@ -33,8 +33,6 @@ 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
-# TODO: remove CRYPTOGRAPHY_ALLOW_OPENSSL_102 when upgrading to ubi8
-ENV CRYPTOGRAPHY_ALLOW_OPENSSL_102=true
 ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
 RUN pip3 install -r /driver/controller/requirements.txt
 

diff --git a/Dockerfile-csi-controller.test b/Dockerfile-csi-controller.test
@@ -16,7 +16,7 @@
 #    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-60
+FROM registry.access.redhat.com/ubi8/python-38:1-68
 
 COPY controller/requirements.txt /driver/controller/
 RUN pip3 install --upgrade pip==19.3.1

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-200
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4-208
 MAINTAINER IBM Storage
 
-ARG VERSION=1.6.0
+ARG VERSION=1.7.0
 ARG BUILD_NUMBER=0
 
 LABEL name="IBM block storage CSI driver node" \

diff --git a/Dockerfile-csi-test b/Dockerfile-csi-test
@@ -33,6 +33,6 @@ ENV SECRET_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver
 ENV PARAM_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/${CSI_PARAMS}"
 ENV ENDPOINT="/tmp/k8s_dir/nodecsi"
 ENV ENDPOINT_CONTROLLER="/tmp/k8s_dir/f"
-ENV TESTS_TO_RUN_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/csi_tests_to_run"
+ENV TESTS_TO_SKIP_FILE="/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/csi_tests_to_skip"
 
 ENTRYPOINT ["/usr/local/go/src/github.com/kubernetes-csi/csi-test/ibm-driver/entrypoint-csi-tests.sh"]
diff --git a/NOTICES b/NOTICES
@@ -5,7 +5,7 @@ This file details additional third party software license agreements
 and third party notices and information that are required
 to be reproduced for the following programs:
 
-IBM Block Storage CSI Driver version 1.6.0
+IBM Block Storage CSI Driver version 1.7.0
 
 
 
@@ -1409,7 +1409,7 @@ End of GNU GPL Version 3.0 License
 
 ===========================================================================
 END OF TERMS AND CONDITIONS FOR SEPARATELY LICENSED CODE for IBM Block
-Storage CSI Driver version 1.6.0
+Storage CSI Driver version 1.7.0
 ===========================================================================
 
 
@@ -1420,7 +1420,7 @@ Storage CSI Driver version 1.6.0
 
 GNU GPL and / or LGPL Source Code for:
 
-IBM Block Storage CSI Driver 1.6.0
+IBM Block Storage CSI Driver 1.7.0
 
 ===========================================================================
 
@@ -1439,7 +1439,7 @@ General Public License 2.0.
     Red Hat Universal Base Image 8 Python 3.8
 
 Source code to any of the above-listed packages distributed with IBM
-Block Storage CSI Driver 1.6.0 is available at the website below, when
+Block Storage CSI Driver 1.7.0 is available at the website below, when
 a URL is provided, or by sending a request to the following address or
 email:
 
@@ -1468,7 +1468,7 @@ General Public License 3.0.
     Red Hat Universal Base Image 8 Python 3.8
 
 Source code to any of the above-listed packages distributed with IBM
-Block Storage CSI Driver 1.6.0 is available at the website below, when
+Block Storage CSI Driver 1.7.0 is available at the website below, when
 a URL is provided, or by sending a request to the following address or
 email:
 
@@ -2498,6 +2498,6 @@ END OF yaml-2.2.8 NOTICES AND INFORMATION
 
 ===========================================================================
 END OF NOTICES AND INFORMATION FOR IBM Block Storage CSI
-Driver 1.6.0
+Driver 1.7.0
 ===========================================================================