From 2f0b9304660e242a300ea12fdb912d2c42cc96fe Mon Sep 17 00:00:00 2001
From: Tim Allclair <tallclair@google.com>
Date: Thu, 9 Nov 2017 14:11:00 -0800
Subject: [PATCH] Remove SSL cert volumes from heapster addons

---
 .../google/heapster-controller.yaml           | 21 -------------------
 .../heapster-controller-combined.yaml         | 21 -------------------
 .../stackdriver/heapster-controller.yaml      | 14 -------------
 3 files changed, 56 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index deefc5b0779..1f498fb93bd 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -58,26 +58,12 @@ spec:
             - /heapster
             - --source=kubernetes.summary_api:''
             - --sink=gcm
-          volumeMounts:
-            - name: ssl-certs
-              mountPath: /etc/ssl/certs
-              readOnly: true
-            - name: usr-ca-certs
-              mountPath: /usr/share/ca-certificates
-              readOnly: true
         - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.0
           name: eventer
           command:
             - /eventer
             - --source=kubernetes:''
             - --sink=gcl
-          volumeMounts:
-            - name: ssl-certs
-              mountPath: /etc/ssl/certs
-              readOnly: true
-            - name: usr-ca-certs
-              mountPath: /usr/share/ca-certificates
-              readOnly: true
         - image: gcr.io/google_containers/addon-resizer:1.7
           name: heapster-nanny
           resources:
@@ -136,13 +122,6 @@ spec:
             - --container=eventer
             - --poll-period=300000
             - --estimator=exponential
-      volumes:
-        - name: ssl-certs
-          hostPath:
-            path: "/etc/ssl/certs"
-        - name: usr-ca-certs
-          hostPath:
-            path: "/usr/share/ca-certificates"
       serviceAccountName: heapster
       tolerations:
         - key: "CriticalAddonsOnly"
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index d33245a1e71..710332b5591 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -59,26 +59,12 @@ spec:
             - --source=kubernetes.summary_api:''
             - --sink=influxdb:http://monitoring-influxdb:8086
             - --sink=gcm:?metrics=autoscaling
-          volumeMounts:
-            - name: ssl-certs
-              mountPath: /etc/ssl/certs
-              readOnly: true
-            - name: usr-ca-certs
-              mountPath: /usr/share/ca-certificates
-              readOnly: true
         - image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.0
           name: eventer
           command:
             - /eventer
             - --source=kubernetes:''
             - --sink=gcl
-          volumeMounts:
-            - name: ssl-certs
-              mountPath: /etc/ssl/certs
-              readOnly: true
-            - name: usr-ca-certs
-              mountPath: /usr/share/ca-certificates
-              readOnly: true
         - image: gcr.io/google_containers/addon-resizer:1.7
           name: heapster-nanny
           resources:
@@ -137,13 +123,6 @@ spec:
             - --container=eventer
             - --poll-period=300000
             - --estimator=exponential
-      volumes:
-        - name: ssl-certs
-          hostPath:
-            path: "/etc/ssl/certs"
-        - name: usr-ca-certs
-          hostPath:
-            path: "/usr/share/ca-certificates"
       serviceAccountName: heapster
       tolerations:
         - key: "CriticalAddonsOnly"
diff --git a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
index 72b5158c002..b017af227d1 100644
--- a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
@@ -56,13 +56,6 @@ spec:
             - /heapster
             - --source=kubernetes.summary_api:''
             - --sink=stackdriver:?cluster_name={{ cluster_name }}&min_interval_sec=100&batch_export_timeout_sec=110
-          volumeMounts:
-            - name: ssl-certs
-              mountPath: /etc/ssl/certs
-              readOnly: true
-            - name: usr-ca-certs
-              mountPath: /usr/share/ca-certificates
-              readOnly: true
         # BEGIN_PROMETHEUS_TO_SD
         - name: prom-to-sd
           image: gcr.io/google-containers/prometheus-to-sd:v0.2.2
@@ -112,13 +105,6 @@ spec:
             - --container=heapster
             - --poll-period=300000
             - --estimator=exponential
-      volumes:
-        - name: ssl-certs
-          hostPath:
-            path: "/etc/ssl/certs"
-        - name: usr-ca-certs
-          hostPath:
-            path: "/usr/share/ca-certificates"
       serviceAccountName: heapster
       tolerations:
         - key: "CriticalAddonsOnly"