github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bumped Heapster version to v0.20.0-alpha and Influxdb to 0.9.2.1

Browse Source
This commit is contained in:
Piotr Szczesniak
2016-01-25 14:54:42 +01:00
parent 2a44afac1d
commit e96993f2ce
6 changed files with 74 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,26 +7,26 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v12
name: heapster-v13
namespace: kube-system
labels:
k8s-app: heapster
version: v12
version: v13
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v12
version: v13
template:
metadata:
labels:
k8s-app: heapster
version: v12
version: v13
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.18.5
- image: gcr.io/google_containers/heapster:v0.20.0-alpha1
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@@ -40,5 +40,17 @@ spec:
- /heapster
- --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086
- --stats_resolution=30s
- --sink_frequency=1m
- image: gcr.io/google_containers/heapster:v0.20.0-alpha1
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: {{ heapster_memory }}
requests:
cpu: 100m
memory: {{ heapster_memory }}
command:
- /eventer
- --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086

11
cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View File

@@ -1,26 +1,26 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: monitoring-influxdb-grafana-v2
name: monitoring-influxdb-grafana-v3
namespace: kube-system
labels:
k8s-app: influxGrafana
version: v2
version: v3
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: influxGrafana
version: v2
version: v3
template:
metadata:
labels:
k8s-app: influxGrafana
version: v2
version: v3
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster_influxdb:v0.4
- image: gcr.io/google_containers/heapster_influxdb:v0.5
name: influxdb
resources:
# keep request = limit to keep this container in guaranteed class
@@ -68,7 +68,6 @@ spec:
volumeMounts:
- name: grafana-persistent-storage
mountPath: /var
volumes:
- name: influxdb-persistent-storage
emptyDir: {}