github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27769 from jszczepkowski/heapster-coreos

Browse Source 
Automatic merge from submit-queue

Bumped heapster version for coreos.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

Bumped heapster version for coreos.
This commit is contained in:
k8s-merge-robot 2016-06-21 04:57:49 -07:00 committed by GitHub
commit 631772bd14
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,26 +1,26 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0.beta2 name: heapster-v1.1.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.1.0.beta2 version: v1.1.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta2 version: v1.1.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta2 version: v1.1.0
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta2 - image: gcr.io/google_containers/heapster:v1.1.0
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
@ -41,7 +41,7 @@ spec:
- name: usrsharecacerts - name: usrsharecacerts
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta2 - image: gcr.io/google_containers/heapster:v1.1.0
name: eventer name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
@ -87,7 +87,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.0
@ -115,7 +115,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=307200Ki - --extra-memory=307200Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:

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

@ -1,26 +1,26 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: heapster-v1.1.0.beta2 name: heapster-v1.1.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: heapster k8s-app: heapster
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.1.0.beta2 version: v1.1.0
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta2 version: v1.1.0
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta2 version: v1.1.0
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta2 - image: gcr.io/google_containers/heapster:v1.1.0
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
@ -42,7 +42,7 @@ spec:
- name: usrsharecacerts - name: usrsharecacerts
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0-beta2 - image: gcr.io/google_containers/heapster:v1.1.0
name: eventer name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
@ -88,7 +88,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.0
@ -116,7 +116,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=307200Ki - --extra-memory=307200Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:

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

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

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

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