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

Merge pull request #27542 from piosz/heapster-version

Browse Source 
Automatic merge from submit-queue

Bumped Heapster to v1.1.0

```release-note
Bumped Heapster to v1.1.0.
More details about the release https://github.com/kubernetes/heapster/releases/tag/v1.1.0
```

Version 1.1.0 doesn't differ from the previous one v1.1.0-beta2 significantly - just fixed few small issues during stabilization period.

cc @a-robinson @jszczepkowski @mwielgus 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
This commit is contained in:
k8s-merge-robot 2016-06-20 04:40:27 -07:00 committed by GitHub
commit 3b57f868d3
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,26 +20,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta2
name: heapster-v1.1.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta2
version: v1.1.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta2
version: v1.1.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta2
version: v1.1.0
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
- image: gcr.io/google_containers/heapster:v1.1.0
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@ -57,7 +57,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
- image: gcr.io/google_containers/heapster:v1.1.0
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@ -100,7 +100,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
- --deployment=heapster-v1.1.0
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@ -129,7 +129,7 @@ spec:
- --memory={{base_eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
- --deployment=heapster-v1.1.0
- --container=eventer
- --poll-period=300000
- --estimator=exponential

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

@ -20,26 +20,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta2
name: heapster-v1.1.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta2
version: v1.1.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta2
version: v1.1.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta2
version: v1.1.0
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
- image: gcr.io/google_containers/heapster:v1.1.0
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@ -58,7 +58,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
- image: gcr.io/google_containers/heapster:v1.1.0
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@ -101,7 +101,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
- --deployment=heapster-v1.1.0
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@ -130,7 +130,7 @@ spec:
- --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
- --deployment=heapster-v1.1.0
- --container=eventer
- --poll-period=300000
- --estimator=exponential

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

@ -20,26 +20,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta2
name: heapster-v1.1.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta2
version: v1.1.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta2
version: v1.1.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta2
version: v1.1.0
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
- image: gcr.io/google_containers/heapster:v1.1.0
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@ -53,7 +53,7 @@ spec:
- /heapster
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
- image: gcr.io/google_containers/heapster:v1.1.0
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@ -92,7 +92,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
- --deployment=heapster-v1.1.0
- --container=heapster
- --poll-period=300000
- --estimator=exponential
@ -121,7 +121,7 @@ spec:
- --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
- --deployment=heapster-v1.1.0
- --container=eventer
- --poll-period=300000
- --estimator=exponential

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

@ -16,26 +16,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta2
name: heapster-v1.1.0
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta2
version: v1.1.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta2
version: v1.1.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta2
version: v1.1.0
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
- image: gcr.io/google_containers/heapster:v1.1.0
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@ -73,7 +73,7 @@ spec:
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
- --deployment=heapster-v1.1.0
- --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.beta1",
"name": "heapster-v1.1.0",
"labels": {
"k8s-app": "heapster",
"version": "v1.1.0.beta1"
"version": "v1.1.0"
}
},
"spec": {
"replicas": 1,
"selector": {
"k8s-app": "heapster",
"version": "v1.1.0.beta1"
"version": "v1.1.0"
},
"template": {
"metadata": {
"labels": {
"k8s-app": "heapster",
"version": "v1.1.0.beta1"
"version": "v1.1.0"
}
},
"spec": {
@ -33,7 +33,7 @@
"containers": [
{
"name": "heapster",
"image": "gcr.io/google_containers/heapster:v1.1.0-beta1",
"image": "gcr.io/google_containers/heapster:v1.1.0",
"resources": {
"requests": {
"cpu": "100m",
@ -55,7 +55,7 @@
},
{
"name": "eventer",
"image": "gcr.io/google_containers/heapster:v1.1.0-beta1",
"image": "gcr.io/google_containers/heapster:v1.1.0",
"resources": {
"requests": {
"cpu": "100m",