update x/net 0.17.0->0.23.0, grpc, and other vulnerabilities fixes

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.19 as builder
+FROM --platform=$BUILDPLATFORM golang:1.20 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -19,7 +19,7 @@ COPY console/ console/
 RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -o manager main.go
 
 
-FROM registry.access.redhat.com/ubi9-minimal:9.4-949.1714662671
+FROM registry.access.redhat.com/ubi9-minimal:9.4-1134
 MAINTAINER IBM Storage
 
 RUN microdnf update -y && microdnf clean all

api/v1alpha1/groupversion_info.go

@@ -15,8 +15,8 @@
  */
 
 // Package v1alpha1 contains API Schema definitions for the odf v1alpha1 API group
-//+kubebuilder:object:generate=true
-//+groupName=odf.ibm.com
+// +kubebuilder:object:generate=true
+// +groupName=odf.ibm.com
 package v1alpha1
 
 import (

bundle/manifests/flashsystem-csi-cr_v1_configmap.yaml

@@ -29,7 +29,7 @@ data:
                         - amd64
                         - s390x
                         - ppc64le
-    
+
       # node is a daemonSet with ibm-block-csi-node container
       # and csi-node-driver-registrar and livenessprobe sidecars.
       node:
@@ -47,46 +47,46 @@ data:
                         - amd64
                         - s390x
                         - ppc64le
-      
-      #    tolerations:
-      #    - effect: NoSchedule
-      #      key: node-role.kubernetes.io/master
-      #      operator: Exists
-    
+
+    #    tolerations:
+    #    - effect: NoSchedule
+    #      key: node-role.kubernetes.io/master
+    #      operator: Exists
+
       sidecars:
-        - name: csi-node-driver-registrar
-          repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
-          tag: "v2.5.0"
-          imagePullPolicy: IfNotPresent
-        - name: csi-provisioner
-          repository: k8s.gcr.io/sig-storage/csi-provisioner
-          tag: "v3.1.0"
-          imagePullPolicy: IfNotPresent
-        - name: csi-attacher
-          repository: k8s.gcr.io/sig-storage/csi-attacher
-          tag: "v3.4.0"
-          imagePullPolicy: IfNotPresent
-        - name: csi-snapshotter
-          repository: k8s.gcr.io/sig-storage/csi-snapshotter
-          tag: "v5.0.1"
-          imagePullPolicy: IfNotPresent
-        - name: csi-resizer
-          repository: k8s.gcr.io/sig-storage/csi-resizer
-          tag: "v1.4.0"
-          imagePullPolicy: IfNotPresent
-        - name: csi-addons-replicator
-          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.1"
-          imagePullPolicy: IfNotPresent
-        - name: livenessprobe
-          repository: k8s.gcr.io/sig-storage/livenessprobe
-          tag: "v2.6.0"
-          imagePullPolicy: IfNotPresent
-    
+      - name: csi-node-driver-registrar
+        repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+        tag: "v2.6.3"
+        imagePullPolicy: IfNotPresent
+      - name: csi-provisioner
+        repository: k8s.gcr.io/sig-storage/csi-provisioner
+        tag: "v3.4.0"
+        imagePullPolicy: IfNotPresent
+      - name: csi-attacher
+        repository: k8s.gcr.io/sig-storage/csi-attacher
+        tag: "v4.2.0"
+        imagePullPolicy: IfNotPresent
+      - name: csi-snapshotter
+        repository: k8s.gcr.io/sig-storage/csi-snapshotter
+        tag: "v6.2.1"
+        imagePullPolicy: IfNotPresent
+      - name: csi-resizer
+        repository: k8s.gcr.io/sig-storage/csi-resizer
+        tag: "v1.7.0"
+        imagePullPolicy: IfNotPresent
+      - name: csi-addons-replicator
+        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.1"
+        imagePullPolicy: IfNotPresent
+      - name: livenessprobe
+        repository: k8s.gcr.io/sig-storage/livenessprobe
+        tag: "v2.9.0"
+        imagePullPolicy: IfNotPresent
+
     #  healthPort: 9808
     #  imagePullSecrets:
     #  - "secretName"

bundle/manifests/odf.ibm.com_flashsystemclusters.yaml

@@ -85,11 +85,11 @@ spec:
                   FlashSystem csi StorageClass
                 properties:
                   name:
-                    description: Name is unique within a namespace to reference a
+                    description: name is unique within a namespace to reference a
                       secret resource.
                     type: string
                   namespace:
-                    description: Namespace defines the space within which the secret
+                    description: namespace defines the space within which the secret
                       name must be unique.
                     type: string
                 type: object

bundle/metadata/annotations.yaml

@@ -13,6 +13,3 @@ annotations:
   # Annotations for testing.
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1
   operators.operatorframework.io.test.config.v1: tests/scorecard/
-
-  # OpenShift annotations:
-  com.redhat.openshift.versions: v4.13-v4.15

bundle/metadata/dependencies.yaml

@@ -2,4 +2,4 @@ dependencies:
   - type: olm.package
     value:
       packageName: ibm-block-csi-operator
-      version: "=1.11.3"
+      version: ">=1.11.3"

config/crd/bases/odf.ibm.com_flashsystemclusters.yaml

@@ -87,11 +87,11 @@ spec:
                   FlashSystem csi StorageClass
                 properties:
                   name:
-                    description: Name is unique within a namespace to reference a
+                    description: name is unique within a namespace to reference a
                       secret resource.
                     type: string
                   namespace:
-                    description: Namespace defines the space within which the secret
+                    description: namespace defines the space within which the secret
                       name must be unique.
                     type: string
                 type: object

controllers/persistentvolume/suite_test.go

@@ -56,7 +56,7 @@ func TestAPIs(t *testing.T) {
 
 // by default testenv sets up local api server & etcd environment without external dependencies
 // test method for real cluster environment
-// 	1. prepare the openshift environment with CRD & ns is created
+//  1. prepare the openshift environment with CRD & ns is created
 //  2. export TEST_USE_EXISTING_CLUSTER=true
 //  3. make test
 var _ = BeforeSuite(func() {

controllers/storageclass/suite_test.go

@@ -57,7 +57,7 @@ func TestAPIs(t *testing.T) {
 
 // by default testenv sets up local api server & etcd environment without external dependencies
 // test method for real cluster environment
-// 	1. prepare the openshift environment with CRD & ns is created
+//  1. prepare the openshift environment with CRD & ns is created
 //  2. export TEST_USE_EXISTING_CLUSTER=true
 //  3. make test
 var _ = BeforeSuite(func() {

controllers/suite_test.go

@@ -58,7 +58,7 @@ func TestAPIs(t *testing.T) {
 
 // by default testenv sets up local api server & etcd environment without external dependencies
 // test method for real cluster environment
-// 	1. prepare the openshift environment with CRD & ns is created
+//  1. prepare the openshift environment with CRD & ns is created
 //  2. export TEST_USE_EXISTING_CLUSTER=true
 //  3. make test
 var _ = BeforeSuite(func() {

go.mod

@@ -1,6 +1,6 @@
 module github.com/IBM/ibm-storage-odf-operator
 
-go 1.19
+go 1.20
 
 require (
 	github.com/go-logr/logr v1.2.3
@@ -23,7 +23,7 @@ require (
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
@@ -35,11 +35,11 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -59,16 +59,18 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.19.1 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/oauth2 v0.18.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect
+	google.golang.org/grpc v1.64.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect