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

Merge pull request #25739 from piosz/heapster-1.1.0-beta2

Browse Source 
Bumped Heapster to v1.1.0-beta2
This commit is contained in:
Filip Grzadkowski 2016-05-20 15:41:54 +02:00
commit 18e67573b8
4 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,26 +11,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@ -44,12 +44,11 @@ spec:
- /heapster
- --source=kubernetes.summary_api:''
- --sink=gcm
- --metric_resolution=60s
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@ -92,7 +91,7 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
@ -120,7 +119,7 @@ spec:
- --memory={{eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000
volumes:

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

@ -11,26 +11,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@ -45,12 +45,11 @@ spec:
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- --sink=gcm:?metrics=autoscaling
- --metric_resolution=60s
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@ -93,7 +92,7 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
@ -121,7 +120,7 @@ spec:
- --memory={{ eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000
volumes:

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

@ -11,26 +11,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@ -44,8 +44,7 @@ spec:
- /heapster
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- --metric_resolution=60s
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@ -84,7 +83,7 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
@ -112,7 +111,7 @@ spec:
- --memory={{ eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000

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

@ -8,26 +8,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@ -40,7 +40,6 @@ spec:
command:
- /heapster
- --source=kubernetes.summary_api:''
- --metric_resolution=60s
- image: gcr.io/google_containers/addon-resizer:1.0
name: heapster-nanny
resources:
@ -66,6 +65,6 @@ spec:
- --memory={{ metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000