GA v1.6.0 merge develop to master branch (#182)

CONTRIBUTING.md

@@ -16,7 +16,7 @@
 - If `role.yaml`, `role_binding.yaml`, or `operator.yaml` in `deploy` are updated, the ClusterServiceVersion(CSV) file in `deploy/olm-catalog/ibm-block-csi-operator` must be updated accordingly.
 - If `README.md` is updated, ClusterServiceVersion(CSV) file in `deploy/olm-catalog/ibm-block-csi-operator` must be updated accordingly.
 - Run `operator-sdk add` to add a new API or controller, for more details, please refer to https://github.com/operator-framework/operator-sdk.
-- Run `operator-sdk generate k8s` and `operator-sdk generate openapi` after you change something in `pkg/apis`.
+- Run `operator-sdk generate k8s` and `operator-sdk generate crds` after you change something in `pkg/apis`.
 
 ## Package the Operator
 This repository makes use of the [Operator Framework](https://github.com/operator-framework) and its packaging concept for Operators. Make sure you read the following guides before packaging the operator and uploading to OperatorHub.

build/Dockerfile.operator

@@ -24,10 +24,10 @@ RUN CGO_ENABLED=1 GOOS=linux go build \
 	github.com/IBM/ibm-block-csi-operator/cmd/manager
 
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3-230
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4-200.1622548483
 MAINTAINER IBM Storage
 
-ARG VERSION=1.5.0
+ARG VERSION=1.6.0
 ARG BUILD_NUMBER=0
 
 ###Required Labels

build/ci/Dockerfile.unittest

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.13.1
+FROM golang:1.13.8
 
 ENV GO111MODULE=on \
     GOROOT=/usr/local/go \
@@ -21,7 +21,7 @@ ENV CR_YAML=$WORKDIR/deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr.yaml
 WORKDIR $WORKDIR
 
 RUN go get github.com/onsi/ginkgo/ginkgo
-RUN RELEASE_VERSION=v0.16.0 \
+RUN RELEASE_VERSION=v0.18.0 \
     && ARCH=$(uname -m) \
     && SDK_ASSET=operator-sdk-${RELEASE_VERSION}-${ARCH}-linux-gnu \
     && curl -LO https://github.com/operator-framework/operator-sdk/releases/download/${RELEASE_VERSION}/${SDK_ASSET} \

cmd/manager/main.go

@@ -29,15 +29,18 @@ import (
 	"github.com/IBM/ibm-block-csi-operator/pkg/apis"
 	operatorConfig "github.com/IBM/ibm-block-csi-operator/pkg/config"
 	"github.com/IBM/ibm-block-csi-operator/pkg/controller"
+	operatorVersion "github.com/IBM/ibm-block-csi-operator/version"
 
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
 	// kubemetrics "github.com/operator-framework/operator-sdk/pkg/kube-metrics"
 	"github.com/operator-framework/operator-sdk/pkg/leader"
 	"github.com/operator-framework/operator-sdk/pkg/log/zap"
+
 	//"github.com/operator-framework/operator-sdk/pkg/metrics"
-	"github.com/operator-framework/operator-sdk/pkg/restmapper"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 	"github.com/spf13/pflag"
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+
 	//v1 "k8s.io/api/core/v1"
 	//"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
@@ -58,6 +61,7 @@ func printVersion() {
 	log.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
 	log.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
 	log.Info(fmt.Sprintf("Version of operator-sdk: %v", sdkVersion.Version))
+	log.Info(fmt.Sprintf("Operator version: %v", operatorVersion.Version))
 }
 
 func main() {
@@ -113,7 +117,7 @@ func main() {
 	// Create a new Cmd to provide shared dependencies and start components
 	mgr, err := manager.New(cfg, manager.Options{
 		Namespace:          namespace,
-		MapperProvider:     restmapper.NewDynamicRESTMapper,
+		MapperProvider:     apiutil.NewDiscoveryRESTMapper,
 		MetricsBindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
 	})
 	if err != nil {

deploy/crds/csi.ibm.com_configs_crd.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: configs.csi.ibm.com
@@ -14,68 +14,67 @@ spec:
     plural: configs
     singular: config
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: Config is the Schema for the configs API
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: ConfigSpec defines the desired state of Config
-          properties:
-            defineHost:
-              type: boolean
-            nodeAgent:
-              description: NodeAgentSpec defines the desired state of NodeAgent
-              properties:
-                port:
-                  description: The port of the node agent server
-                  type: string
-                repository:
-                  description: The repository of the node agent image
-                  type: string
-                tag:
-                  description: The tag of the node agent image
-                  type: string
-              required:
-              - port
-              - repository
-              - tag
-              type: object
-          required:
-          - defineHost
-          - nodeAgent
-          type: object
-        status:
-          description: ConfigStatus defines the observed state of Config
-          properties:
-            nodeAgent:
-              description: Phase is the driver running phase
-              properties:
-                phase:
-                  description: Phase is the NodeAgent running phase
-                  type: string
-              required:
-              - phase
-              type: object
-          required:
-          - nodeAgent
-          type: object
-      type: object
-  version: v1
   versions:
   - name: v1
+    schema:
+      openAPIV3Schema:
+        description: Config is the Schema for the configs API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ConfigSpec defines the desired state of Config
+            properties:
+              defineHost:
+                type: boolean
+              nodeAgent:
+                description: NodeAgentSpec defines the desired state of NodeAgent
+                properties:
+                  port:
+                    description: The port of the node agent server
+                    type: string
+                  repository:
+                    description: The repository of the node agent image
+                    type: string
+                  tag:
+                    description: The tag of the node agent image
+                    type: string
+                required:
+                - port
+                - repository
+                - tag
+                type: object
+            required:
+            - defineHost
+            - nodeAgent
+            type: object
+          status:
+            description: ConfigStatus defines the observed state of Config
+            properties:
+              nodeAgent:
+                description: Phase is the driver running phase
+                properties:
+                  phase:
+                    description: Phase is the NodeAgent running phase
+                    type: string
+                required:
+                - phase
+                type: object
+            required:
+            - nodeAgent
+            type: object
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}