Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bumped Heapster to v1.1.0 #27542

Merged
merged 1 commit into from
Jun 20, 2016
Merged

Bumped Heapster to v1.1.0 #27542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

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

Can you please bum it also in:
https://github.com/kubernetes/kubernetes/blob/master/test/kubemark/resources/heapster_template.json

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

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:
- 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 @@ -96,7 +96,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 @@ -125,7 +125,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
Open in desktop
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 All @@ -54,7 +54,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 @@ -97,7 +97,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 @@ -126,7 +126,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
Open in desktop
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 All @@ -49,7 +49,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 @@ -88,7 +88,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 @@ -117,7 +117,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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,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 @@ -69,7 +69,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
Open in desktop
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