github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20650 from mwielgus/heapster-alpha4 

Bump heapster from v0.20.0-alpha3 to v.0.20.0-alpha4
pull/6/head
Marek Grabowski 2016-02-05 16:04:41 +01:00
parent ae15a4437b 6c2b338af0
commit e8f341cb40
5 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@ -7,26 +7,26 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v13
name: heapster-v14
namespace: kube-system
labels:
k8s-app: heapster
version: v13
version: v14
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v13
version: v14
template:
metadata:
labels:
k8s-app: heapster
version: v13
version: v14
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.20.0-alpha3
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@ -45,7 +45,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v0.20.0-alpha3
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class

12
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View File

@ -7,26 +7,26 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v13
name: heapster-v14
namespace: kube-system
labels:
k8s-app: heapster
version: v13
version: v14
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v13
version: v14
template:
metadata:
labels:
k8s-app: heapster
version: v13
version: v14
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.20.0-alpha3
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@ -45,7 +45,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v0.20.0-alpha3
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class

12
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@ -7,26 +7,26 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v13
name: heapster-v14
namespace: kube-system
labels:
k8s-app: heapster
version: v13
version: v14
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v13
version: v14
template:
metadata:
labels:
k8s-app: heapster
version: v13
version: v14
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.20.0-alpha3
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
@ -41,7 +41,7 @@ spec:
- --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086
- --metric_resolution=60s
- image: gcr.io/google_containers/heapster:v0.20.0-alpha3
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class

1
cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
View File

@ -74,4 +74,3 @@ spec:
- name: grafana-persistent-storage
emptyDir: {}

10
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@ -7,26 +7,26 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v13
name: heapster-v14
namespace: kube-system
labels:
k8s-app: heapster
version: v13
version: v14
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: heapster
version: v13
version: v14
template:
metadata:
labels:
k8s-app: heapster
version: v13
version: v14
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.20.0-alpha3
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class