starlingx
/
platform-armada-app
Code Issues Proposed changes

Add helm chart for node feature discovery 

This packages up the upstream "node feature discovery" project[1] into
a helm chart and includes it in the ISO.  The expectation is that it's
there if end-users want to use it, but it will not be installed by
default.

Rather than make a new RPM, the helm chart has been added to the
existing stx-platform-helm package.  Unlike the other charts in that
package, for now it will be included in the load (to make it available
right away). Once the helm charts from that application are properly
installed on system installation then we can consider removing the node
feature discovery helm chart from the filesystem as it will be available
from the local helm repo.

There are two primary files describing Kubernetes resources.  They both
originally came from version 0.3.0 of the upstream project but one of
them needed to be renamed to work with "helm package" which restricts
the allowable filename suffixes.

The two upstream files have been modified to support helm overrides.
This also required adding a template for the namespace, if a custom one
is specified.

[1] https://github.com/kubernetes-sigs/node-feature-discovery/

Change-Id: I6e7c8a629994ad4da3834cbefccb94cd01259cc5
Story: 2005193
Task: 29954
Signed-off-by: Chris Friesen <chris.friesen@windriver.com>
This commit is contained in:
Chris Friesen 2019-04-16 16:00:59 -04:00
parent 2f53b1d7fc
commit 0f9a1855ed
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stx-platform-helm/centos/build_srpm.data
View File

@ -1,7 +1,8 @@
SRC_DIR="stx-platform-helm"
COPY_LIST_TO_TAR="\
$PKG_BASE/../../../helm-charts/node-feature-discovery \
$PKG_BASE/../../../helm-charts/rbd-provisioner \
$PKG_BASE/../../../helm-charts/ceph-pools-audit"
TIS_PATCH_VER=1
TIS_PATCH_VER=2

4
stx-platform-helm/centos/stx-platform-helm.spec
View File

@ -62,6 +62,7 @@ helm repo add local http://localhost:8879/charts
# Make the charts. These produce a tgz file
make rbd-provisioner
make ceph-pools-audit
make node-feature-discovery
# Terminate helm server (the last backgrounded task)
kill %1
@ -93,7 +94,10 @@ rm -fr %{app_staging}
%install
install -d -m 755 %{buildroot}/%{app_folder}
install -p -D -m 755 %{_builddir}/%{app_tarball} %{buildroot}/%{app_folder}
install -d -m 755 ${RPM_BUILD_ROOT}/opt/extracharts
install -p -D -m 755 node-feature-discovery-*.tgz ${RPM_BUILD_ROOT}/opt/extracharts
%files
%defattr(-,root,root,-)
%{app_folder}/*
/opt/extracharts/*