Merge pull request #10369 from mikedanese/heapster-in-cluster-config

bump heapster addon version to use inClusterConfig
This commit is contained in:
Alex Robinson
2015-06-29 10:56:50 -07:00
4 changed files with 56 additions and 118 deletions

View File

@@ -1,43 +1,27 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: monitoring-heapster-v4
metadata:
name: monitoring-heapster-v5
namespace: default
labels:
labels:
k8s-app: heapster
version: v4
version: v5
kubernetes.io/cluster-service: "true"
spec:
spec:
replicas: 1
selector:
selector:
k8s-app: heapster
version: v4
template:
metadata:
labels:
version: v5
template:
metadata:
labels:
k8s-app: heapster
version: v4
version: v5
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.14.3
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.15.0
name: heapster
command:
- /heapster
- --source=kubernetes:''
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- name: monitoring-token
mountPath: /etc/kubernetes/kubeconfig
readOnly: true
volumes:
- name: ssl-certs
hostPath:
path: /etc/ssl/certs
- name: monitoring-token
secret:
secretName: token-system-monitoring