Merge develop into master 1.11.0 (#315)

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:
 
-Operator for IBM Block Storage CSI Driver version 1.10.0
+Operator for IBM Block Storage CSI Driver version 1.11.0
 
 
 
@@ -2276,7 +2276,7 @@ End of GNU GPL Version 3.0 License
 
 ===========================================================================
 END OF TERMS AND CONDITIONS FOR SEPARATELY LICENSED CODE for Operator for
-IBM Block Storage CSI Driver version 1.10.0
+IBM Block Storage CSI Driver version 1.11.0
 ===========================================================================
 
 
@@ -2287,7 +2287,7 @@ IBM Block Storage CSI Driver version 1.10.0
 
 GNU GPL and / or LGPL Source Code for:
 
-Operator for IBM Block Storage CSI Driver 1.10.0
+Operator for IBM Block Storage CSI Driver 1.11.0
 
 ===========================================================================
 
@@ -2306,7 +2306,7 @@ General Public License 2.0.
     Red Hat Universal Base Image 8
 
 Source code to any of the above-listed packages distributed with
-Operator for IBM Block Storage CSI Driver 1.10.0 is available at the
+Operator for IBM Block Storage CSI Driver 1.11.0 is available at the
 website below, when a URL is provided, or by sending a request to the
 following address or email:
 
@@ -2335,7 +2335,7 @@ General Public License 3.0.
     Red Hat Universal Base Image 8
 
 Source code to any of the above-listed packages distributed with
-Operator for IBM Block Storage CSI Driver 1.10.0 is available at the
+Operator for IBM Block Storage CSI Driver 1.11.0 is available at the
 website below, when a URL is provided, or by sending a request to the
 following address or email:
 
@@ -2363,7 +2363,7 @@ under the GNU Lesser General Public License 3.0.
     Prometheus version 1.8.2
 
 Source code to any of the above-listed packages distributed with
-Operator for IBM Block Storage CSI Driver 1.10.0 is available at the
+Operator for IBM Block Storage CSI Driver 1.11.0 is available at the
 website below, when a URL is provided, or by sending a request to the
 following address or email:
 
@@ -5160,6 +5160,6 @@ END OF thrift NOTICES AND INFORMATION
 
 ===========================================================================
 END OF NOTICES AND INFORMATION FOR Operator for IBM Block
-Storage CSI Driver 1.10.0
+Storage CSI Driver 1.11.0
 ===========================================================================
 

api/v1/hostdefinition_types.go

@@ -30,14 +30,23 @@ type HostDefinitionSpec struct {
 
 // Definition defines the observed state of HostDefinition
 type Definition struct {
-	NodeName string `json:"nodeName"`
+	NodeName          string `json:"nodeName"`
+	ManagementAddress string `json:"managementAddress"`
 
 	// +kubebuilder:validation:Optional
 	SecretName string `json:"secretName"`
 	// +kubebuilder:validation:Optional
 	SecretNamespace string `json:"secretNamespace"`
 	// +kubebuilder:validation:Optional
 	NodeId string `json:"nodeId"`
+	// +kubebuilder:validation:Optional
+	ConnectivityType string `json:"connectivityType"`
+	// +kubebuilder:validation:Optional
+	Ports []string `json:"ports"`
+	// +kubebuilder:validation:Optional
+	NodeNameOnStorage string `json:"nodeNameOnStorage"`
+	// +kubebuilder:validation:Optional
+	IOGroups []int `json:"ioGroups"`
 }
 
 // HostDefinitionStatus defines the status of the host definition on the storage
@@ -53,6 +62,7 @@ type HostDefinitionStatus struct {
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`
 // +kubebuilder:printcolumn:name="Node",type=string,JSONPath=`.spec.hostDefinition.nodeName`
+// +kubebuilder:printcolumn:name="Management_Address",type=string,JSONPath=`.spec.hostDefinition.managementAddress`
 type HostDefinition struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

build/Dockerfile.operator

@@ -24,10 +24,10 @@ RUN CGO_ENABLED=1 GOOS=linux go build \
 	main.go
 
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6-854
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049
 MAINTAINER IBM Storage
 
-ARG VERSION=1.10.0
+ARG VERSION=1.11.0
 ARG BUILD_NUMBER=0
 
 ###Required Labels

build/ci/Jenkinsfile

@@ -1,6 +1,6 @@
 pipeline {
     parameters {
-        string(name: 'IMAGE_VERSION', defaultValue: "1.10.0")
+        string(name: 'IMAGE_VERSION', defaultValue: "1.11.0")
         string(name: 'DOCKER_REGISTRY', defaultValue: DEFAULT_DOCKER_REGISTRY)
         string(name: 'EMAIL_TO', defaultValue: "")
     }

build/ci/multiarch/helper_to_push_csi_images_and_manifests.sh

@@ -49,14 +49,15 @@ function push_arch_images_and_create_manifest_for_app() {
 operator_envs="in_OPERATOR_IMAGE_AMD64 out_OPERATOR_IMAGE_AMD64 in_OPERATOR_IMAGE_PPC64LE out_OPERATOR_IMAGE_PPC64LE in_OPERATOR_IMAGE_S390X out_OPERATOR_IMAGE_S390X out_OPERATOR_IMAGE_MULTIARCH"
 controller_envs="in_CONTROLLER_IMAGE_AMD64 out_CONTROLLER_IMAGE_AMD64 in_CONTROLLER_IMAGE_PPC64LE out_CONTROLLER_IMAGE_PPC64LE in_CONTROLLER_IMAGE_S390X out_CONTROLLER_IMAGE_S390X out_CONTROLLER_IMAGE_MULTIARCH"
 node_envs="in_NODE_IMAGE_AMD64 out_NODE_IMAGE_AMD64 in_NODE_IMAGE_PPC64LE out_NODE_IMAGE_PPC64LE in_NODE_IMAGE_S390X out_NODE_IMAGE_S390X out_NODE_IMAGE_MULTIARCH"
+hostdefiner_envs="in_HOST_DEFINER_IMAGE_AMD64 out_HOST_DEFINER_IMAGE_AMD64 in_HOST_DEFINER_IMAGE_PPC64LE out_HOST_DEFINER_IMAGE_PPC64LE in_HOST_DEFINER_IMAGE_S390X out_HOST_DEFINER_IMAGE_S390X out_HOST_DEFINER_IMAGE_MULTIARCH"
 
 HELPER_PUSH_IMAGE=./helper_to_push_docker_image.sh
 HELPER_PUSH_MANIFEST=./helper_to_push_docker_manifest.sh
 
 date
 # Validations
 [ -f $HELPER_PUSH_IMAGE -a -f $HELPER_PUSH_MANIFEST ] && : || exit 1
-for expected_env in $operator_envs $controller_envs $node_envs; do
+for expected_env in $operator_envs $controller_envs $node_envs $hostdefiner_envs; do
   [ -z "$(printenv $expected_env)" ] && {
     echo "Error: expected env [$expected_env] does not exist. Please set it first."
     exit 1
@@ -69,6 +70,7 @@ echo "TAG_LATEST=$TAG_LATEST"
 push_arch_images_and_create_manifest_for_app "operator"   $in_OPERATOR_IMAGE_AMD64    $out_OPERATOR_IMAGE_AMD64    $in_OPERATOR_IMAGE_PPC64LE    $out_OPERATOR_IMAGE_PPC64LE    $in_OPERATOR_IMAGE_S390X    $out_OPERATOR_IMAGE_S390X    $out_OPERATOR_IMAGE_MULTIARCH    $TAG_LATEST
 push_arch_images_and_create_manifest_for_app "controller" $in_CONTROLLER_IMAGE_AMD64  $out_CONTROLLER_IMAGE_AMD64  $in_CONTROLLER_IMAGE_PPC64LE  $out_CONTROLLER_IMAGE_PPC64LE  $in_CONTROLLER_IMAGE_S390X  $out_CONTROLLER_IMAGE_S390X  $out_CONTROLLER_IMAGE_MULTIARCH  $TAG_LATEST
 push_arch_images_and_create_manifest_for_app "node"       $in_NODE_IMAGE_AMD64        $out_NODE_IMAGE_AMD64        $in_NODE_IMAGE_PPC64LE        $out_NODE_IMAGE_PPC64LE        $in_NODE_IMAGE_S390X        $out_NODE_IMAGE_S390X        $out_NODE_IMAGE_MULTIARCH        $TAG_LATEST
+push_arch_images_and_create_manifest_for_app "hostdefiner"       $in_HOST_DEFINER_IMAGE_AMD64        $out_HOST_DEFINER_IMAGE_AMD64        $in_HOST_DEFINER_IMAGE_PPC64LE        $out_HOST_DEFINER_IMAGE_PPC64LE        $in_HOST_DEFINER_IMAGE_S390X        $out_HOST_DEFINER_IMAGE_S390X        $out_HOST_DEFINER_IMAGE_MULTIARCH        $TAG_LATEST
 
 date
 echo "######################################"
@@ -78,3 +80,4 @@ echo "######################################"
 echo $out_OPERATOR_IMAGE_MULTIARCH
 echo $out_CONTROLLER_IMAGE_MULTIARCH
 echo $out_NODE_IMAGE_MULTIARCH
+echo $out_HOST_DEFINER_IMAGE_MULTIARCH

config/crd/bases/csi.ibm.com_hostdefiners.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/name: ibm-block-csi-operator
     csi: ibm
     product: ibm-block-csi-driver
-    release: v1.10.0
+    release: v1.11.0
   name: hostdefiners.csi.ibm.com
 spec:
   group: csi.ibm.com

config/crd/bases/csi.ibm.com_hostdefinitions.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/name: ibm-block-csi-operator
     csi: ibm
     product: ibm-block-csi-driver
-    release: v1.10.0
+    release: v1.11.0
   name: hostdefinitions.csi.ibm.com
 spec:
   group: csi.ibm.com
@@ -31,6 +31,9 @@ spec:
     - jsonPath: .spec.hostDefinition.nodeName
       name: Node
       type: string
+    - jsonPath: .spec.hostDefinition.managementAddress
+      name: Management_Address
+      type: string
     name: v1
     schema:
       openAPIV3Schema:
@@ -50,15 +53,30 @@ spec:
               hostDefinition:
                 description: Definition defines the observed state of HostDefinition
                 properties:
+                  connectivityType:
+                    type: string
+                  ioGroups:
+                    items:
+                      type: integer
+                    type: array
+                  managementAddress:
+                    type: string
                   nodeId:
                     type: string
                   nodeName:
                     type: string
+                  nodeNameOnStorage:
+                    type: string
+                  ports:
+                    items:
+                      type: string
+                    type: array
                   secretName:
                     type: string
                   secretNamespace:
                     type: string
                 required:
+                - managementAddress
                 - nodeName
                 type: object
             required:

config/crd/bases/csi.ibm.com_ibmblockcsis.yaml

@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/name: ibm-block-csi-operator
     csi: ibm
     product: ibm-block-csi-driver
-    release: v1.10.0
+    release: v1.11.0
   name: ibmblockcsis.csi.ibm.com
 spec:
   group: csi.ibm.com

config/crd/kustomization.yaml

@@ -4,7 +4,7 @@ commonLabels:
   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
-  release: v1.10.0
+  release: v1.11.0
 
 resources:
 - bases/csi.ibm.com_ibmblockcsis.yaml

config/manager/manager.yaml

@@ -20,7 +20,7 @@ spec:
         productID: 5027566ef6c54de49028be7df25119e1
         productMetric: FREE
         productName: IBM Block CSI Driver
-        productVersion: 1.10.0
+        productVersion: 1.11.0
       labels:
         app.kubernetes.io/instance: ibm-block-csi-operator
         app.kubernetes.io/managed-by: ibm-block-csi-operator
@@ -54,7 +54,7 @@ spec:
               fieldPath: metadata.name
         - name: OPERATOR_NAME
           value: ibm-block-csi-operator
-        image: ibmcom/ibm-block-csi-operator:1.10.0
+        image: quay.io/ibmcsiblock/ibm-block-csi-operator:1.11.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:

config/rbac/role.yaml

@@ -45,12 +45,21 @@ rules:
   - list
   - update
   - watch
+  - patch
 - apiGroups:
   - ""
   resources:
   - persistentvolumeclaims/status
   verbs:
+  - get
+  - update
   - patch
+- apiGroups:
+  - ""
+  resources:
+  - persistentvolumeclaims/finalizers
+  verbs:
+  - update
 - apiGroups:
   - ""
   resources:

config/rbac/service_account.yaml

@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/name: ibm-block-csi-operator
     csi: ibm
     product: ibm-block-csi-driver
-    release: v1.10.0
+    release: v1.11.0
   name: ibm-block-csi-operator
   namespace: default

config/samples/csi.ibm.com_v1_ibmblockcsi_cr.yaml

@@ -7,13 +7,13 @@ metadata:
     app.kubernetes.io/name: ibm-block-csi
     app.kubernetes.io/instance: ibm-block-csi
     app.kubernetes.io/managed-by: ibm-block-csi-operator
-    release: v1.10.0
+    release: v1.11.0
 spec:
   # controller is a statefulSet with ibm-block-csi-controller container
   # and csi-provisioner, csi-attacher, csi-snapshotter and livenessprobe sidecars.
   controller:
-    repository: ibmcom/ibm-block-csi-driver-controller
-    tag: "1.10.0"
+    repository: quay.io/ibmcsiblock/ibm-block-csi-driver-controller
+    tag: "1.11.0"
     imagePullPolicy: IfNotPresent
     affinity:
       nodeAffinity:
@@ -30,8 +30,8 @@ spec:
   # node is a daemonSet with ibm-block-csi-node container
   # and csi-node-driver-registrar and livenessprobe sidecars.
   node:
-    repository: ibmcom/ibm-block-csi-driver-node
-    tag: "1.10.0"
+    repository: quay.io/ibmcsiblock/ibm-block-csi-driver-node
+    tag: "1.11.0"
     imagePullPolicy: IfNotPresent
     affinity:
       nodeAffinity:
@@ -72,8 +72,12 @@ spec:
     tag: "v1.4.0"
     imagePullPolicy: IfNotPresent
   - name: csi-addons-replicator
-    repository: quay.io/csiaddons/volumereplication-operator
-    tag: "v0.2.0"
+    repository: quay.io/ibmcsiblock/csi-block-volumereplication-operator
+    tag: "v0.9.0"
+    imagePullPolicy: IfNotPresent
+  - name: csi-volume-group
+    repository: quay.io/ibmcsiblock/csi-volume-group-operator
+    tag: "v0.9.0"
     imagePullPolicy: IfNotPresent
   - name: livenessprobe
     repository: k8s.gcr.io/sig-storage/livenessprobe

config/samples/csi_v1_hostdefiner_cr.yaml

@@ -7,15 +7,15 @@ metadata:
     app.kubernetes.io/name: host-definer
     app.kubernetes.io/instance: ibm-block-csi
     app.kubernetes.io/managed-by: ibm-block-csi-operator
-    release: v1.10.0
+    release: v1.11.0
 spec:
   hostDefiner:
-#   prefix:
-#   connectivityType:
-#   allowDelete: true    # Optional. Values true/false. The default is true.
-#   dynamicNodeLabeling: false    # Optional. Values true/false. The default is false.
-    repository: ibmcom/ibm-block-csi-host-definer
-    tag: "1.10.0"
+#    prefix:                       # Optional.
+#    connectivityType:             # Optional. Values nvme/fc/iscsi. The default is chosen dynamically.
+#    allowDelete: true             # Optional. Values true/false. The default is true.
+#    dynamicNodeLabeling: false    # Optional. Values true/false. The default is false.
+    repository: quay.io/ibmcsiblock/ibm-block-csi-host-definer
+    tag: "1.11.0"
     imagePullPolicy: IfNotPresent
     affinity:
       nodeAffinity: