Skip to content

Commit

Permalink
Merge develop into master 1.9.0 (#479)
Browse files Browse the repository at this point in the history
  • Loading branch information
oriyarde authored Mar 17, 2022
1 parent bc216b9 commit 6179f7e
Show file tree
Hide file tree
Showing 99 changed files with 2,341 additions and 9,225 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Check Markdown links

on:
pull_request:
branches:
- develop
- master

jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Run link check
uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-verbose-mode: 'yes'
check-modified-files-only: 'yes'
14 changes: 10 additions & 4 deletions Dockerfile-csi-controller
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,26 @@
# limitations under the License.

FROM registry.access.redhat.com/ubi8/python-38:1-75.1638364053 as builder
COPY controller/requirements.txt /tmp/
USER root
RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
USER default
RUN pip3 install --ignore-installed --default-timeout=100 --upgrade pip==21.2.4
WORKDIR /tmp
COPY controller/requirements.txt .
# avoid default boringssl lib, since it does not support z systems
ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True
RUN pip3 install -r /tmp/requirements.txt
RUN pip3 install -r ./requirements.txt

USER root
COPY controller/scripts/csi_general .
RUN ./csi_pb2.sh
RUN pip3 install .


FROM registry.access.redhat.com/ubi8/python-38:1-68
FROM registry.access.redhat.com/ubi8/python-38:1-80.1645821300
MAINTAINER IBM Storage

ARG VERSION=1.8.0
ARG VERSION=1.9.0
ARG BUILD_NUMBER=0

###Required Labels
Expand Down
18 changes: 12 additions & 6 deletions Dockerfile-csi-controller.test
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,27 @@
# 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
COPY controller/requirements.txt /tmp/
USER root
RUN if [[ "$(uname -m)" != "x86"* ]]; then yum install -y rust-toolset; fi
USER default
RUN pip3 install --ignore-installed --default-timeout=100 --upgrade pip==21.2.4
# avoid default boringssl lib, since it does not support z systems
WORKDIR /tmp
COPY controller/requirements.txt .
# avoid default- boringssl lib, since it does not support z systems
ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True
RUN pip3 install -r /tmp/requirements.txt
RUN pip3 install -r ./requirements.txt

USER root
COPY controller/scripts/csi_general .
RUN ./csi_pb2.sh
RUN pip3 install .

# Requires to run local testing
COPY controller/requirements-tests.txt /tmp/
RUN pip3 install -r /tmp/requirements-tests.txt
COPY controller/requirements-tests.txt .
RUN pip3 install -r ./requirements-tests.txt


FROM registry.access.redhat.com/ubi8/python-38:1-68
FROM registry.access.redhat.com/ubi8/python-38:1-80.1645821300

COPY --from=builder /opt/app-root /opt/app-root
COPY ./common /driver/common
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-csi-node
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ COPY . .
RUN make ibm-block-csi-driver

# Final stage
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5-204
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5-230.1645809059
MAINTAINER IBM Storage

ARG VERSION=1.8.0
ARG VERSION=1.9.0
ARG BUILD_NUMBER=0

LABEL name="IBM block storage CSI driver node" \
Expand Down
57 changes: 49 additions & 8 deletions NOTICES
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This file details additional third party software license agreements
and third party notices and information that are required
to be reproduced for the following programs:

IBM Block Storage CSI Driver version 1.8.0
IBM Block Storage CSI Driver version 1.9.0



Expand Down Expand Up @@ -1409,7 +1409,7 @@ End of GNU GPL Version 3.0 License

===========================================================================
END OF TERMS AND CONDITIONS FOR SEPARATELY LICENSED CODE for IBM Block
Storage CSI Driver version 1.8.0
Storage CSI Driver version 1.9.0
===========================================================================


Expand All @@ -1420,7 +1420,7 @@ Storage CSI Driver version 1.8.0

GNU GPL and / or LGPL Source Code for:

IBM Block Storage CSI Driver 1.8.0
IBM Block Storage CSI Driver 1.9.0

===========================================================================

Expand All @@ -1439,7 +1439,7 @@ General Public License 2.0.
Red Hat Universal Base Image 8 Python 3.8

Source code to any of the above-listed packages distributed with IBM
Block Storage CSI Driver 1.8.0 is available at the website below, when
Block Storage CSI Driver 1.9.0 is available at the website below, when
a URL is provided, or by sending a request to the following address or
email:

Expand Down Expand Up @@ -1468,7 +1468,7 @@ General Public License 3.0.
Red Hat Universal Base Image 8 Python 3.8

Source code to any of the above-listed packages distributed with IBM
Block Storage CSI Driver 1.8.0 is available at the website below, when
Block Storage CSI Driver 1.9.0 is available at the website below, when
a URL is provided, or by sending a request to the following address or
email:

Expand Down Expand Up @@ -2015,8 +2015,8 @@ END OF grpc-1.41.1 NOTICES AND INFORMATION

@@@@@@@@@@@@
===========================================================================
protobuf version 3.13.0: The Program includes protobuf version 3.13.0
software. IBM obtained the protobuf version 3.13.0 software under the
protobuf version 3.15.0: The Program includes protobuf version 3.15.0
software. IBM obtained the protobuf version 3.15.0 software under the
terms and conditions of the following license(s):
---------------------------------------------------------------------------

Expand Down Expand Up @@ -2055,7 +2055,7 @@ support library is itself covered by the above license.


===========================================================================
END OF protobuf version 3.13.0 NOTICES AND INFORMATION
END OF protobuf version 3.15.0 NOTICES AND INFORMATION
===========================================================================


Expand Down Expand Up @@ -2213,6 +2213,47 @@ END OF sync commit 1122301 NOTICES AND INFORMATION
===========================================================================


@@@@@@@@@@@@
===========================================================================
sys commit 742c48e: The Program includes sys commit 742c48e software.
IBM obtained the sys commit 742c48e software under the terms and
conditions of the following license(s):
---------------------------------------------------------------------------

Copyright (c) 2009 The Go Authors. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


===========================================================================
END OF sys commit 742c48e NOTICES AND INFORMATION
===========================================================================


@@@@@@@@@@@@
===========================================================================
yaml-2.2.8: The Program includes yaml-2.2.8 software. IBM obtained
Expand Down
2 changes: 1 addition & 1 deletion common/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
identity:
name: block.csi.ibm.com
version: 1.8.0
version: 1.9.0
capabilities:
Service: [CONTROLLER_SERVICE, VOLUME_ACCESSIBILITY_CONSTRAINTS]
VolumeExpansion: ONLINE
Expand Down
9 changes: 0 additions & 9 deletions controller/array_action/array_action_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,6 @@ class Snapshot:
array_type: str


class Host:
def __init__(self, host_id, host_name, nqn, wwns, iscsi_names):
self.id = host_id
self.name = host_name
self.nqn = nqn
self.wwns = wwns
self.iscsi_names = iscsi_names


class Replication:
def __init__(self, name, volume_internal_id, other_volume_internal_id, copy_type, is_ready, is_primary=None):
self.name = name
Expand Down
5 changes: 5 additions & 0 deletions controller/array_action/array_mediator_abstract.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@


class ArrayMediatorAbstract(ArrayMediator, ABC):
# https://github.com/PyCQA/pylint/issues/3975
def __init__(self, user, password, endpoint): # pylint: disable=super-init-not-called
self.user = user
self.password = password
self.endpoint = endpoint

@retry(NoConnectionAvailableException, tries=11, delay=1)
def map_volume_by_initiators(self, vol_id, initiators):
Expand Down
Loading

0 comments on commit 6179f7e

Please sign in to comment.