github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11998 from vishh/update_heapster

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
Brendan Burns 2015-07-30 13:10:02 -07:00
commit f89c9e3878
4 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@ -1,26 +1,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: monitoring-heapster-v5 name: monitoring-heapster-v6
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.16.0 - image: gcr.io/google_containers/heapster:v0.17.0
name: heapster name: heapster
resources: resources:
limits: limits:
@ -33,11 +33,3 @@ spec:
- --sink=gcl - --sink=gcl
- --poll_duration=2m - --poll_duration=2m
- --stats_resolution=1m - --stats_resolution=1m
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
volumes:
- name: ssl-certs
hostPath:
path: "/etc/ssl/certs"

18
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View File

@ -1,26 +1,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: monitoring-heapster-v5 name: monitoring-heapster-v6
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.16.0 - image: gcr.io/google_containers/heapster:v0.17.0
name: heapster name: heapster
resources: resources:
limits: limits:
@ -33,11 +33,3 @@ spec:
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --poll_duration=2m - --poll_duration=2m
- --stats_resolution=1m - --stats_resolution=1m
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
volumes:
- name: ssl-certs
hostPath:
path: "/etc/ssl/certs"

10
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@ -1,26 +1,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: monitoring-heapster-v5 name: monitoring-heapster-v6
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.16.0 - image: gcr.io/google_containers/heapster:v0.17.0
name: heapster name: heapster
resources: resources:
limits: limits:

10
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@ -1,26 +1,26 @@
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: monitoring-heapster-v5 name: monitoring-heapster-v6
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v5 version: v6
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.16.0 - image: gcr.io/google_containers/heapster:v0.17.0
name: heapster name: heapster
resources: resources:
limits: limits: