Skip to content

Commit

Permalink
Merge pull request #27542 from piosz/heapster-version
Browse files Browse the repository at this point in the history 
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)]()
  • Loading branch information
k8s-merge-robot authored Jun 20, 2016
2 parents b442ba7 + 8fff531 commit 3b57f86
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 36 deletions.
16 changes: 8 additions & 8 deletions cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 changes: 6 additions & 6 deletions test/kubemark/resources/heapster_template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit 3b57f86

Please sign in to comment.