GA v1.3.0 merge develop to master branch (#232)

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/ubi7/python-36:1-58
+FROM registry.access.redhat.com/ubi7/python-36:1-74.1593607204
 MAINTAINER IBM Storage
 
-ARG VERSION=1.2.0
+ARG VERSION=1.3.0
 ARG BUILD_NUMBER=0
 
 ###Required Labels
@@ -30,7 +30,7 @@ LABEL name="IBM block storage CSI driver controller" \
       io.openshift.tags=ibm,csi,ibm-block-csi-driver,ibm-block-csi-node
 
 COPY controller/requirements.txt /driver/controller/
-RUN pip3 install --upgrade pip==19.1.1
+RUN pip3 install --default-timeout=100 --upgrade pip==19.1.1
 # avoid default boringssl lib, since it does not support z systems
 ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True
 RUN pip3 install -r /driver/controller/requirements.txt

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/ubi7/python-36:1-58
+FROM registry.access.redhat.com/ubi7/python-36:1-74.1593607204
 
 COPY controller/requirements.txt /driver/controller/
 RUN pip3 install --upgrade pip==19.1.1

Dockerfile-csi-node

@@ -27,10 +27,10 @@ COPY . .
 RUN make ibm-block-csi-driver
 
 # Final stage
-FROM registry.access.redhat.com/ubi7/ubi-minimal:7.7-138
+FROM registry.access.redhat.com/ubi7/ubi-minimal:7.8-328
 MAINTAINER IBM Storage
 
-ARG VERSION=1.2.0
+ARG VERSION=1.3.0
 ARG BUILD_NUMBER=0
 
 LABEL name="IBM block storage CSI driver node" \
@@ -56,17 +56,18 @@ ADD chroot-host-wrapper.sh /chroot
 RUN chmod 777 /chroot/chroot-host-wrapper.sh
 RUN    ln -s /chroot/chroot-host-wrapper.sh /chroot/blkid \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/blockdev \
+    && ln -s /chroot/chroot-host-wrapper.sh /chroot/fsck \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/iscsiadm \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/iscsid \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/lsblk \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/lsscsi \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/mkfs.ext3 \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/mkfs.ext4 \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/mkfs.xfs \
-    && ln -s /chroot/chroot-host-wrapper.sh /chroot/fsck \
     && 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/sg_inq \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/umount
 
 ENV PATH="/chroot:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

README.md

@@ -4,10 +4,10 @@ The Container Storage Interface (CSI) Driver for IBM block storage systems enabl
 This is the official operator to deploy and manage IBM block storage CSI driver.
 
 Supported container platforms:
-  - OpenShift v4.3
   - OpenShift v4.4
-  - Kubernetes v1.16
+  - OpenShift v4.5
   - Kubernetes v1.17
+  - Kubernetes v1.18
 
 Supported IBM storage systems:
   - IBM Spectrum Virtualize Family (including IBM Flash family members built with IBM Spectrum Virtualize (FlashSystem 5010, 5030, 5100, 7200, 9100, 9200, 9200R) and IBM SAN Volume Controller (SVC) models SV2, SA2)
@@ -186,7 +186,7 @@ $ kubectl -n <namespace> apply -f ibm-block-csi-operator.yaml
 ```bash
 $ kubectl get pod -l app.kubernetes.io/name=ibm-block-csi-operator -n <namespace>
 NAME                                    READY   STATUS    RESTARTS   AGE
-ibm-block-csi-operator-5bb7996b86-xntss 2/2     Running   0          10m
+ibm-block-csi-operator-5bb7996b86-xntss 1/1     Running   0          10m
 ```
 
 ### Create an IBMBlockCSI custom resource
@@ -407,7 +407,7 @@ No resources found.
 
 ## Upgrading
 
-In order to upgrade the CSI operator and driver from a previous version, uninstall the existing driver and then install the newer version.
+In order to upgrade the CSI operator and driver from a previous version, uninstall the existing operator and driver, and then install the newer version.
 
 ## Uninstalling
 

USAGE-DETAILS.md

@@ -19,7 +19,7 @@ kind: Secret
 apiVersion: v1
 metadata:
   name: svc-array
-  namespace: kube-system
+  namespace: default 
 type: Opaque
 stringData:
   management_address: <ADDRESS_1,ADDRESS_2> # Array management addresses
@@ -42,9 +42,9 @@ parameters:
   pool: gold
 
   csi.storage.k8s.io/provisioner-secret-name: svc-array
-  csi.storage.k8s.io/provisioner-secret-namespace: kube-system
+  csi.storage.k8s.io/provisioner-secret-namespace: default 
   csi.storage.k8s.io/controller-publish-secret-name: svc-array
-  csi.storage.k8s.io/controller-publish-secret-namespace: kube-systen
+  csi.storage.k8s.io/controller-publish-secret-namespace: default
 
   csi.storage.k8s.io/fstype: xfs   # Optional. values ext4\xfs. The default is ext4.
   volume_name_prefix: demo         # Optional.
@@ -288,7 +288,7 @@ No resources found.
 ## Troubleshooting
 ```
 ###### View the CSI pods, daemonset and statefulset:
-$> kubectl get all -n kube-system  -l csi
+$> kubectl get all -n default   -l csi
 NAME                             READY   STATUS    RESTARTS   AGE
 pod/ibm-block-csi-controller-0   5/5     Running   0          9m36s
 pod/ibm-block-csi-node-jvmvh     3/3     Running   0          9m36s
@@ -301,13 +301,13 @@ NAME                                        READY   AGE
 statefulset.apps/ibm-block-csi-controller   1/1     9m36s
 
 ###### If pod/ibm-block-csi-controller-0 Status is not Running, troubleshoot by running the following:
-$> kubectl describe -n kube-system pod/ibm-block-csi-controller-0
+$> kubectl describe -n default  pod/ibm-block-csi-controller-0
 
 ###### View the CSI controller logs
-$> kubectl log -f -n kube-system ibm-block-csi-controller-0 -c ibm-block-csi-controller
+$> kubectl log -f -n default  ibm-block-csi-controller-0 -c ibm-block-csi-controller
 
 ###### View the CSI daemonset node logs
-$> kubectl log -f -n kube-system ibm-block-csi-node-<PODID> -c ibm-block-csi-node
+$> kubectl log -f -n default  ibm-block-csi-node-<PODID> -c ibm-block-csi-node
 ```
 
 Additional driver details:
@@ -333,7 +333,7 @@ Spec:
 Events:                       <none>
 
 
-$> kubectl get -n kube-system  csidriver,sa,clusterrole,clusterrolebinding,statefulset,pod,daemonset | grep ibm-block-csi
+$> kubectl get -n default   csidriver,sa,clusterrole,clusterrolebinding,statefulset,pod,daemonset | grep ibm-block-csi
 csidriver.storage.k8s.io/block.csi.ibm.com   2019-06-02T09:30:36Z
 serviceaccount/ibm-block-csi-controller-sa          1         2m16s
 clusterrole.rbac.authorization.k8s.io/ibm-block-csi-cluster-driver-registrar-role                            2m16s

common/config.yaml

@@ -1,6 +1,6 @@
 identity:
    name: block.csi.ibm.com
-   version: 1.2.0
+   version: 1.3.0
    capabilities: 
       - CONTROLLER_SERVICE