github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

update heapster to beta2 - change to rest of k8s wasn't applied here

Browse Source
This commit is contained in:
Shaya Potter 2016-06-01 00:45:16 -07:00
parent 0a6a52b19d
commit 4118bb1cf9
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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 kind: Deployment
metadata: metadata:
name: heapster-v1.1.0.beta1 name: heapster-v1.1.0.beta2
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.beta1 version: v1.1.0.beta2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
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-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
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.beta1 - --deployment=heapster-v1.1.0.beta2
- --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.beta1 - --deployment=heapster-v1.1.0.beta2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:

18
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 kind: Deployment
metadata: metadata:
name: heapster-v1.1.0.beta1 name: heapster-v1.1.0.beta2
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.beta1 version: v1.1.0.beta2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
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
@ -43,7 +43,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-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
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
@ -89,7 +89,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --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
@ -117,7 +117,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=307200Ki - --extra-memory=307200Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
volumes: volumes:

18
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 kind: Deployment
metadata: metadata:
name: heapster-v1.1.0.beta1 name: heapster-v1.1.0.beta2
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.beta1 version: v1.1.0.beta2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
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
@ -35,7 +35,7 @@ spec:
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --metric_resolution=60s - --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 name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
@ -74,7 +74,7 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --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
@ -102,6 +102,6 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=307200Ki - --extra-memory=307200Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --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.beta1 name: heapster-v1.1.0.beta2
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.beta1 version: v1.1.0.beta2
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
template: template:
metadata: metadata:
labels: labels:
k8s-app: heapster k8s-app: heapster
version: v1.1.0.beta1 version: v1.1.0.beta2
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0-beta1 - image: gcr.io/google_containers/heapster:v1.1.0-beta2
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
@ -59,6 +59,6 @@ spec:
- --memory=300Mi - --memory=300Mi
- --extra-memory=4Mi - --extra-memory=4Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta1 - --deployment=heapster-v1.1.0.beta2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000