github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32362 from piosz/heap

Browse Source 
Automatic merge from submit-queue

Bumped Heapster to v1.2.0-beta.3

The new version contains Kubernetes deps in version `1.4.0-beta.0`
This commit is contained in:
Kubernetes Submit Queue 2016-09-11 13:47:44 -07:00 committed by GitHub
commit 2076319020
5 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,29 +20,29 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.2.0-beta.2
name: heapster-v1.2.0-beta.3
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.2.0-beta.2
version: v1.2.0-beta.3
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.2.0-beta.2
version: v1.2.0-beta.3
template:
metadata:
labels:
k8s-app: heapster
version: v1.2.0-beta.2
version: v1.2.0-beta.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.2.0-beta.2
- image: gcr.io/google_containers/heapster:v1.2.0-beta.3
name: heapster
livenessProbe:
httpGet:
@ -67,7 +67,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.2.0-beta.2
- image: gcr.io/google_containers/heapster:v1.2.0-beta.3
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@ -110,7 +110,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5
- --deployment=heapster-v1.2.0-beta.2
- --deployment=heapster-v1.2.0-beta.3
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@ -139,7 +139,7 @@ spec:
- --memory={{base_eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5
- --deployment=heapster-v1.2.0-beta.2
- --deployment=heapster-v1.2.0-beta.3
- --container=eventer
- --poll-period=300000
- --estimator=exponential

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

@ -20,29 +20,29 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.2.0-beta.2
name: heapster-v1.2.0-beta.3
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.2.0-beta.2
version: v1.2.0-beta.3
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.2.0-beta.2
version: v1.2.0-beta.3
template:
metadata:
labels:
k8s-app: heapster
version: v1.2.0-beta.2
version: v1.2.0-beta.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.2.0-beta.2
- image: gcr.io/google_containers/heapster:v1.2.0-beta.3
name: heapster
livenessProbe:
httpGet:
@ -68,7 +68,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.2.0-beta.2
- image: gcr.io/google_containers/heapster:v1.2.0-beta.3
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@ -111,7 +111,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.2.0-beta.2
- --deployment=heapster-v1.2.0-beta.3
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@ -140,7 +140,7 @@ spec:
- --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.2.0-beta.2
- --deployment=heapster-v1.2.0-beta.3
- --container=eventer
- --poll-period=300000
- --estimator=exponential

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

@ -20,29 +20,29 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.2.0-beta.2
name: heapster-v1.2.0-beta.3
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.2.0-beta.2
version: v1.2.0-beta.3
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.2.0-beta.2
version: v1.2.0-beta.3
template:
metadata:
labels:
k8s-app: heapster
version: v1.2.0-beta.2
version: v1.2.0-beta.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.2.0-beta.2
- image: gcr.io/google_containers/heapster:v1.2.0-beta.3
name: heapster
livenessProbe:
httpGet:
@ -63,7 +63,7 @@ spec:
- /heapster
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- image: gcr.io/google_containers/heapster:v1.2.0-beta.2
- image: gcr.io/google_containers/heapster:v1.2.0-beta.3
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@ -102,7 +102,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.2.0-beta.2
- --deployment=heapster-v1.2.0-beta.3
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@ -131,7 +131,7 @@ spec:
- --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.2.0-beta.2
- --deployment=heapster-v1.2.0-beta.3
- --container=eventer
- --poll-period=300000
- --estimator=exponential

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

@ -16,29 +16,29 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.2.0-beta.2
name: heapster-v1.2.0-beta.3
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.2.0-beta.2
version: v1.2.0-beta.3
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.2.0-beta.2
version: v1.2.0-beta.3
template:
metadata:
labels:
k8s-app: heapster
version: v1.2.0-beta.2
version: v1.2.0-beta.3
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.2.0-beta.2
- image: gcr.io/google_containers/heapster:v1.2.0-beta.3
name: heapster
livenessProbe:
httpGet:
@ -83,7 +83,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.2.0-beta.2
- --deployment=heapster-v1.2.0-beta.3
- --container=heapster
- --poll-period=300000
- --estimator=exponential

12
test/kubemark/resources/heapster_template.json
View File

@ -2,23 +2,23 @@
"kind": "ReplicationController",
"apiVersion": "v1",
"metadata": {
"name": "heapster-v1.1.0",
"name": "heapster-v1.2.0-beta.3",
"labels": {
"k8s-app": "heapster",
"version": "v1.1.0"
"version": "v1.2.0-beta.3"
}
},
"spec": {
"replicas": 1,
"selector": {
"k8s-app": "heapster",
"version": "v1.1.0"
"version": "v1.2.0-beta.3"
},
"template": {
"metadata": {
"labels": {
"k8s-app": "heapster",
"version": "v1.1.0"
"version": "v1.2.0-beta.3"
}
},
"spec": {
@ -33,7 +33,7 @@
"containers": [
{
"name": "heapster",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.1",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.3",
"resources": {
"requests": {
"cpu": "100m",
@ -55,7 +55,7 @@
},
{
"name": "eventer",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.1",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.3",
"resources": {
"requests": {
"cpu": "100m",