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

README.md

@@ -4,23 +4,22 @@ 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 FlashSystem 9100
  - 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)
  - IBM FlashSystem A9000/R
  - IBM DS8880
  - IBM DS8900
 
 Supported operating systems:
  - RHEL 7.x (x86 architecture)
- - RHCOS (x86 and IBM Z architecture)
+ - RHCOS (x86, IBM Z, and IBM PowerPC architectures)
 
-Full documentation can be found on the [IBM Knowledge Center](https://www.ibm.com/support/knowledgecenter/SSRQ8T).
+Full documentation can be found on the [IBM Knowledge Center] (https://www.ibm.com/support/knowledgecenter/SSRQ8T).
 
 <br/>
 <br/>
@@ -146,7 +145,7 @@ multipath -ll
 ```
 
 #### 3. Configure storage system connectivity
-3.1. Define the hostname of each Kubernetes node on the relevant storage systems with the valid WWPN(for Fibre Channel) or IQN(for iSCSI) of the node.
+3.1. Define the hostname of each Kubernetes node on the relevant storage systems with the valid WWPN (for Fibre Channel) or IQN (for iSCSI) of the node.
 
 3.2. For Fibre Channel, configure the relevant zoning from the storage to the host.
 
@@ -168,6 +167,7 @@ curl https://raw.githubusercontent.com/IBM/ibm-block-csi-operator/master/deploy/
 ```
 
 #### 2. (Optional): If required, update the image fields in the ibm-block-csi-operator.yaml.
+**Note**: Updating the namespace to a user-defined namespace may be necessary in order to ensure consistency and avoid trouble installing the operator.
 
 
 #### 3. Create a namespace.
@@ -187,7 +187,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
@@ -323,7 +323,7 @@ storageclass.storage.k8s.io/gold created
 
 ## 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
 

build/Dockerfile.operator

@@ -27,7 +27,7 @@ RUN CGO_ENABLED=1 GOOS=linux go build \
 FROM registry.access.redhat.com/ubi7/ubi-minimal:7.8-237
 MAINTAINER IBM Storage
 
-ARG VERSION=1.2.0
+ARG VERSION=1.3.0
 ARG BUILD_NUMBER=0
 
 ###Required Labels

deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr.yaml

@@ -2,7 +2,7 @@ apiVersion: csi.ibm.com/v1
 kind: IBMBlockCSI
 metadata:
  name: ibm-block-csi
- namespace: kube-system
+ namespace: default
  labels:
  app.kubernetes.io/name: ibm-block-csi-operator
  app.kubernetes.io/instance: ibm-block-csi-operator
@@ -12,7 +12,7 @@ spec:
  # container and csi-provisioner, csi-attacher and livenessprobe sidecars.
  controller:
  repository: ibmcom/ibm-block-csi-driver-controller
- tag: "1.2.0"
+ tag: "1.3.0"
  imagePullPolicy: IfNotPresent
  affinity:
  nodeAffinity:
@@ -28,7 +28,7 @@ spec:
  # and csi-node-driver-registrar and livenessprobe sidecars.
  node:
  repository: ibmcom/ibm-block-csi-driver-node
- tag: "1.2.0"
+ tag: "1.3.0"
  imagePullPolicy: IfNotPresent
  affinity:
  nodeAffinity:
@@ -52,19 +52,19 @@ spec:
  imagePullPolicy: IfNotPresent
  - name: csi-provisioner
  repository: quay.io/k8scsi/csi-provisioner
- tag: "v1.5.0"
+ tag: "v1.6.0"
  imagePullPolicy: IfNotPresent
  - name: csi-attacher
  repository: quay.io/k8scsi/csi-attacher
- tag: "v1.2.1"
+ tag: "v2.2.0"
  imagePullPolicy: IfNotPresent
  - name: csi-snapshotter
  repository: quay.io/k8scsi/csi-snapshotter
  tag: "v2.1.0"
  imagePullPolicy: IfNotPresent
  - name: livenessprobe
  repository: quay.io/k8scsi/livenessprobe
- tag: "v1.1.0"
+ tag: "v2.0.0"
  imagePullPolicy: IfNotPresent
 
 # imagePullSecrets:

deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr_ocp.yaml

@@ -0,0 +1,67 @@
+apiVersion: csi.ibm.com/v1
+kind: IBMBlockCSI
+metadata:
+ name: ibm-block-csi
+ namespace: default
+ labels:
+ app.kubernetes.io/name: ibm-block-csi-operator
+ app.kubernetes.io/instance: ibm-block-csi-operator
+ app.kubernetes.io/managed-by: ibm-block-csi-operator
+spec:
+ # controller is a statefulSet with ibm-block-csi-driver-controller
+ # container and csi-provisioner, csi-attacher and livenessprobe sidecars.
+ controller:
+ repository: ibmcom/ibm-block-csi-driver-controller
+ tag: "1.3.0"
+ imagePullPolicy: IfNotPresent
+ affinity:
+ nodeAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ nodeSelectorTerms:
+ - matchExpressions:
+ - key: kubernetes.io/arch
+ operator: In
+ values:
+ - amd64
+ - s390x
+ - ppc64le
+
+ # node is a daemonSet with ibm-block-csi-driver-node container
+ # and csi-node-driver-registrar and livenessprobe sidecars.
+ node:
+ repository: ibmcom/ibm-block-csi-driver-node
+ tag: "1.3.0"
+ imagePullPolicy: IfNotPresent
+ affinity:
+ nodeAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ nodeSelectorTerms:
+ - matchExpressions:
+ - key: kubernetes.io/arch
+ operator: In
+ values:
+ - amd64
+ - s390x
+ - ppc64le
+
+ sidecars:
+ - name: csi-node-driver-registrar
+ repository: registry.redhat.io/openshift4/ose-csi-driver-registrar
+ tag: v4.3
+ imagePullPolicy: IfNotPresent
+ - name: csi-provisioner
+ repository: registry.redhat.io/openshift4/ose-csi-external-provisioner-rhel7
+ tag: v4.4
+ imagePullPolicy: IfNotPresent
+ - name: csi-attacher
+ repository: registry.redhat.io/openshift4/ose-csi-external-attacher
+ tag: v4.4
+ imagePullPolicy: IfNotPresent
+ - name: csi-snapshotter
+ repository: registry.redhat.io/openshift4/ose-csi-external-snapshotter-rhel7
+ tag: v4.4
+ imagePullPolicy: IfNotPresent
+ - name: livenessprobe
+ repository: registry.redhat.io/openshift4/ose-csi-livenessprobe
+ tag: v4.4
+ imagePullPolicy: IfNotPresent

deploy/installer/generated/ibm-block-csi-operator.yaml

@@ -1402,7 +1402,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: ibm-block-csi-operator
- namespace: kube-system
+ namespace: default
  labels:
  product: ibm-block-csi-driver
  csi: ibm
@@ -1425,7 +1425,7 @@ spec:
  annotations:
  productName: ibm-block-csi-operator
  productID: ibm-block-csi-operator
- productVersion: "1.2.0"
+ productVersion: "1.3.0"
  spec:
  serviceAccountName: ibm-block-csi-operator
  affinity:
@@ -1438,14 +1438,15 @@ spec:
  values:
  - amd64
  - s390x
+ - ppc64le
  containers:
  - name: ibm-block-csi-operator
  resources:
  requests:
- memory: 50Mi
+ memory: 100Mi
  cpu: 50m
  limits:
- memory: 100Mi
+ memory: 200Mi
  cpu: 100m
  readinessProbe:
  exec:
@@ -1461,7 +1462,7 @@ spec:
  capabilities:
  drop:
  - ALL
- image: ibmcom/ibm-block-csi-operator:1.2.0
+ image: ibmcom/ibm-block-csi-operator:1.3.0
  imagePullPolicy: IfNotPresent
  command:
  - ibm-block-csi-operator
@@ -1709,7 +1710,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
  name: ibm-block-csi-operator
- namespace: kube-system
+ namespace: default
 roleRef:
  kind: ClusterRole
  name: ibm-block-csi-operator
@@ -1720,7 +1721,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: ibm-block-csi-operator
- namespace: kube-system
+ namespace: default
  labels:
  product: ibm-block-csi-driver
  csi: ibm