starlingx
/
rook-ceph
Code Issues Proposed changes

Build: Isolate platform plugins to an app specific directory 

When building the stx-rook-ceph RPM for rook-ceph-apps the helm
plugins are installed in a location that could be populated with other
app plugins if their spec files are not properly set up.

Adjust the spec to provide an app specific location for the plugins to
ensure that no other app plugins are included in the application
tarball.

In addition, sync the version of app with the plugins so that debugging
of the application lifecycle operations in the logs are easier during
application updates.

Partial-Bug: #1920066
Signed-off-by: Robert Church <robert.church@windriver.com>
Change-Id: I774a31784450592e99caab3d991892642938f1ba
This commit is contained in:
Robert Church 2021-03-18 12:08:21 -04:00
parent 0dd9538cc9
commit 181b3fe6b3
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python-k8sapp-rook/centos/build_srpm.data
View File

@ -1,3 +1,5 @@
SRC_DIR="k8sapp_rook"
OPT_DEP_LIST="$STX_BASE/rook-ceph/stx-rook-ceph"
TIS_BASE_SRCREV=10c623509a68acad945d4e0c06a86b3e8486ad5b
TIS_PATCH_VER=PKG_GITREVCOUNT
TIS_PATCH_VER=GITREVCOUNT

5
python-k8sapp-rook/centos/python-k8sapp-rook.spec
View File

@ -1,3 +1,4 @@
%global app_name rook-ceph-apps
%global pypi_name k8sapp-rook
%global sname k8sapp_rook
@ -34,8 +35,8 @@ export PBR_VERSION=%{version}
export PBR_VERSION=%{version}.%{tis_patch_ver}
export SKIP_PIP_INSTALL=1
%{__python2} setup.py install --skip-build --root %{buildroot}
mkdir -p ${RPM_BUILD_ROOT}/plugins
install -m 644 dist/*.whl ${RPM_BUILD_ROOT}/plugins/
mkdir -p ${RPM_BUILD_ROOT}/plugins/%{app_name}
install -m 644 dist/*.whl ${RPM_BUILD_ROOT}/plugins/%{app_name}/
%files
%{python2_sitelib}/%{sname}

4
stx-rook-ceph/centos/build_srpm.data
View File

@ -3,4 +3,6 @@ COPY_LIST="files/*"
EXCLUDE_LIST_FROM_TAR=".stestr"
TIS_PATCH_VER=PKG_GITREVCOUNT
OPT_DEP_LIST="$STX_BASE/rook-ceph/python-k8sapp-rook"
TIS_BASE_SRCREV=10c623509a68acad945d4e0c06a86b3e8486ad5b
TIS_PATCH_VER=GITREVCOUNT

2
stx-rook-ceph/centos/stx-rook-ceph.spec
View File

@ -71,7 +71,7 @@ sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml
# Copy the plugins: installed in the buildroot
mkdir -p %{app_staging}/plugins
cp /plugins/*.whl %{app_staging}/plugins
cp /plugins/%{app_name}/*.whl %{app_staging}/plugins
# package it up
find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5