install fpm on the istio builder image (kubernetes#987)

* Adds fpm * Update config * Remove kubeconfig secret
ostromart · Sep 29, 2018 · 59e084c · 59e084c
1 parent 8acd43f
commit 59e084c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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