Merge branch 'develop' into fix-spelling

IBM · Apr 15, 2024 · de63ce6 · de63ce6
2 parents a6e0771 + fd818c2
commit de63ce6
Show file tree

Hide file tree

Showing 175 changed files with 13,201 additions and 6,890 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,38 @@
+# 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
+      - testing
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Run link check
       uses: gaurav-nelson/github-action-markdown-link-check@v1
       with:

diff --git a/Dockerfile-controllers.test b/Dockerfile-controllers.test
@@ -1,4 +1,4 @@
-# Copyright IBM Corporation 2019.
+# Copyright IBM Corporation 2024.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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-75.1638364053 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-100
+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
@@ -1,4 +1,4 @@
-# Copyright IBM Corporation 2019.
+# Copyright IBM Corporation 2024.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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-75.1638364053 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
@@ -26,14 +26,15 @@ RUN pip3 install -r ./requirements.txt
 
 USER root
 COPY controllers/scripts/csi_general .
+RUN chmod +x csi_pb2.sh
 RUN ./csi_pb2.sh
 RUN pip3 install .
 
 
-FROM registry.access.redhat.com/ubi8/python-38:1-100
+FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659
 MAINTAINER IBM Storage
 
-ARG VERSION=1.11.0
+ARG VERSION=1.12.0
 ARG BUILD_NUMBER=0
 
 ###Required Labels
@@ -53,9 +54,16 @@ COPY ./controllers/ /driver/controllers/
 COPY ./LICENSE /licenses/
 COPY ./NOTICES /licenses/
 
+USER root
+RUN chmod +x /driver/controllers/scripts/entrypoint.sh
+USER default
+
 WORKDIR /driver
 ENV PYTHONPATH=/driver
 
-# Note: UBI runs with app-user by default.
+USER root
+RUN yum update -y
 
+USER default
+# Note: UBI runs with app-user by default.
 ENTRYPOINT ["/driver/controllers/scripts/entrypoint.sh"]
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-75.1638364053 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
@@ -14,12 +14,13 @@ RUN pip3 install -r ./csi_requirements.txt -r ./host_definer_requirements.txt
 
 USER root
 COPY controllers/scripts/csi_general .
+RUN chmod +x csi_pb2.sh
 RUN ./csi_pb2.sh
 RUN pip3 install .
 
-FROM registry.access.redhat.com/ubi8/python-38:1-100
+FROM registry.access.redhat.com/ubi8/python-38:1-125.1682304659
 
-ARG VERSION=1.11.0
+ARG VERSION=1.12.0
 ARG BUILD_NUMBER=0
 
 ###Required Labels
@@ -43,4 +44,8 @@ COPY ./NOTICES /licenses/
 WORKDIR /driver/controllers/servers/host_definer/
 ENV PYTHONPATH=/driver
 
+USER root
+RUN yum update -y
+
+USER default
 CMD ["python3", "/driver/controllers/servers/host_definer/main.py"]
diff --git a/Dockerfile-csi-node b/Dockerfile-csi-node
@@ -1,4 +1,4 @@
-# Copyright IBM Corporation 2019.
+# Copyright IBM Corporation 2024.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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,10 +27,10 @@ COPY . .
 RUN make ibm-block-csi-driver
 
 # Final stage
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6-854
+FROM registry.access.redhat.com/ubi9-minimal:9.3-1612
 MAINTAINER IBM Storage
 
-ARG VERSION=1.11.0
+ARG VERSION=1.12.0
 ARG BUILD_NUMBER=0
 
 LABEL name="IBM block storage CSI driver node" \
@@ -74,5 +74,8 @@ RUN    ln -s /chroot/chroot-host-wrapper.sh /chroot/blkid \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/xfs_growfs
 
 ENV PATH="/chroot:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+USER root
+RUN microdnf update -y
 
+USER default
 ENTRYPOINT ["/root/entrypoint.sh"]
diff --git a/Dockerfile-csi-node.test b/Dockerfile-csi-node.test
@@ -1,4 +1,4 @@
-# Copyright IBM Corporation 2019.
+# Copyright IBM Corporation 2024.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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/Dockerfile-csi-test b/Dockerfile-csi-test
@@ -1,4 +1,4 @@
-# Copyright IBM Corporation 2019.
+# Copyright IBM Corporation 2024.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.