github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Filip Grzadkowski
2016-01-27 17:22:36 +01:00
parent b2f6e7d08f
commit 0dedf869c7
109 changed files with 970 additions and 36165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,26 +7,26 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v13
name: heapster-v12
namespace: kube-system
labels:
k8s-app: heapster
version: v13
version: v12
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v13
version: v12
template:
metadata:
labels:
k8s-app: heapster
version: v13
version: v12
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.20.0-alpha1
- image: gcr.io/google_containers/heapster:v0.18.5
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@@ -40,24 +40,10 @@ spec:
- /heapster
- --source=kubernetes:''
- --sink=gcm
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- 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=gcmautoscaling
- --sink=gcl
- --stats_resolution=30s
- --sink_frequency=1m
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs

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

@@ -7,26 +7,26 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v13
name: heapster-v12
namespace: kube-system
labels:
k8s-app: heapster
version: v13
version: v12
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v13
version: v12
template:
metadata:
labels:
k8s-app: heapster
version: v13
version: v12
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.20.0-alpha1
- image: gcr.io/google_containers/heapster:v0.18.5
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@@ -39,25 +39,11 @@ spec:
command:
- /heapster
- --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- 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=gcl
- --sink=gcmautoscaling
- --sink=influxdb:http://monitoring-influxdb:8086
- --stats_resolution=30s
- --sink_frequency=1m
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs

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

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

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

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

@@ -7,26 +7,26 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v13
name: heapster-v12
namespace: kube-system
labels:
k8s-app: heapster
version: v13
version: v12
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v13
version: v12
template:
metadata:
labels:
k8s-app: heapster
version: v13
version: v12
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.20.0-alpha1
- image: gcr.io/google_containers/heapster:v0.18.5
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class