github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26617 from sjpotter/heapster

Browse Source 
Automatic merge from submit-queue

cluster/coreos: Update heapster addon to beta2

fixes #26616 

As noted there, heapster was updated but not for gce/coreos which breaks anything that depends on heapster's new metrics API (i.e. autoscaling)
This commit is contained in:
k8s-merge-robot
2016-06-01 18:50:56 -07:00
parent 06f742a5ea 049c51e7e7
commit 365386e23b
4 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@@ -1,26 +1,26 @@
apiVersion: extensions/v1beta1
apiVersion: extensions/v1beta2
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@@ -34,7 +34,6 @@ spec:
- /heapster
- --source=kubernetes.summary_api:''
- --sink=gcm
- --metric_resolution=60s
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
@@ -42,7 +41,7 @@ spec:
- name: usrsharecacerts
mountPath: /usr/share/ca-certificates
readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@@ -88,7 +87,7 @@ spec:
- --memory=300Mi
- --extra-memory=4Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
@@ -116,7 +115,7 @@ spec:
- --memory=300Mi
- --extra-memory=307200Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000
volumes:
@@ -125,4 +124,4 @@ spec:
path: "/etc/ssl/certs"
- name: usrsharecacerts
hostPath:
path: "/usr/share/ca-certificates"
path: "/usr/share/ca-certificates"

21
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View File

@@ -1,26 +1,26 @@
apiVersion: extensions/v1beta1
apiVersion: extensions/v1beta2
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@@ -35,7 +35,6 @@ spec:
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- --sink=gcm:?metrics=autoscaling
- --metric_resolution=60s
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
@@ -43,7 +42,7 @@ spec:
- name: usrsharecacerts
mountPath: /usr/share/ca-certificates
readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@@ -89,7 +88,7 @@ spec:
- --memory=300Mi
- --extra-memory=4Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
@@ -117,7 +116,7 @@ spec:
- --memory=300Mi
- --extra-memory=307200Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000
volumes:
@@ -126,4 +125,4 @@ spec:
path: "/etc/ssl/certs"
- name: usrsharecacerts
hostPath:
path: "/usr/share/ca-certificates"
path: "/usr/share/ca-certificates"

19
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@@ -1,26 +1,26 @@
apiVersion: extensions/v1beta1
apiVersion: extensions/v1beta2
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@@ -34,8 +34,7 @@ spec:
- /heapster
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- --metric_resolution=60s
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
@@ -74,7 +73,7 @@ spec:
- --memory=300Mi
- --extra-memory=4Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
@@ -102,6 +101,6 @@ spec:
- --memory=300Mi
- --extra-memory=307200Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000

15
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@@ -1,26 +1,26 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: heapster-v1.1.0.beta1
name: heapster-v1.1.0.beta2
namespace: kube-system
labels:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
template:
metadata:
labels:
k8s-app: heapster
version: v1.1.0.beta1
version: v1.1.0.beta2
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1
- image: gcr.io/google_containers/heapster:v1.1.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@@ -33,7 +33,6 @@ spec:
command:
- /heapster
- --source=kubernetes.summary_api:''
- --metric_resolution=60s
- image: gcr.io/google_containers/addon-resizer:1.0
name: heapster-nanny
resources:
@@ -59,6 +58,6 @@ spec:
- --memory=300Mi
- --extra-memory=4Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta1
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- --poll-period=300000