starlingx/integ
Code Issues Proposed changes

Remove tiller image tarball from helm package

Browse Source 
This update removes the tiller-2.9.1-docker-image.tgz tarball from
the helm package until it can be properly gernerated within the
build framework.

Story: 2002876
Task: 22831

Change-Id: Ie54187b0462be22af5e8935fd4fd25c6ff913332
Signed-off-by: Jack Ding <jack.ding@windriver.com>
This commit is contained in:
Don Penney 2018-07-30 21:32:03 -05:00 committed by Jack Ding
parent 27f421a078
commit 2b2aede21f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kubernetes/helm/centos/build_srpm.data
View File

@ -1,6 +1,7 @@
VERSION=2.9.1 VERSION=2.9.1
TAR_NAME=helm TAR_NAME=helm
TAR="$TAR_NAME-v$VERSION-linux-amd64.tar.gz" TAR="$TAR_NAME-v$VERSION-linux-amd64.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR ${CGCS_BASE}/downloads/tiller-2.9.1-docker-image.tgz" #COPY_LIST="${CGCS_BASE}/downloads/$TAR ${CGCS_BASE}/downloads/tiller-2.9.1-docker-image.tgz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR"
TIS_PATCH_VER=1 TIS_PATCH_VER=2

8
kubernetes/helm/centos/helm.spec
View File

@ -7,7 +7,7 @@ Group: devel
Packager: Wind River <info@windriver.com> Packager: Wind River <info@windriver.com>
URL: https://github.com/kubernetes/helm/releases URL: https://github.com/kubernetes/helm/releases
Source0: %{name}-v%{version}-linux-amd64.tar.gz Source0: %{name}-v%{version}-linux-amd64.tar.gz
Source1: tiller-2.9.1-docker-image.tgz #Source1: tiller-2.9.1-docker-image.tgz
Requires: /bin/bash Requires: /bin/bash
@ -20,11 +20,11 @@ Requires: /bin/bash
%install %install
install -d %{buildroot}%{_sbindir} install -d %{buildroot}%{_sbindir}
install -m 755 ${RPM_BUILD_DIR}/linux-amd64/helm %{buildroot}%{_sbindir}/helm install -m 755 ${RPM_BUILD_DIR}/linux-amd64/helm %{buildroot}%{_sbindir}/helm
install -d %{buildroot}%{_sharedstatedir}/tiller #install -d %{buildroot}%{_sharedstatedir}/tiller
install -m 400 %{SOURCE1} %{buildroot}%{_sharedstatedir}/tiller/tiller-2.9.1-docker-image.tgz #install -m 400 %{SOURCE1} %{buildroot}%{_sharedstatedir}/tiller/tiller-2.9.1-docker-image.tgz
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_sbindir}/helm %{_sbindir}/helm
%{_sharedstatedir}/tiller/tiller-2.9.1-docker-image.tgz #%{_sharedstatedir}/tiller/tiller-2.9.1-docker-image.tgz