Skip to content

Commit

Permalink
Bumped Heapster to stable version 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@piosz
piosz committed Mar 15, 2016
1 parent a6d9b09 commit 1f57718
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v1.0.0-beta2
name: heapster-v1.0.0
namespace: kube-system
labels:
k8s-app: heapster
Expand All @@ -25,7 +25,7 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
- image: gcr.io/google_containers/heapster:v1.0.0
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
Expand All @@ -44,7 +44,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
- image: gcr.io/google_containers/heapster:v1.0.0
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
Expand Down
8 changes: 4 additions & 4 deletions cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
{% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%}
{% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
{% set eventer_memory = (200000 + num_nodes * 500)|string + "Ki" -%}
{% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%}
{% endif -%}

apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v1.0.0-beta2
name: heapster-v1.0.0
namespace: kube-system
labels:
k8s-app: heapster
Expand All @@ -25,7 +25,7 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
- image: gcr.io/google_containers/heapster:v1.0.0
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
Expand All @@ -45,7 +45,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
- image: gcr.io/google_containers/heapster:v1.0.0
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
Expand Down
6 changes: 3 additions & 3 deletions cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v1.0.0-beta2
name: heapster-v1.0.0
namespace: kube-system
labels:
k8s-app: heapster
Expand All @@ -25,7 +25,7 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
- image: gcr.io/google_containers/heapster:v1.0.0
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
Expand All @@ -40,7 +40,7 @@ spec:
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- --metric_resolution=60s
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
- image: gcr.io/google_containers/heapster:v1.0.0
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
Expand Down
4 changes: 2 additions & 2 deletions cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v1.0.0-beta2
name: heapster-v1.0.0
namespace: kube-system
labels:
k8s-app: heapster
Expand All @@ -23,7 +23,7 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
- image: gcr.io/google_containers/heapster:v1.0.0
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
Expand Down

1 comment on commit 1f57718

@k8s-teamcity-mesosphere
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity OSS :: Kubernetes Mesos :: 4 - Smoke Tests Build 19147 outcome was SUCCESS
Summary: Tests passed: 1, ignored: 264 Build time: 00:04:33

Please sign in to comment.