github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 05:01:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14559 from piosz/stats-res

Browse Source 
Bumbed Heapster to v0.18.2 and changed its config
This commit is contained in:
Marcin Wielgus
2015-10-05 11:49:51 +02:00
parent b9cfab87e3 94080973b1
commit ad9be2cac9
4 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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: heapster-v9 name: heapster-v10
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v9 version: v10
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: v9 version: v10
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v9 version: v10
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.1 - image: gcr.io/google_containers/heapster:v0.18.2
name: heapster name: heapster
resources: resources:
limits: limits:
@@ -32,7 +32,8 @@ spec:
- --sink=gcm - --sink=gcm
- --sink=gcmautoscaling - --sink=gcmautoscaling
- --sink=gcl - --sink=gcl
- --sink_frequency=2m - --stats_resolution=30s
- --sink_frequency=1m
volumeMounts: volumeMounts:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs

13
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: heapster-v9 name: heapster-v10
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v9 version: v10
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: v9 version: v10
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v9 version: v10
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.1 - image: gcr.io/google_containers/heapster:v0.18.2
name: heapster name: heapster
resources: resources:
limits: limits:
@@ -32,7 +32,8 @@ spec:
- --sink=gcl - --sink=gcl
- --sink=gcmautoscaling - --sink=gcmautoscaling
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --sink_frequency=2m - --stats_resolution=30s
- --sink_frequency=1m
volumeMounts: volumeMounts:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs

12
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: heapster-v9 name: heapster-v10
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v9 version: v10
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: v9 version: v10
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v9 version: v10
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.1 - image: gcr.io/google_containers/heapster:v0.18.2
name: heapster name: heapster
resources: resources:
limits: limits:
@@ -30,3 +30,5 @@ spec:
- /heapster - /heapster
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --stats_resolution=30s
- --sink_frequency=1m

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: heapster-v9 name: heapster-v10
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v9 version: v10
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: v9 version: v10
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v9 version: v10
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.18.1 - image: gcr.io/google_containers/heapster:v0.18.2
name: heapster name: heapster
resources: resources:
limits: limits: