From 59e084caffda3142764fba21fdf61cc7974835d6 Mon Sep 17 00:00:00 2001
From: Sebastien Vas <sebastienvas@users.noreply.github.com>
Date: Fri, 28 Sep 2018 17:26:40 -0700
Subject: [PATCH] install fpm on the istio builder image (#987)

* Adds fpm

* Update config

* Remove kubeconfig secret
---
 docker/istio/istio/install.sh                         | 5 +++++
 prow/cluster/jobs/istio/istio/istio.istio.master.yaml | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker/istio/istio/install.sh b/docker/istio/istio/install.sh
index 340cd2bb1df2..ce50ce0887ef 100755
--- a/docker/istio/istio/install.sh
+++ b/docker/istio/istio/install.sh
@@ -12,10 +12,15 @@ apt-get -qqy --no-install-recommends install \
   curl \
   lsb-release \
   python \
+  ruby \
+  rubygems \
+  ruby-dev \
   software-properties-common \
   unzip \
   wget
 
+gem install --no-ri --no-rdoc fpm
+
 ./install-docker.sh
 ./install-gcloud.sh
 ./install-golang.sh
diff --git a/prow/cluster/jobs/istio/istio/istio.istio.master.yaml b/prow/cluster/jobs/istio/istio/istio.istio.master.yaml
index 924c03d8adcc..840828059183 100644
--- a/prow/cluster/jobs/istio/istio/istio.istio.master.yaml
+++ b/prow/cluster/jobs/istio/istio/istio.istio.master.yaml
@@ -5,7 +5,7 @@ job_template: &job_template
   path_alias: istio.io/istio
 
 istio_container: &istio_container
-  image: gcr.io/istio-testing/istio-builder:v20180927-30391f3f
+  image: gcr.io/istio-testing/istio-builder:v20180927-e1ac2070
   # Docker in Docker
   securityContext:
     privileged: true
@@ -25,8 +25,6 @@ presubmits:
     <<: *job_template
     context: prow/istio-unit-tests.sh
     always_run: true
-    labels:
-      preset-istio-kubeconfig: "true"
     spec:
       containers:
       - <<: *istio_container
@@ -201,7 +199,6 @@ postsubmits:
     <<: *job_template
     labels:
       preset-service-account: "true"
-      preset-istio-kubeconfig: "true"
     spec:
       containers:
       - <<: *istio_container