Skip to content

Commit 5e0fef2

Browse files
matancarmeli7matancarmeli7
committed
Merge branch 'develop' into task/CSI-5277_separate_addons_code_from_controller_server
2 parents 6287eee + d8b5ee7 commit 5e0fef2

File tree

91 files changed

+5968
-2365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+5968
-2365
lines changed

‎.github/dependabot.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "gomod"
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"
12+
rebase-strategy: "disabled"
13+
reviewers:
14+
- "IBM/csi-reviewers"
15+
labels:
16+
- go
17+
- dependencies
18+
- package-ecosystem: "pip"
19+
directory: "/"
20+
schedule:
21+
interval: "weekly"
22+
rebase-strategy: "disabled"
23+
reviewers:
24+
- "IBM/csi-reviewers"
25+
labels:
26+
- python
27+
- dependencies
28+
- package-ecosystem: "github-actions"
29+
directory: "/"
30+
schedule:
31+
interval: "weekly"
32+
rebase-strategy: "disabled"
33+
reviewers:
34+
- "IBM/csi-reviewers"
35+
labels:
36+
- github_actions
37+
- dependencies

‎Dockerfile-controllers.test

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# This Dockerfile.test is for running the csi controller local tests inside a container.
1717
# Its similar to the Dockerfile, but with additional requirements-tests.txt and ENTRYPOINT to run the local tests.
1818

19-
FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006 as builder
19+
FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659 as builder
2020
USER root
2121
RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
2222
USER default
@@ -39,7 +39,7 @@ COPY controllers/tests/requirements.txt ./requirements-tests.txt
3939
RUN pip3 install -r ./requirements-tests.txt
4040

4141

42-
FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006
42+
FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659
4343

4444
COPY --from=builder /opt/app-root /opt/app-root
4545
COPY ./common /driver/common

‎Dockerfile-csi-controller

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006 as builder
15+
FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659 as builder
1616
USER root
1717
RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
1818
USER default
@@ -30,7 +30,7 @@ RUN ./csi_pb2.sh
3030
RUN pip3 install .
3131

3232

33-
FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006
33+
FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659
3434
MAINTAINER IBM Storage
3535

3636
ARG VERSION=1.12.0

‎Dockerfile-csi-host-definer

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006 as builder
1+
FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659 as builder
22

33
USER root
44
RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
@@ -17,7 +17,7 @@ COPY controllers/scripts/csi_general .
1717
RUN ./csi_pb2.sh
1818
RUN pip3 install .
1919

20-
FROM registry.access.redhat.com/ubi8/python-38:1-115.1669838006
20+
FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659
2121

2222
ARG VERSION=1.12.0
2323
ARG BUILD_NUMBER=0

‎Dockerfile-csi-node

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build stage
16-
FROM golang:1.13 as builder
16+
FROM golang:1.19 as builder
1717

1818
WORKDIR /go/src/github.com/ibm/ibm-block-csi-driver
1919
ENV GO111MODULE=on
@@ -27,7 +27,7 @@ COPY . .
2727
RUN make ibm-block-csi-driver
2828

2929
# Final stage
30-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1049
30+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
3131
MAINTAINER IBM Storage
3232

3333
ARG VERSION=1.12.0

‎Dockerfile-csi-node.test

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build stage
16-
FROM golang:1.13 as builder
16+
FROM golang:1.19 as builder
1717

1818
WORKDIR /go/src/github.com/ibm/ibm-block-csi-driver
1919
ENV GO111MODULE=on
@@ -24,6 +24,9 @@ COPY go.sum .
2424
RUN go mod download
2525
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.
2626
RUN go get github.com/golang/mock/gomock
27+
RUN go get github.com/golang/mock/mockgen
28+
RUN go install github.com/tebeka/go2xunit
29+
RUN go install github.com/golang/mock/gomock
2730
RUN go install github.com/golang/mock/mockgen
2831

2932
COPY . .

‎controllers/array_action/array_mediator_ds8k.py

+3
Original file line numberDiff line numberDiff line change
@@ -726,3 +726,6 @@ def get_host_io_group(self, host_name):
726726

727727
def change_host_protocol(self, host_name, protocol):
728728
raise NotImplementedError
729+
730+
def register_plugin(self, unique_key, metadata):
731+
return None

‎controllers/array_action/array_mediator_interface.py

+17
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,23 @@ def change_host_protocol(self, host_name, protocol):
633633
"""
634634
raise NotImplementedError
635635

636+
@abstractmethod
637+
def register_plugin(self, unique_key, metadata):
638+
"""
639+
This function should register CSI plugin with unique_key and metadata accordingly to the feature it used.
640+
641+
Args:
642+
unique_key : a unique key that will represent a feature
643+
metadata : a metadata that will add some information
644+
645+
Returns:
646+
None
647+
648+
Raises:
649+
None
650+
"""
651+
raise NotImplementedError
652+
636653
@property
637654
@abstractmethod
638655
def identifier(self):

0 commit comments

Comments
 (0)