Merge branch 'develop' into task/CSI-5277_separate_addons_code_from_c…

…ontroller_server
IBM · Jun 21, 2023 · 5e0fef2 · 5e0fef2
2 parents 6287eee + d8b5ee7
commit 5e0fef2
Show file tree

Hide file tree

Showing 91 changed files with 5,968 additions and 2,365 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,37 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    rebase-strategy: "disabled"
+    reviewers:
+      - "IBM/csi-reviewers"
+    labels:
+      - go
+      - dependencies
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    rebase-strategy: "disabled"
+    reviewers:
+      - "IBM/csi-reviewers"
+    labels:
+      - python
+      - dependencies
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    rebase-strategy: "disabled"
+    reviewers:
+      - "IBM/csi-reviewers"
+    labels:
+      - github_actions
+      - dependencies
diff --git a/Dockerfile-controllers.test b/Dockerfile-controllers.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/ubi8/python-38:1-115.1669838006 as builder
+FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659 as builder
 USER root
 RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
 USER default
@@ -39,7 +39,7 @@ COPY controllers/tests/requirements.txt ./requirements-tests.txt
 RUN pip3 install -r ./requirements-tests.txt
 
 
-FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006
+FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659
 
 COPY --from=builder /opt/app-root /opt/app-root
 COPY ./common /driver/common

diff --git a/Dockerfile-csi-controller b/Dockerfile-csi-controller
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006 as builder
+FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659 as builder
 USER root
 RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
 USER default
@@ -30,7 +30,7 @@ RUN ./csi_pb2.sh
 RUN pip3 install .
 
 
-FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006
+FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659
 MAINTAINER IBM Storage
 
 ARG VERSION=1.12.0

diff --git a/Dockerfile-csi-host-definer b/Dockerfile-csi-host-definer
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006 as builder
+FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659 as builder
 
 USER root
 RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
@@ -17,7 +17,7 @@ COPY controllers/scripts/csi_general .
 RUN ./csi_pb2.sh
 RUN pip3 install .
 
-FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006
+FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659
 
 ARG VERSION=1.12.0
 ARG BUILD_NUMBER=0

diff --git a/Dockerfile-csi-node b/Dockerfile-csi-node
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build stage
-FROM golang:1.13 as builder
+FROM golang:1.19 as builder
 
 WORKDIR /go/src/github.com/ibm/ibm-block-csi-driver
 ENV GO111MODULE=on
@@ -27,7 +27,7 @@ COPY . .
 RUN make ibm-block-csi-driver
 
 # Final stage
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
 MAINTAINER IBM Storage
 
 ARG VERSION=1.12.0

diff --git a/Dockerfile-csi-node.test b/Dockerfile-csi-node.test
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build stage
-FROM golang:1.13 as builder
+FROM golang:1.19 as builder
 
 WORKDIR /go/src/github.com/ibm/ibm-block-csi-driver
 ENV GO111MODULE=on
@@ -24,6 +24,9 @@ COPY go.sum .
 RUN go mod download
 RUN go get github.com/tebeka/go2xunit   # when GO111MODULE=on the module will not become executable, so get it here to run it as binary.
 RUN go get github.com/golang/mock/gomock
+RUN go get github.com/golang/mock/mockgen
+RUN go install github.com/tebeka/go2xunit
+RUN go install github.com/golang/mock/gomock
 RUN go install github.com/golang/mock/mockgen
 
 COPY . .

diff --git a/controllers/array_action/array_mediator_ds8k.py b/controllers/array_action/array_mediator_ds8k.py
@@ -726,3 +726,6 @@ def get_host_io_group(self, host_name):
 
     def change_host_protocol(self, host_name, protocol):
         raise NotImplementedError
+
+    def register_plugin(self, unique_key,  metadata):
+        return None
diff --git a/controllers/array_action/array_mediator_interface.py b/controllers/array_action/array_mediator_interface.py
@@ -633,6 +633,23 @@ def change_host_protocol(self, host_name, protocol):
         """
         raise NotImplementedError
 
+    @abstractmethod
+    def register_plugin(self, unique_key,  metadata):
+        """
+        This function should register CSI plugin with unique_key and metadata accordingly to the feature it used.
+
+        Args:
+           unique_key : a unique key that will represent a feature
+           metadata  : a metadata that will add some information
+
+        Returns:
+            None
+
+        Raises:
+            None
+        """
+        raise NotImplementedError
+
     @property
     @abstractmethod
     def identifier(self):