From 2b2aede21f394ab06c0fcff77adc63bcd2b42c80 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Mon, 30 Jul 2018 21:32:03 -0500
Subject: [PATCH] Remove tiller image tarball from helm package

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>
---
 kubernetes/helm/centos/build_srpm.data | 5 +++--
 kubernetes/helm/centos/helm.spec       | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/kubernetes/helm/centos/build_srpm.data b/kubernetes/helm/centos/build_srpm.data
index cd350cd61..1d35a996a 100644
--- a/kubernetes/helm/centos/build_srpm.data
+++ b/kubernetes/helm/centos/build_srpm.data
@@ -1,6 +1,7 @@
 VERSION=2.9.1
 TAR_NAME=helm
 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
diff --git a/kubernetes/helm/centos/helm.spec b/kubernetes/helm/centos/helm.spec
index b1629de43..6afe901ef 100644
--- a/kubernetes/helm/centos/helm.spec
+++ b/kubernetes/helm/centos/helm.spec
@@ -7,7 +7,7 @@ Group: devel
 Packager: Wind River <info@windriver.com>
 URL: https://github.com/kubernetes/helm/releases
 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
 
@@ -20,11 +20,11 @@ Requires: /bin/bash
 %install
 install -d %{buildroot}%{_sbindir}
 install -m 755 ${RPM_BUILD_DIR}/linux-amd64/helm %{buildroot}%{_sbindir}/helm
-install -d %{buildroot}%{_sharedstatedir}/tiller
-install -m 400 %{SOURCE1} %{buildroot}%{_sharedstatedir}/tiller/tiller-2.9.1-docker-image.tgz
+#install -d %{buildroot}%{_sharedstatedir}/tiller
+#install -m 400 %{SOURCE1} %{buildroot}%{_sharedstatedir}/tiller/tiller-2.9.1-docker-image.tgz
 
 %files
 %defattr(-,root,root,-)
 %{_sbindir}/helm
-%{_sharedstatedir}/tiller/tiller-2.9.1-docker-image.tgz
+#%{_sharedstatedir}/tiller/tiller-2.9.1-docker-image.tgz