Merge develop into master 1.10.0 (#551)

IBM · Jul 26, 2022 · 2656501 · 2656501
1 parent 6179f7e
commit 2656501
Show file tree

Hide file tree

Showing 166 changed files with 5,956 additions and 2,437 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@
 /bin/
 node/mocks
 build/reports
+/.run/
+docs/.vscode/settings.json
diff --git a/Dockerfile-csi-controller.test → Dockerfile-controllers.test b/Dockerfile-csi-controller.test → Dockerfile-controllers.test
@@ -20,33 +20,36 @@ FROM registry.access.redhat.com/ubi8/python-38:1-75.1638364053 as builder
 USER root
 RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
 USER default
+ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 RUN pip3 install --ignore-installed --default-timeout=100 --upgrade pip==21.2.4
 WORKDIR /tmp
-COPY controller/requirements.txt .
+COPY controllers/servers/csi/requirements.txt ./csi_requirements.txt
+COPY controllers/servers/host_definer/requirements.txt ./host_definer_requirements.txt
 # avoid default- boringssl lib, since it does not support z systems
 ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True
-RUN pip3 install -r ./requirements.txt
+RUN pip3 install -r ./csi_requirements.txt -r ./host_definer_requirements.txt
 
 USER root
-COPY controller/scripts/csi_general .
+COPY controllers/scripts/csi_general .
 RUN ./csi_pb2.sh
 RUN pip3 install .
 
 # Requires to run local testing
-COPY controller/requirements-tests.txt .
+COPY controllers/tests/requirements.txt ./requirements-tests.txt
 RUN pip3 install -r ./requirements-tests.txt
 
 
-FROM registry.access.redhat.com/ubi8/python-38:1-80.1645821300
+FROM registry.access.redhat.com/ubi8/python-38:1-100
 
 COPY --from=builder /opt/app-root /opt/app-root
 COPY ./common /driver/common
-COPY ./controller /driver/controller
+COPY ./controllers/ /driver/controllers/
 USER root
 RUN groupadd -g 9999 appuser && \
     useradd -r -u 9999 -g appuser appuser
 RUN chown -R appuser:appuser /driver /opt/app-root
 USER appuser
 WORKDIR /driver
+ENV PYTHONPATH=/driver
 
-ENTRYPOINT ["/driver/controller/scripts/entrypoint-test.sh"]
+ENTRYPOINT ["/driver/controllers/scripts/entrypoint-test.sh"]
diff --git a/Dockerfile-csi-controller b/Dockerfile-csi-controller
@@ -16,23 +16,24 @@ FROM registry.access.redhat.com/ubi8/python-38:1-75.1638364053 as builder
 USER root
 RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
 USER default
+ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 RUN pip3 install --ignore-installed --default-timeout=100 --upgrade pip==21.2.4
 WORKDIR /tmp
-COPY controller/requirements.txt .
+COPY controllers/servers/csi/requirements.txt .
 # avoid default boringssl lib, since it does not support z systems
 ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True
 RUN pip3 install -r ./requirements.txt
 
 USER root
-COPY controller/scripts/csi_general .
+COPY controllers/scripts/csi_general .
 RUN ./csi_pb2.sh
 RUN pip3 install .
 
 
-FROM registry.access.redhat.com/ubi8/python-38:1-80.1645821300
+FROM registry.access.redhat.com/ubi8/python-38:1-100
 MAINTAINER IBM Storage
 
-ARG VERSION=1.9.0
+ARG VERSION=1.10.0
 ARG BUILD_NUMBER=0
 
 ###Required Labels
@@ -48,7 +49,7 @@ LABEL name="IBM block storage CSI driver controller" \
 
 COPY --from=builder /opt/app-root /opt/app-root
 COPY ./common /driver/common
-COPY ./controller /driver/controller
+COPY ./controllers/ /driver/controllers/
 COPY ./LICENSE /licenses/
 COPY ./NOTICES /licenses/
 
@@ -57,4 +58,4 @@ ENV PYTHONPATH=/driver
 
 # Note: UBI runs with app-user by default.
 
-ENTRYPOINT ["/driver/controller/scripts/entrypoint.sh"]
+ENTRYPOINT ["/driver/controllers/scripts/entrypoint.sh"]
diff --git a/Dockerfile-csi-host-definer b/Dockerfile-csi-host-definer
@@ -0,0 +1,46 @@
+FROM registry.access.redhat.com/ubi8/python-38:1-75.1638364053 as builder
+
+USER root
+RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
+USER default
+ENV PIP_DISABLE_PIP_VERSION_CHECK=1
+RUN pip3 install --ignore-installed --default-timeout=100 --upgrade pip==21.2.4
+WORKDIR /tmp
+COPY controllers/servers/csi/requirements.txt ./csi_requirements.txt
+COPY controllers/servers/host_definer/requirements.txt ./host_definer_requirements.txt
+# avoid default- boringssl lib, since it does not support z systems
+ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True
+RUN pip3 install -r ./csi_requirements.txt -r ./host_definer_requirements.txt
+
+USER root
+COPY controllers/scripts/csi_general .
+RUN ./csi_pb2.sh
+RUN pip3 install .
+
+FROM registry.access.redhat.com/ubi8/python-38:1-100
+
+ARG VERSION=1.10.0
+ARG BUILD_NUMBER=0
+
+###Required Labels
+LABEL name="IBM block storage CSI driver host definer" \
+      vendor="IBM" \
+      maintainer="IBM Storage" \
+      version=$VERSION \
+      release=$BUILD_NUMBER \
+      summary="The host definer defines Kubernetes nodes on IBM block storage" \
+      description="The host definer defines container orchestrators, such as Kubernetes and OpenShift, nodes on IBM block storage." \
+      io.k8s.display-name="IBM block storage CSI driver host definer" \
+      io.k8s.description="The host definer defines container orchestrators, such as Kubernetes and OpenShift, nodes on IBM block storage." \
+      io.openshift.tags=ibm,csi,ibm-block-csi-driver,host-definer
+
+COPY --from=builder /opt/app-root /opt/app-root
+COPY ./common /driver/common
+COPY ./controllers/ /driver/controllers/
+COPY ./LICENSE /licenses/
+COPY ./NOTICES /licenses/
+
+WORKDIR /driver/controllers/servers/host_definer/
+ENV PYTHONPATH=/driver
+
+CMD ["python3", "/driver/controllers/servers/host_definer/main.py"]
diff --git a/Dockerfile-csi-node b/Dockerfile-csi-node
@@ -27,10 +27,10 @@ COPY . .
 RUN make ibm-block-csi-driver
 
 # Final stage
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5-230.1645809059
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6-854
 MAINTAINER IBM Storage
 
-ARG VERSION=1.9.0
+ARG VERSION=1.10.0
 ARG BUILD_NUMBER=0
 
 LABEL name="IBM block storage CSI driver node" \